free-fe-core-modules 0.0.7 → 0.0.8

package/router/system/data.js

@@ -1,7 +1,7 @@
-// import Vue from 'vue';
 import { getConfig } from './api';
+import { i18n } from '@/boot/i18n';
 
-// const bus = new Vue();
+const {global:{t}} = i18n;
 
 export default {
   systemConfig: () => ({
@@ -28,7 +28,7 @@ export default {
             Index: i + 1,
             Actions: [
               {
-                Label: '保存',
+                Label: t('保存'),
                 Action: 'save',
               },
             ],
@@ -41,6 +41,5 @@ export default {
 
       return data;
     }),
-    // Bus: bus,
   }),
 };

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,16 @@ export default defineComponent({
       refreshData,
     } = useObjectData(props, ctx);
 
+    const { validate } = useFormValidator('fieldsToValidate');
+
+    watch(() => data, () => {
+      console.log(data)
+    })
+
     return {
-      data, 
+      data,
       refreshData,
+      validate,
     };
   },
   watch: {
@@ -243,6 +252,9 @@ export default defineComponent({
     },
     onSaveClick() {
       if (Object.keys(this.editingDict) <= 0) return;
+
+      if (!this.validate()) return;
+
       // if is adding new
       if (this.selectedDictNode.addingNew) {
         this.editingDict = {

package/view/menu/index.vue

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