changes

app/components/datatable/CreateTemplate.vue

@@ -517,11 +517,11 @@ const initData = function () {
   condition = conditions.find((v) => v.code === "no");
 };
 /*watch: {
-    expression: function(newVal) {
+    expression(newVal) {
       if($empty(newVal)) return
       elsecheckExpression()
     },
-    tab: function(newVal, oldVal) {
+    tab(newVal, oldVal) {
       if(oldVal===undefined) return
       if(newVal.code==='template') {
         let value = '<div>'

app/components/datatable/DataTable.vue

@@ -110,17 +110,17 @@
       </tbody>
     </table>
     <DatatablePagination
-      v-bind="{ data: data, perPage: perPage }"
-      @changepage="changePage"
       v-if="showPaging"
-    ></DatatablePagination>
+      v-bind="{ data, perPage }"
+      @changepage="changePage"
+    />
   </div>
   <Modal
+    v-if="showmodal"
+    v-bind="showmodal"
     @close="close"
     @selected="doSelect"
     @confirm="confirmRemove"
-    v-bind="showmodal"
-    v-if="showmodal"
   />
 </template>
 <script setup>

app/components/datatable/FilterOption.vue

@@ -169,33 +169,33 @@ export default {
       this.tagsField.push(this.pageData.fields.find((v) => v.name === this.field.name));
   },
   watch: {
-    expression: function (newVal) {
+    expression(newVal) {
       if (this.$empty(newVal)) return;
       else this.changeStyle();
     },
   },
   computed: {
     colorscheme: {
-      get: function () {
-        return this.$store.state.colorscheme;
+      get() {
+        return this.$store.colorscheme;
       },
-      set: function (val) {
+      set(val) {
         this.$store.commit("updateColorScheme", { colorscheme: val });
       },
     },
     pageData: {
-      get: function () {
-        return this.$store.state[this.pagename];
+      get() {
+        return this.$store[this.pagename];
       },
-      set: function (val) {
+      set(val) {
         this.$store.commit("updateStore", { name: this.pagename, data: val });
       },
     },
     colorchoice: {
-      get: function () {
-        return this.$store.state.colorchoice;
+      get() {
+        return this.$store.colorchoice;
       },
-      set: function (val) {
+      set(val) {
         this.$store.commit("updateColorChoice", { colorchoice: val });
       },
     },

app/components/datatable/TimeOption.vue

@@ -295,7 +295,7 @@ export default {
   },
 
   computed: {
-    lang: function () {
+    lang() {
       return this.store.lang;
     },
   },