free-fe-core-modules 0.0.30 → 0.0.32

package/components/Basic/LeveledMenus.vue

@@ -32,7 +32,7 @@
 
       <q-expansion-item
         v-if="m.Sub && m.Sub.length > 0"
-        :modelValue="m.Sub.filter(s => $route.fullPath.startsWith(s.Route)).length > 0"
+        :modelValue="m.Sub.filter(s => $route.fullPath === s.Route || $route.fullPath.startsWith(`${s.Route}/`.replace(/\/\//g, '/'))).length > 0"
         exact
         class="expansion"
         :class="`${group} level_${level || 0}`"

package/components/Basic/SummaryHead.vue

@@ -11,6 +11,7 @@
             ((i < data.length && data[i + 1] && data[i + 1].button) ? ' last-summary' : '')
       "
       :style="'width: 20%;'"
+      @click="$emit('clicked', item)"
     >
       <e-icon
         v-if="item.icon && !item.button"
@@ -82,6 +83,7 @@ import { useObjectData, objectDataProps } from '../../composible/useObjectData';
 
 export default defineComponent({
   name: 'SummaryHead',
+  emits: ['clicked'],
   props: {
     ...objectDataProps,
     has_multiple_head: { type: Boolean, default: false },

package/free-field/Fields/FileList.vue

@@ -380,7 +380,7 @@ export default defineComponent({
       localFiles.value = localFiles.value.filter((f) => !info.files.includes(f));
 
       setFieldData([
-        ...fieldData.value,
+        ...(fieldData.value || []),
         ...uploadedFiles
       ], emit);
       selfValidate();

package/free-field/Fields/ImageList.vue

@@ -289,7 +289,7 @@ export default defineComponent({
       localFiles.value = localFiles.value.filter((f) => !info.files.includes(f));
 
       setFieldData([
-        ...fieldData.value,
+        ...(fieldData.value || []),
         ...uploadedFiles
       ], emit);
       selfValidate();

package/free-field/Fields/Labels.vue

@@ -47,8 +47,8 @@
           v-for="(label, index) in fieldData.value"
           :key="index"
           removable
-          :value="!!fieldData[index]"
-          @remove="fieldData.splice(index,1) && $emit('input')"
+          :value="!!fieldData.value[index]"
+          @remove="fieldData.value.splice(index,1) && $emit('input')"
           :color="Field.BgColor || 'primary'"
           :text-color="Field.Color || 'white'"
         >{{label}}</q-chip>

package/free-field/Fields/Select.vue

@@ -413,7 +413,7 @@ export default defineComponent({
       filterFunc: (val, update) => {
         if (val === '') {
           update(() => {
-            localOptions.value = this.Field.Options || [];
+            localOptions.value = props.Field.Options || [];
           })
           return;
         }
@@ -421,7 +421,7 @@ export default defineComponent({
         update(() => {
           const needle = val.toLowerCase();
 
-          localOptions.value = (this.Field.Options || []).filter(opt => {
+          localOptions.value = (props.Field.Options || []).filter(opt => {
             return `${opt.Label || opt.Value || opt}`.toLowerCase().indexOf(needle) > -1;
           });
         })

package/index.js

@@ -192,6 +192,8 @@ export default (app, root) => {
 
   const appStore = useAppStore();
 
+  const validatorMobilePhone = (d) => !d || /^(0|86|17951)?(13[0-9]|14[0-9]|15[0-9]|16[0-9]|17[0-9]|18[0-9]|19[0-9])[0-9]{8}$/.test(d);
+  const validatorEmail = (d) => !d || /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(d);
   return {
     config: {
       backendDependencies: ["core-modules"],
@@ -376,9 +378,9 @@ export default (app, root) => {
 
     validators: {
       validatorNotEmpty: (d) => d !== void 0 && d.length > 0 && d.trim().length > 0,
-      validatorMobilePhone: (d) => !d || /^(0|86|17951)?(13[0-9]|14[0-9]|15[0-9]|16[0-9]|17[0-9]|18[0-9]|19[0-9])[0-9]{8}$/.test(d),
-      validatorEmail: (d) => !d || /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(d),
-      validatorPhoneOrEmail: (d) => d !== void 0 && d.length > 0 && (this.validatorMobilePhone(d) || this.validatorEmail(d)),
+      validatorMobilePhone,
+      validatorEmail,
+      validatorPhoneOrEmail: (d) => d !== void 0 && d.length > 0 && (validatorMobilePhone(d) || validatorEmail(d)),
       // validatorMinLength: (d, len = 0) => d !== undefined && d.length >= len,
       validatorChinaIDNumber: (d) => !d || /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(d),
       // validatorSame: (d, to) => d === to,

package/package.json

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

package/view/error/list.vue

@@ -4,7 +4,7 @@
     <q-table
       flat
       bordered
-      :rows="data ? data.docs : []"
+      :rows="data?.docs || []"
       :columns="columns"
       row-key="id"
       :hide-bottom="!pagination"