free-fe-core-modules 0.0.7 → 0.0.9

package/view/dict/index.vue

@@ -53,6 +53,7 @@
               v-if="field.Name !== 'Name' || !selectedDictNode.Parent"
               :values="editingDict"
               :Field="field"
+              ref="fieldsToValidate"
             ></free-field>
           </div>
 
@@ -98,10 +99,11 @@
 </template>
 
 <script>
-import { defineComponent } from 'vue';
+import { defineComponent, watch } from 'vue';
 import { copyToClipboard } from 'quasar';
 import { requests } from '@/boot/axios';
 import { useObjectData, objectDataProps } from '../../composible/useObjectData';
+import { useFormValidator} from '../../composible/useFormValidator';
 
 export default defineComponent({
   name: 'DictionaryPage',
@@ -127,9 +129,12 @@ export default defineComponent({
       refreshData,
     } = useObjectData(props, ctx);
 
+    const { validate } = useFormValidator('fieldsToValidate');
+
     return {
-      data, 
+      data,
       refreshData,
+      validate,
     };
   },
   watch: {
@@ -166,6 +171,26 @@ export default defineComponent({
     }
   },
   methods: {
+    makeLabelsName(n) {
+      n.Labels = n.Labels || [];
+      // check labels according to the locales
+      const locales = this.ctx.config.locales || [];
+      for(let i = 0; i < locales.length; i += 1) {
+        const locale = locales[i];
+        const existsLabel = n.Labels.find((l) => l.Locale === locale.locale);
+
+        if (!existsLabel) {
+          n.Labels.push({
+            Label: '',
+            Locale: locale.locale,
+            Description: '',
+            Name: locale.name,
+          });
+        } else {
+          existsLabel.Name = locale.name;
+        }
+      }
+    },
     loadSubDicts({ key, done, node /* , fail */ }) {
       this.GetData(key, node.level)
         .then((d) => {
@@ -189,28 +214,13 @@ export default defineComponent({
           Type: 'String',
         };
       }
+
+      this.makeLabelsName(this.editingDict);
     },
     editNode(n) {
       if (!n) return;
 
-      n.Labels = n.Labels || [];
-      // check labels according to the locales
-      const locales = this.ctx.config.locales || [];
-      for(let i = 0; i < locales.length; i += 1) {
-        const locale = locales[i];
-        const existsLabel = n.Labels.find((l) => l.Locale === locale.locale);
-
-        if (!existsLabel) {
-          n.Labels.push({
-            Label: '',
-            Locale: locale.locale,
-            Description: '',
-            Name: locale.name,
-          });
-        } else {
-          existsLabel.Name = locale.name;
-        }
-      }
+      this.makeLabelsName(n);
 
       if (this.selectedDictNode && this.selectedDictNode.id === n.id) {
         this.selectedDictNode = {};
@@ -243,6 +253,14 @@ export default defineComponent({
     },
     onSaveClick() {
       if (Object.keys(this.editingDict) <= 0) return;
+
+      if (!this.validate()) return;
+
+      // clear labels without label
+      this.editingDict.Labels = (this.editingDict.Labels || []).filter(
+        (l) => l.Label,
+      );
+
       // if is adding new
       if (this.selectedDictNode.addingNew) {
         this.editingDict = {
@@ -252,10 +270,6 @@ export default defineComponent({
           ...this.editingDict,
         };
 
-        // fix: the default content for number input will be string!!!!????
-        // convert to number
-        this.editingDict.Index = Number(this.editingDict.Index || '0');
-
         this.addDict(this.editingDict).then((r) => {
           if (r && r.msg === 'OK') {
             const parent = this.$refs.dictTree.getNodeByKey(

package/view/error/list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flow-list">
-    <summary-head :values="data.summary" :Bus="Bus"></summary-head>
+    <summary-head :values="data.summary"></summary-head>
     <q-table
       flat
       bordered
@@ -23,26 +23,24 @@
             <span v-else>
               {{ valueFilters(col, col.value || Object.nestValue(props.row, col.field))}}
               <q-popup-edit
+                v-slot="scope"
                 v-model="props.row.Message"
                 v-if="col.name === 'message'"
-                buttons
-                persistent
                 label-set="保存"
                 label-cancel="取消"
-                @save="messageChanged(props.row.id, props.row.Message)"
               >
-                <q-input v-model="props.row.Message" hide-bottom-space autofocus />
+                <q-input v-model="props.row.Message" hide-bottom-space autofocus
+                  @keyup.enter="messageChanged(props.row.id, props.row.Message, scope)"/>
               </q-popup-edit>
               <q-popup-edit
-                v-model="props.row.Description"
+                v-slot="scope"
+                :model-value="props.row.Description"
                 v-if="col.name === 'description'"
-                buttons
-                persistent
-                label-set="保存"
-                label-cancel="取消"
-                @save="descriptionChanged(props.row.id, props.row.Description)"
+                :label-set="$t('保存')"
+                :label-cancel="$t('取消')"
               >
-                <q-input v-model="props.row.Description" hide-bottom-space autofocus />
+                <q-input v-model="props.row.Description" hide-bottom-space autofocus 
+                  @keyup.enter="descriptionChanged(props.row.id, props.row.Description, scope)"/>
               </q-popup-edit>
             </span>
           </q-td>
@@ -66,7 +64,7 @@
 
       <template v-slot:no-data>
         <div class="full-width full-height row flex-center q-gutter-sm">
-          <span>暂 无 数 据</span>
+          <span>{{$t('暂无数据')}}</span>
         </div>
       </template>
 
@@ -106,7 +104,7 @@ export default defineComponent({
     } = useObjectData(props, ctx);
 
     return {
-      data, 
+      data,
       refreshData,
     };
   },
@@ -165,10 +163,7 @@ export default defineComponent({
 
           for (let i = 0; i < filters.length; i += 1) {
             const f = filters[i];
-            const filter = this.$options.filters[f];
-            if (filter) {
-              val = filter(v || col.value);
-            }
+            val = this.$filter(f, v || col.value)
           }
         }
 
@@ -181,7 +176,8 @@ export default defineComponent({
     paginationChanged(p) {
       this.refreshData({ page: p });
     },
-    messageChanged(id, msg) {
+    messageChanged(id, msg, popup) {
+      popup.set();
       updateErrorCode(id, msg).then((d) => {
         if (d && d.msg === 'OK') {
           this.$q.notify(this.$t('notifySaved'));
@@ -190,7 +186,8 @@ export default defineComponent({
         }
       });
     },
-    descriptionChanged(id, desc) {
+    descriptionChanged(id, desc, popup) {
+      popup.set();
       updateDescription(id, desc).then((d) => {
         if (d && d.msg === 'OK') {
           this.$q.notify(this.$t('notifySaved'));

package/view/menu/index.vue

@@ -338,9 +338,6 @@ export default defineComponent({
         this.onCancelClick();
       }
     },
-    fieldInput(e) {
-      console.log(e)
-    }
   },
 });
 </script>