free-fe-core-modules 0.0.8 → 0.0.10

package/components/Basic/SummaryHead.vue

@@ -123,12 +123,7 @@ export default defineComponent({
         for (let j = 0; j < filters.length; j += 1) {
           const f = filters[j];
 
-          const filterFunc = this.$options.filters[f];
-          if (filterFunc) {
-            item.number = filterFunc(
-              item.number,
-            );
-          }
+          item.number = this.$filter(f, item.number);
         }
 
         // remove the filter to avoid filter multiple times

package/components/Dialog/BasicDialog.vue

@@ -102,7 +102,7 @@
 </template>
 
 <script>
-import { defineComponent } from 'vue';
+import { defineComponent, ref, computed, watch } from 'vue';
 import { useFormValidator } from '../../composible/useFormValidator';
 import FreeField from '../../free-field/composible/fieldWrapper';
 import EIcon from '../Basic/EIcon.vue';
@@ -157,170 +157,180 @@ export default defineComponent({
     FreeField,
     EIcon,
   },
-  setup(props, { expose }) {
+  setup(props, { expose, emit }) {
     const { validate } = useFormValidator('fieldsToValid');
-    expose({
-      validate,
-    })
 
-    return {};
-  },
-  data() {
-    return {
-      timeLeft: 0,
-      textContent: '',
-      textValid: true,
-      timer: undefined,
-      promise: '',
-      resolve: '',
-      reject: '',
-    };
-  },
-  watch: {
-    visible() {
-      if (this.visible) {
-        this.timeout_counter();
-        this.show();
-      } else {
-        this.hide();
-      }
-    },
-  },
-  computed: {
-    disabled() {
-      if (typeof this.okDisabled === 'object') {
-        return this.okDisabled.value;
-      }
+    const dialog  = ref(null);
 
-      return this.okDisabled;
-    },
-    warningMsg() {
-      // 设置默认warning
-      if (!this.showWarning) return '';
+    const timeLeft = ref(0),
+      textContent = ref(''),
+      textValid = ref(true),
+      timer = ref(undefined),
+      promise = ref(null),
+      resolve = ref(null),
+      reject = ref(null);
 
-      if (!this.warning) {
-        return '';
+    const timeout_counter = () => {
+      if (!props.timeout) {
+        return;
       }
-      return this.warning;
-    },
-  },
-  methods: {
-    // following method is REQUIRED
-    // (don't change its name --> "show")
-    show() {
-      this.$refs.dialog.show();
-      this.timeout_counter();
-
-      this.promise = new Promise((resolve, reject) => {
-        this.resolve = resolve;
-        this.reject = reject;
+
+      timeLeft.value = props.timeout;
+      timer.value = setInterval(() => {
+        timeLeft.value -= 1;
+        if (timeLeft.value < 1) {
+          clearInterval(timer.value);
+          btn_ok();
+        }
+      }, 1000);
+    };
+
+    const show = () => {
+      dialog.value.show();
+      timeout_counter();
+
+      promise.value = new Promise((resv, rej) => {
+        resolve.value = resv;
+        reject.value = rej;
       });
 
-      return this.promise;
-    },
+      return promise.value;
+    };
 
-    // following method is REQUIRED
-    // (don't change its name --> "hide")
-    hide() {
-      this.$refs.dialog.hide();
-    },
-    onDialogHide() {
-      // required to be emitted
-      // when QDialog emits "hide" event
-      this.$emit('hide');
-    },
-    onOKClick() {
-      // on OK, it is REQUIRED to
-      // emit "ok" event (with optional payload)
-      // before hiding the QDialog
-      // this.$emit('ok');
-      // or with payload: this.$emit('ok', { ... })
-
-      // // validate
-      // if (this.validateFunc && typeof this.validateFunc === 'function') {
-      //   // now we only have such content, but later we might will have more
-      //   this.textValid = this.validateFunc(this.textContent);
-      //   if (!this.textValid) return;
-      // }
-      if (!this.canOK || !this.validate()) {
+    const hide = () => {
+      dialog.value.hide();
+    };
+
+    const onDialogHide = () => {
+      emit('hide');
+    };
+
+    const onOKClick = () => {
+      if (!props.canOK || !validate.value()) {
         return;
       }
 
-      this.$emit('ok');
+      emit('ok');
 
-      if (this.timer) {
-        this.timeLeft = 0;
-        clearInterval(this.timer);
+      if (timer.value) {
+        timeLeft.value = 0;
+        clearInterval(timer.value);
       }
 
-      if (this.resolve) {
-        if (this.needText) {
-          this.resolve(this.textContent);
+      if (resolve.value) {
+        if (props.needText) {
+          resolve.value(textContent.value);
         } else {
-          this.resolve('confirm');
+          resolve.value('confirm');
         }
 
-        this.hide();
-        this.remove();
+        hide();
+
+        if (typeof props.remove === 'function'){
+          props.remove();
+        }
       }
-    },
-    btnCancel() {
-      if (!this.canCancel) return;
+    };
+
+    const btnCancel = () => {
+      if (!props.canCancel) return;
 
-      this.$emit('cancel');
+      emit('cancel');
 
-      if (this.timer) {
-        this.timeLeft = 0;
-        clearInterval(this.timer);
+      if (timer.value) {
+        timeLeft.value = 0;
+        clearInterval(timer.value);
       }
 
-      if (this.reject) {
-        this.reject('cancel');
-        this.remove();
+      if (reject.value) {
+        reject.value('cancel');
+
+        if (typeof props.remove === 'function'){
+          props.remove();
+        }
       }
-    },
-    btn_ok() {
-      if (!this.validate()) {
+    };
+
+    const btn_ok = () => {
+      if (!validate.value()) {
         return;
       }
 
-      this.$emit('ok');
+      emit('ok');
 
-      if (this.timer) {
-        this.timeLeft = 0;
-        clearInterval(this.timer);
+      if (timer.value) {
+        timeLeft.value = 0;
+        clearInterval(timer.value);
       }
 
-      if (this.resolve) {
-        if (this.needText) {
-          this.resolve(this.textContent);
+      if (resolve.value) {
+        if (props.needText) {
+          resolve.value(textContent.value);
         } else {
-          this.resolve('confirm');
+          resolve.value('confirm');
         }
 
-        this.hide();
-        this.remove();
+        hide();
+
+        if (typeof props.remove === 'function'){
+          props.remove();
+        }
       }
-    },
-    timeout_counter() {
-      if (!this.timeout) {
-        return;
+    };
+
+    expose({
+      validate,
+      show,
+      hide,
+    });
+
+    watch(() => props.visible, (v) => {
+      if (v) {
+        timeout_counter();
+        show();
+      } else {
+        hide();
       }
+    });
 
-      this.timeLeft = this.timeout;
-      this.timer = setInterval(() => {
-        this.timeLeft -= 1;
-        if (this.timeLeft < 1) {
-          clearInterval(this.timer);
-          this.btn_ok();
-        }
-      }, 1000);
-    },
-    onInputFieldInput(field){
-      if(field.onInput) {
-        field.onInput(field);
+
+    const disabled = computed(() => {
+      if (typeof props.okDisabled === 'object') {
+        return props.okDisabled.value;
+      }
+
+      return props.okDisabled;
+    });
+
+    const warningMsg = computed(() => {
+      // 设置默认warning
+      if (!props.showWarning) return '';
+
+      if (!props.warning) {
+        return '';
       }
-    }
+      return props.warning;
+    });
+
+    return {
+      dialog,
+      timeLeft,
+      textContent,
+      textValid,
+
+      disabled,
+      warningMsg,
+
+      validate,
+
+      show,
+      hide,
+      onDialogHide,
+      onOKClick,
+      btnCancel,
+      btn_ok,
+      timeout_counter,
+    };
   },
 });
 </script>

package/composible/useFormValidator.js

@@ -7,12 +7,12 @@ export function useFormValidator(...list) {
     validate: computed(() => {
       return (...args) => {
         if (vm.shouldHide) return true;
-      
+
         // could have customized validate function in component
         if (vm.selfValidate && typeof vm.selfValidate === 'function') {
           return vm.selfValidate();
         }
-      
+
         const refsList = [];
         for(let i = 0; i < list.length; i += 1) {
           if (typeof list[i] === 'string') {
@@ -20,24 +20,25 @@ export function useFormValidator(...list) {
           } else if (typeof list[i] === 'function') {
             list[i] = list[i]();
           }
-          
+
           if (Array.isArray(list[i])) {
             refsList.push(...list[i])
           } else {
             refsList.push(list[i])
           }
         }
-  
+
         if (refsList.length <= 0) return true;
-      
+
         let hasErr = false;
         for (let i = 0; i < refsList.length; i += 1) {
           let refi = unref(refsList[i]);
 
+          if (!refi) continue;
 
           const validFun = unref(refi.validate || refi.methods?.validate || refi.component?.exposed?.validate|| refi.component?.ctx?.validate);
           const shouldHide = unref(refi.shouldHide || refi.component?.ctx?.shouldHide);
-      
+
           if (typeof validFun === 'function' && shouldHide !== true) {
             hasErr = !validFun() || hasErr;
 
@@ -47,7 +48,7 @@ export function useFormValidator(...list) {
             }
           }
         }
-      
+
         return !hasErr;
       };
     }),

package/composible/useObjectData.js

@@ -1,4 +1,4 @@
-import { ref, getCurrentInstance, watch, watchEffect, defineEmits } from "vue";
+import { ref, unref, getCurrentInstance, watch, watchEffect } from "vue";
 
 export const objectDataProps = {
   GetData: Function,
@@ -44,12 +44,12 @@ export function useObjectData(props, ctx) {
 
       if (typeof getData === 'function') {
         Promise.resolve(getData(...args)).then((d) => {
-          Object.assign(data.value, d);
+          Object.assign(data.value, unref(d));
         }).finally(() => {
           callsLeft.value --;
         });
       } else {
-        Object.assign(data.value, getData);
+        Object.assign(data.value, unref(getData));
         callsLeft.value --;
       }
     }

package/free-field/Fields/Labels.vue

@@ -172,6 +172,7 @@ export default defineComponent({
 
       if (changed) {
         this.setFieldData(currentList);
+        this.$emit('input');
       }
 
       this.newLabel = '';

package/free-field/Fields/Number.js

@@ -112,7 +112,7 @@ export default defineComponent({
         v = Number(props.Field.MaxValue);
       }
 
-      setFieldData(v);
+      setFieldData(Number(v));
     })
 
     const readonlyNode = () => h(ReadonlyContent, {
@@ -147,7 +147,7 @@ export default defineComponent({
 
       modelValue: fieldData.value,
       'onUpdate:modelValue': (v) => {
-        setFieldData(v, emit);
+        setFieldData(Number(v), emit);
       },
     }, {
       before,

package/free-field/Fields/Password.js

@@ -47,7 +47,7 @@ export default defineComponent({
       },
     });
 
-    const inputNode = () => computed(h(QInput, {
+    const inputNode = computed(() => h(QInput, {
       type: isPwd.value ?  'password' : 'text',
       maxlength: props.Field.Options?.MaxLength,
       autocomplete: props.Field.Options?.autocomplete ? '' : 'new-password',

package/free-field/Fields/Permission.vue

@@ -76,6 +76,7 @@ export default defineComponent({
   methods: {
     permissionChanged(v) {
       this.setFieldData(v);
+      this.$emit('input');
     },
   },
 });

package/free-field/Fields/PermissionEditor.vue

@@ -71,7 +71,6 @@ import { useFreeField, freeFieldProps } from '../composible/useFreeField';
 export default defineComponent({
   name: 'PermissionEditor',
   emits:['changed'],
-  components: {},
   props: {
     ...freeFieldProps,
     Code: { type: String, default: '' },

package/free-field/Fields/Search.vue

@@ -350,9 +350,9 @@ export default defineComponent({
     },
   },
   watch: {
-    fieldData(n, o) {
+    'fieldData.value': function(n, o) {
       // init search data from exist id
-      if (typeof this.fieldData.value === 'undefined') {
+      if (this.fieldData.value === void 0) {
         this.searchSelected = [];
         this.searchData = {};
         this.searchDisplay = '';
@@ -406,14 +406,11 @@ export default defineComponent({
     },
   },
   created() {
-    // search, add filters to col
-    if (this.Field.Type === 'Search') {
-      this.searchColumns.forEach((col) => {
-        if (col.filters) {
-          col.format = this.ctx.filters[col.filters];
-        }
-      });
-    }
+    this.searchColumns.forEach((col) => {
+      if (col.filters) {
+        col.format = (d) => this.$filter(col.filters, d);
+      }
+    });
   },
   methods: {
     search(p) {

package/free-field/Fields/Select.vue

@@ -163,7 +163,7 @@ export default defineComponent({
   props: {
     ...freeFieldProps,
   },
-  emits:['udpate:fieldData', 'input'],
+  emits:['input'],
   fieldInfo: {
     Category: 'Simple',
     Label: '选择',

package/free-field/Fields/Tabs.vue

@@ -124,7 +124,7 @@ export default defineComponent({
     const tab = ref(0);
 
     if (!Array.isArray(fieldData.value)) {
-      setFieldData([{}])
+      setFieldData([{}], emit)
     }
 
     if (props.Field.Options?.ValueField && props.Field.Default) {
@@ -140,7 +140,6 @@ export default defineComponent({
       fieldData,
 
       fieldChanged: () => {
-        console.log('field changed', fieldData.value)
         emit('input');
       },
       validate,

package/free-field/composible/fieldWrapper.js

@@ -197,7 +197,7 @@ export default defineComponent({
         onInput: () => {
           emit("input", props.Field);
         },
-        ...compEmits,
+        ...compEmits.value,
       },
       {
         ...slots,

package/free-field/composible/useFreeField.js

@@ -1,85 +1,63 @@
-import { reactive, watch, watchEffect } from "vue";
+import { reactive, getCurrentInstance, watchEffect } from "vue";
 
 export const freeFieldProps = {
   values: { type: Object },
   Field: { type: Object },
 };
 
-export function useFreeField(props) {
+export function useFreeField(props, ctx) {
+  const { proxy:vm } = getCurrentInstance();
   const fieldData = reactive({});
 
   watchEffect(() => {
-    fieldData.value = Object.nestValue(props.values, props.Field?.Name);
-
-    // TODO:following is from the old mixins, should we add more logic here accordingly?
-    // let realData;
-    // if (!this.Field) {
-    //   // return undefined;
-    // } else if (!this.Field.Name) {
-    //   // this.fieldData = this.Field.Value || this.Field.Default || undefined;
-    //   realData = this.Field.Value || this.Field.Default || undefined;
-    // } else {
-    //   let isnull = false;
-    //   if (this.Field && this.Field.Info && this.Field.Info.Dynamic && this.Field.Value) {
-    //     realData = this.Field.Value;
-    //     isnull = typeof realData === 'undefined';
-    //   } else {
-    //     realData = this.data;
-
-    //     if (this.Field.Name !== '.') {
-    //       const nameList = this.Field.Name.split('.');
-
-    //       for (let i = 0; i < nameList.length; i += 1) {
-    //         const name = nameList[i];
-
-    //         // if (!realData) return undefined;
-    //         if (typeof realData === 'undefined' || realData === null) {
-    //           isnull = true;
-    //           break;
-    //         } else {
-    //           realData = name ? realData[name] : realData;
-    //         }
-    //       }
-    //     }
-    //   }
-
-    //   if (!isnull) {
-    //     // for non-dynamic field, which have refer data, we should save this data into the field
-    //     if ((typeof realData === 'undefined') && (this.Field.Value || this.Field.Default)) {
-    //       realData = this.Field.Value || this.Field.Default;
-
-    //       if (this.Field && this.Field.ReferTo && (!this.Field.Info || !this.Field.Info.Dynamic)) {
-    //         this.$emit('input');
-    //       }
-    //     }
-
-    //     // realData = (typeof realData === 'undefined') ? (this.Field.Value || this.Field.Default) : realData;
-
-    //     if (this.Field.Options && this.Field.Options.Filters) {
-    //       let filters = [];
-    //       if (typeof this.Field.Options.Filters === 'string') {
-    //         // only one filter
-    //         filters.push(this.Field.Options.Filters);
-    //       } else if (Array.isArray(this.Field.Options.Filters)) {
-    //         filters = filters.concat(this.Field.Options.Filters);
-    //       }
-
-    //       for (let i = 0; i < filters.length; i += 1) {
-    //         const f = filters[i];
-    //         const filter = this.$options.filters[f];
-    //         if (filter) {
-    //           realData = filter(realData);
-    //         }
-    //       }
-    //     }
-    //   }
-    // }
-
-    // if ((typeof realData === 'undefined' || realData === null || !realData) && this.Field.Info && this.Field.Info.ShowNaN) {
-    //   return this.ctx.config.nanPlaceholder || '';
-    // }
-
-    // return realData;
+    let realData = void 0;
+    
+    if (!props.Field) {
+      return;
+    }
+    
+    if (!props.Field.Name) {
+      realData = props.Field.Value || props.Field.Default || undefined;
+    } else {
+      if (props.Field.Info?.Dynamic && props.Field.Value) {
+        realData = props.Field.Value;
+      } else {
+        realData = Object.nestValue(props.values, props.Field?.Name);
+      }
+    }
+
+    // set to default if still undefined
+    if ((realData === void 0 || realData === null) && (props.Field.Value || props.Field.Default)) {
+      realData = props.Field.Value || props.Field.Default;
+
+      // for non-dynamic field, which have refer data, we should save this data into the field
+      if (props.Field.ReferTo && !props.Field.Info?.Dynamic) {
+        ctx.emit('input');
+      }
+    }
+
+    // filter data
+    if (props.Field.Options && props.Field.Options.Filters) {
+      let filters = [];
+      if (typeof props.Field.Options.Filters === 'string') {
+        // only one filter
+        filters.push(props.Field.Options.Filters);
+      } else if (Array.isArray(props.Field.Options.Filters)) {
+        filters = filters.concat(props.Field.Options.Filters);
+      }
+
+      for (let i = 0; i < filters.length; i += 1) {
+        const f = filters[i];
+        realData = vm.$filter(f, realData)
+      }
+    }
+
+    // show NaN placeholder
+    if ((realData === void 0 || realData === null || realData === '') && props.Field?.Info?.ShowNaN) {
+      return vm.ctx.config.nanPlaceholder || '';
+    }
+
+    fieldData.value = realData;
   });
 
   return {

package/i18n/en-us/index.js

@@ -67,4 +67,8 @@ export default {
   validatorPwd3Description: "Passwords 6-16 characters in length, must contain numbers, uppercase letters, lowercase letters, special characters",
   validatorPwd4Name: "Password (strength four)",
   validatorPwd4Description: "A password of 6-16 digits in length must contain numbers, at least 2 uppercase letters, at least 2 lowercase letters, special characters",
-}
+
+  删除确认: "Do you want to delete {type} '{name}'？",
+  菜单: 'menu',
+  字典项: 'dictionary',
+}

package/i18n/zh-cn/index.js

@@ -1,73 +1,78 @@
 export default {
-    justNow: '刚刚',
-    secondsAgo: '秒之前',
-    minutesAgo: '分钟之前',
-    hoursAgo: '小时之前',
-    daysAgo: '天之前',
-    monthsAgo: '月之前',
-    yearsAgo: '年之前',
-    SwitchTheme: '切换样式',
+  justNow: '刚刚',
+  secondsAgo: '秒之前',
+  minutesAgo: '分钟之前',
+  hoursAgo: '小时之前',
+  daysAgo: '天之前',
+  monthsAgo: '月之前',
+  yearsAgo: '年之前',
+  SwitchTheme: '切换样式',
 
-    validatorNotEmptyName: "非空",
-    validatorNotEmptyDescription: "不能为空",
-    validatorMobilePhoneName: "手机号",
-    validatorMobilePhoneDescription: "中国手机号码格式",
-    validatorEmailName: "邮箱",
-    validatorEmailDescription: "",
-    validatorPhoneOrEmailName: "手机号或邮箱",
-    validatorPhoneOrEmailDescription: "",
-    validatorChinaIDNumberName: "中国身份证号码",
-    validatorChinaIDNumberDescription: "",
+  validatorNotEmptyName: "非空",
+  validatorNotEmptyDescription: "不能为空",
+  validatorMobilePhoneName: "手机号",
+  validatorMobilePhoneDescription: "中国手机号码格式",
+  validatorEmailName: "邮箱",
+  validatorEmailDescription: "",
+  validatorPhoneOrEmailName: "手机号或邮箱",
+  validatorPhoneOrEmailDescription: "",
+  validatorChinaIDNumberName: "中国身份证号码",
+  validatorChinaIDNumberDescription: "",
 
-    validatorOnlyNumberName: "只能是数字",
-    validatorOnlyNumberDescription: "",
-    validatorOnlyCharName: "只能是字母",
-    validatorOnlyCharDescription: "",
-    validatorOnlyUpCharName: "只能是大写字母",
-    validatorOnlyUpCharDescription: "",
-    validatorOnlyLowerCharName: "只能是小写字母",
-    validatorOnlyLowerCharDescription: "",
-    validatorOnlyChineseName: "只能是中文",
-    validatorOnlyChineseDescription: "",
-    validatorOnlyCCName: "只能是中文或字母",
-    validatorOnlyCCDescription: "",
-    validatorOnlyCCNName: "只能是中文或字母或数字",
-    validatorOnlyCCNDescription: "",
-    validatorOnlyCNName: "只能是中文或数字",
-    validatorOnlyCNDescription: "",
-    validatorOnlyCNUName: "只能是中文或数字或下划线",
-    validatorOnlyCNUDescription: "",
-    validatorOnlyCNSName: "只能是中文或数字或特殊字符",
-    validatorOnlyCNSDescription:
-      `只能是中文或数字或（"."、{'@'}、"<"、">"、"_"、"?"）`,
+  validatorOnlyNumberName: "只能是数字",
+  validatorOnlyNumberDescription: "",
+  validatorOnlyCharName: "只能是字母",
+  validatorOnlyCharDescription: "",
+  validatorOnlyUpCharName: "只能是大写字母",
+  validatorOnlyUpCharDescription: "",
+  validatorOnlyLowerCharName: "只能是小写字母",
+  validatorOnlyLowerCharDescription: "",
+  validatorOnlyChineseName: "只能是中文",
+  validatorOnlyChineseDescription: "",
+  validatorOnlyCCName: "只能是中文或字母",
+  validatorOnlyCCDescription: "",
+  validatorOnlyCCNName: "只能是中文或字母或数字",
+  validatorOnlyCCNDescription: "",
+  validatorOnlyCNName: "只能是中文或数字",
+  validatorOnlyCNDescription: "",
+  validatorOnlyCNUName: "只能是中文或数字或下划线",
+  validatorOnlyCNUDescription: "",
+  validatorOnlyCNSName: "只能是中文或数字或特殊字符",
+  validatorOnlyCNSDescription:
+    `只能是中文或数字或（"."、{'@'}、"<"、">"、"_"、"?"）`,
 
-    validatorOnlyIntegerName: "只能是整数",
-    validatorOnlyIntegerDescription: "",
-    validatorOnlyPIName: "只能是正整数",
-    validatorOnlyPIDescription: "",
-    validatorOnlyPIZName: "只能是正整数或零",
-    validatorOnlyPIZDescription: "",
-    validatorOnlyNIName: "只能是负整数",
-    validatorOnlyNIDescription: "",
-    validatorOnlyNIZName: "只能是负整数或零",
-    validatorOnlyNIZDescription: "",
+  validatorOnlyIntegerName: "只能是整数",
+  validatorOnlyIntegerDescription: "",
+  validatorOnlyPIName: "只能是正整数",
+  validatorOnlyPIDescription: "",
+  validatorOnlyPIZName: "只能是正整数或零",
+  validatorOnlyPIZDescription: "",
+  validatorOnlyNIName: "只能是负整数",
+  validatorOnlyNIDescription: "",
+  validatorOnlyNIZName: "只能是负整数或零",
+  validatorOnlyNIZDescription: "",
 
-    validatorUrlName: "URL地址",
-    validatorUrlDescription: "",
-    validatorOfficePhoneName: "固定电话号码",
-    validatorOfficePhoneDescription: "固定电话号码（区号-号码）",
-    validatorChinaZipName: "中国邮政编码",
-    validatorChinaZipDescription: "",
+  validatorUrlName: "URL地址",
+  validatorUrlDescription: "",
+  validatorOfficePhoneName: "固定电话号码",
+  validatorOfficePhoneDescription: "固定电话号码（区号-号码）",
+  validatorChinaZipName: "中国邮政编码",
+  validatorChinaZipDescription: "",
+
+  validatorPwd1Name: "密码（强度一）",
+  validatorPwd1Description: "长度在6-16位之间的任意密码",
+  validatorPwd2Name: "密码（强度二）",
+  validatorPwd2Description:
+    "长度在6-16位的密码，必须包含数字、大写字母、小写字母",
+  validatorPwd3Name: "密码（强度三）",
+  validatorPwd3Description:
+    "长度在6-16位的密码，必须包含数字、大写字母、小写字母、特殊字符",
+  validatorPwd4Name: "密码（强度四）",
+  validatorPwd4Description:
+    "长度在6-16位的密码，必须包含数字、至少2个大写字母、至少2个小写字母、特殊字符",
+
+  删除确认: "确认删除{type}'{name}'吗？",
+  菜单: '菜单',
+  字典项: '字典项',
 
-    validatorPwd1Name: "密码（强度一）",
-    validatorPwd1Description: "长度在6-16位之间的任意密码",
-    validatorPwd2Name: "密码（强度二）",
-    validatorPwd2Description:
-      "长度在6-16位的密码，必须包含数字、大写字母、小写字母",
-    validatorPwd3Name: "密码（强度三）",
-    validatorPwd3Description:
-      "长度在6-16位的密码，必须包含数字、大写字母、小写字母、特殊字符",
-    validatorPwd4Name: "密码（强度四）",
-    validatorPwd4Description:
-      "长度在6-16位的密码，必须包含数字、至少2个大写字母、至少2个小写字母、特殊字符",
 }

package/index.js

@@ -152,6 +152,27 @@ const filters = {
     diff = quasarDate.getDateDiff(date1, date2, 'years');
     return diff + Vue.prototype.$t('yearsAgo');
   },
+  stepCaption: (step, status, data) => {
+    if (!step) return '';
+    if (step && typeof step.Description === 'string') return step.Description;
+
+    let desc = '';
+    if (step && Array.isArray(step.Description)) {
+      let stepStatus;
+      if (data && data.Steps) {
+        const rStep = data.Steps[step.Index];
+        if (rStep) {
+          stepStatus = rStep.Status;
+        }
+      }
+      desc = step.Description.find((s) => s.Status === (status || stepStatus || '').toString());
+      desc = desc ? desc.Description : '';
+      desc = desc;
+    }
+
+    desc = desc || '未知状态';
+    return desc;
+  },
 };
 
 export default (app, root) => {
@@ -289,6 +310,7 @@ export default (app, root) => {
           Name: "Enabled",
           Label: "启用",
           Type: "Boolean",
+          showLabel: true,
         },
         {
           Name: "Description",
@@ -373,4 +395,4 @@ export default (app, root) => {
       validatorPwd4: (d) => /^.*(?=.{6,16})(?=.*\d)(?=.*[A-Z]{2,})(?=.*[a-z]{2,})(?=.*[!@#$%^&*?\(\)]).*$/.test(d),
     },
   }
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-fe-core-modules",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "main": "index.js",
   "repository": "https://github.com/freeeis/free-fe-core-modules.git",
   "author": "zhiquan",

package/view/dict/index.vue

@@ -131,10 +131,6 @@ export default defineComponent({
 
     const { validate } = useFormValidator('fieldsToValidate');
 
-    watch(() => data, () => {
-      console.log(data)
-    })
-
     return {
       data,
       refreshData,
@@ -175,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) => {
@@ -198,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 = {};
@@ -236,7 +237,7 @@ export default defineComponent({
 
       this.$MsgDialog({
         type: '',
-        content: `确认要删除字典项 '${n.Name}' 吗?`,
+        content: this.$t('删除确认', { type: this.$t('字典项'), name: n.Name }),
         canCancel: true,
         okText: this.$t('okButtonText'),
         cancelText: this.$t('cancelButtonText'),
@@ -255,6 +256,11 @@ export default defineComponent({
 
       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 = {
@@ -264,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

@@ -116,7 +116,7 @@ export default defineComponent({
       selectedMenuNode,
       editingMenu,
       menuFields,
-      data, 
+      data,
       refreshData,
       validate,
     };
@@ -226,7 +226,7 @@ export default defineComponent({
 
       this.$MsgDialog({
         type: '',
-        content: `确认要删除菜单 '${n.Label}' 吗?`,
+        content: this.$t('删除确认', {type: this.$t('菜单'), name: n.Label}),
         canCancel: true,
         okText: this.$t('okButtonText'),
         cancelText: this.$t('cancelButtonText'),