free-fe-core-modules 0.0.37 → 0.0.39

package/components/Dialog/BasicDialog.vue

@@ -109,7 +109,6 @@ import EIcon from '../Basic/EIcon.vue';
 
 export default defineComponent({
   name: 'BasicDialog',
-  // mixins: [mixins.InputFieldValidator],
   emits: ['hide', 'ok', 'cancel'],
   props: {
     persistent: { type: Boolean, default: true },

package/free-field/Fields/Column.vue

@@ -3,16 +3,16 @@
     <free-field
       v-for="(field, idx) in Field.Options?.Fields"
       :Field="field"
-      :values="fieldData"
+      :values="fieldData.value"
       :key="idx"
       ref="fieldsToValidate"
-      @input="$emit('input', field)"></free-field>
+      @input="changed"></free-field>
   </div>
 </template>
 
 <script>
 import { defineComponent } from 'vue';
-import { freeFieldProps } from '../composible/useFreeField';
+import { freeFieldProps, useFreeField } from '../composible/useFreeField';
 import { useFormValidator} from '../../composible/useFormValidator';
 
 export default defineComponent({
@@ -119,13 +119,21 @@ export default defineComponent({
     ],
     Description: '',
   },
-  setup(props) {
+  emits: ['input'],
+  setup(props, { emit }) {
     if(!props.Field) return () => null;
 
+    const { fieldData } = useFreeField(props);
     const { validate } = useFormValidator('fieldsToValidate');
 
     return {
+      fieldData,
       validate,
+
+      changed: (fld) => {
+        const newValue = props.Field.Name === '.' ? Object.nestValue(fieldData, fld.Name) : fieldData;
+        emit('input', newValue, props.Field.Name === '.' ? fld : props.Field);
+      }
     }
   },
   computed: {

package/free-field/Fields/DynamicList.js

@@ -224,7 +224,7 @@ export default defineComponent({
         for (let i = 0; i < tableData.value.length; i += 1) {
           const td = tableData.value[i];
 
-          td.auto__index = td.auto__index || i;
+          td.auto__index = i;
         }
       }
     });

package/free-field/Fields/File.vue

@@ -334,8 +334,6 @@ export default defineComponent({
         }
       }
 
-      console.log('uploadedFiles', uploadedFiles);
-
       setFieldData(uploadedFiles, emit);
       selfValidate();
     }

package/free-field/Fields/FileList.vue

@@ -392,8 +392,6 @@ export default defineComponent({
       //   ...(uploader.value?.files || []),
       // ];
 
-      console.log('allFiles', fieldData.value, localFiles.value);
-
       return [].concat(fieldData.value || []).concat(localFiles.value)
     });
 

package/free-field/Fields/Image.vue

@@ -165,6 +165,7 @@
           round size="20px"
           @click="showPreview=false"></q-icon>
         <q-img
+          fit="contain"
           v-if="previewType === 'image'"
           contain :src="previewFile"
           @click="showPreview=false"

package/free-field/Fields/ImageList.vue

@@ -301,8 +301,6 @@ export default defineComponent({
       //   ...(uploader.value?.files || []),
       // ];
 
-      console.log('allFiles', fieldData.value, localFiles.value);
-
       return [].concat(fieldData.value || []).concat(localFiles.value)
     });
 

package/free-field/Fields/Number.js

@@ -149,7 +149,6 @@ export default defineComponent({
 
       if (props.Field.Options.IntegerOnly) {
         const ll = props.Field.Options.MaxLength || 15;
-        console.log('mask', Array.from({length: ll}).map(() => '#').join(''))
         return Array.from({length: ll}).map(() => '#').join('');
       }
 

package/free-field/Fields/Row.vue

@@ -3,17 +3,16 @@
     <free-field
       v-for="(field, idx) in Field.Options?.Fields"
       :Field="field"
-      :values="fieldData"
+      :values="fieldData.value"
       :key="idx"
       ref="fieldsToValidate"
-      @input="$emit('input', field)"></free-field>
+      @input="changed"></free-field>
   </div>
 </template>
 
 <script>
-// TODO: correct the validations
 import { defineComponent } from 'vue';
-import { freeFieldProps } from '../composible/useFreeField';
+import { freeFieldProps, useFreeField } from '../composible/useFreeField';
 import { useFormValidator} from '../../composible/useFormValidator';
 
 export default defineComponent({
@@ -120,13 +119,21 @@ export default defineComponent({
     ],
     Description: '',
   },
-  setup(props) {
+  emits: ['input'],
+  setup(props, { emit }) {
     if(!props.Field) return () => null;
 
+    const { fieldData } = useFreeField(props);
     const { validate } = useFormValidator('fieldsToValidate');
 
     return {
+      fieldData,
       validate,
+
+      changed: (fld) => {
+        const newValue = props.Field.Name === '.' ? Object.nestValue(fieldData, fld.Name) : fieldData;
+        emit('input', newValue, props.Field.Name === '.' ? fld : props.Field);
+      }
     }
   },
   computed: {

package/free-field/Fields/Search.vue

@@ -28,7 +28,7 @@
           <q-table
             :flat="Field.Options?.Flat"
             :bordered="Field.Options?.Bordered"
-            :rows="searchData ? searchData.docs : []"
+            :rows="searchData.docs || []"
             :columns="searchColumns"
             row-key="id"
             :pagination="searchPagination"
@@ -200,6 +200,12 @@ export default defineComponent({
         Name: 'Options.SearchField',
         Default: 'id',
       },
+      {
+        Type: 'String',
+        Label: '搜索传输字段名',
+        Name: 'Options.SearchKeyName',
+        Default: 'search',
+      },
       {
         Type: 'String',
         Label: '显示字段',
@@ -423,9 +429,12 @@ export default defineComponent({
         return;
       }
 
+      const reqBody = {...(p ? {page: p} : {})};
+      reqBody[this.Field.Options?.SearchKeyName || 'search'] = this.searchKey;
+
       this.getRequest(
           this.Field.Options.SearchUrl,
-          {search: this.searchKey, ...(p ? {page: p} : {})}
+          reqBody,
         )
         .then((d) => {
           if (d && d.msg === 'OK') {

package/free-field/Fields/Select.vue

@@ -61,6 +61,8 @@
         :use-chips="Field && (Field.UseChip || (Field.Info && Field.Info.Chip))"
         v-bind="inputControlSettings"
         :rules="Field.Rules"
+
+        :new-value-mode="Field?.NewValueMode ? 'add' : undefined"
       >
         <template v-slot:before>
           <span

package/free-field/Fields/Tabs.vue

@@ -37,6 +37,7 @@
           v-for="(t, idx) in fieldData.value" :key="idx"
           :name="idx">
           <free-field
+            :class="`${Field.Options.HideFieldWhenEmpty ? `free-field-tabs-panel-field-${Object.nestValue(t, field.Name) === void 0 ? 'empty' : 'with-value'}` : ''}`"
             v-for="(field, idx) in Field.Options?.Fields"
             :Field="field"
             :values="t"
@@ -72,6 +73,11 @@ export default defineComponent({
         Label: '数值字段名',
         Name: 'Options.ValueField',
       },
+      {
+        Type: 'Boolean',
+        Label: '子字段值不存在时隐藏',
+        Name: 'Options.HideFieldWhenEmpty',
+      },
       {
         Label: '字段',
         Name: 'Options.Fields',
@@ -157,5 +163,9 @@ export default defineComponent({
       border-bottom: 1px solid;
     }
   }
+
+  .input-field-tabs-panel-field-empty {
+    display: none;
+  }
 }
 </style>

package/free-field/composible/fieldWrapper.js

@@ -196,8 +196,13 @@ export default defineComponent({
           props.Field.ReadOnly ? "free-field--readonly" : "",
           !shouldHide.value && hasError.value ? "hasError" : "",
         ],
-        onInput: () => {
-          emit("input", props.Field);
+        /**
+         *
+         * @param {any} _ value of the changed field
+         * @param {Field} fld the changed field (optional)
+         */
+        onInput: (_, fld) => {
+          emit("input", fld || props.Field);
         },
         ...compEmits.value,
       },

package/package.json

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