changes

app/components/datatable/ContextMenu.vue

@@ -9,7 +9,7 @@
           <Icon
             name="mdi:sort-alphabetical-ascending"
             :size="22"
-            :class="checkFilter() && 'has-text-grey-light'"
+            :class="checkFilter() && 'has-text-grey-70'"
           />
         </span>
       </button>
@@ -28,7 +28,7 @@
           <Icon
             name="mdi:sort-alphabetical-descending"
             :size="22"
-            :class="checkFilter() && 'has-text-grey-light'"
+            :class="checkFilter() && 'has-text-grey-70'"
           />
         </span>
       </button>

app/components/datatable/DataTable.vue

@@ -135,8 +135,9 @@
 </template>
 <script setup>
 import { createApp } from "vue/dist/vue.esm-bundler.js";
-import { ref, defineComponent } from "vue";
+import { isEmpty } from "es-toolkit/compat";
 import { useStore } from "~/stores/index";
+
 const emit = defineEmits(["edit", "insert", "dataevent"]);
 const {
   $calc,
@@ -176,7 +177,7 @@ var currentPage = 1;
 var displayFields = ref([]);
 var displayData = [];
 var pagedata = store[props.pagename];
-let tablesetting = $copy(pagedata.tablesetting || store.tablesetting);
+let tablesetting = $copy(isEmpty(pagedata.tablesetting) ? store.tablesetting : pagedata.tablesetting);
 if (!Array.isArray(tablesetting)) {
   tablesetting = Object.values(tablesetting);
 }

app/components/datatable/NewField.vue

@@ -30,7 +30,7 @@
         {{ v.name }}
       </label>
     </div>
-    <div class="has-background-white-bis mt-3 p-3 rounded-md">
+    <div class="has-background-white-100 mt-3 p-3 rounded-md">
       <div
         class="tags mb-0"
         v-if="choice === 'function'"

app/components/datatable/PivotDataView.vue

@@ -55,11 +55,11 @@
             {{ v.label.indexOf(">") >= 0 ? $stripHtml(v.label, 30) : v.label }}
           </a>
           <a
-            class="tag is-delete is-marginless has-text-black-bis"
+            class="tag is-delete is-marginless has-text-black-5"
             @click="removeFilter(i)"
           ></a>
         </div>
-        <span class="help has-text-black-bis">
+        <span class="help has-text-black-5">
           {{
             v.sort
               ? v.sort
@@ -163,7 +163,7 @@
               </template>
               <span
                 v-else
-                class="has-text-grey-light"
+                class="has-text-grey-70"
                 >-</span
               >
             </td>

app/components/datatable/TableSetting.vue

@@ -237,8 +237,8 @@ input[type="color"]::-webkit-color-swatch {
 
 .box {
   box-shadow: none;
-  border: 1px solid var(--bulma-grey-lighter);
-  background-color: var(--bulma-white-bis);
+  border: 1px solid var(--bulma-grey-85);
+  background-color: var(--bulma-grey-95);
   height: 100%;
 }
 </style>