free-fe-core-modules 0.1.12 → 0.1.14

package/free-field/Fields/AgreementCheck.js

@@ -1,4 +1,4 @@
-import { defineComponent, h, ref, getCurrentInstance, defineExpose } from 'vue';
+import { defineComponent, h, ref, getCurrentInstance, watch } from 'vue';
 import { QCheckbox, QIcon } from 'quasar';
 import { useFreeField, freeFieldProps } from '../composible/useFreeField';
 
@@ -21,7 +21,7 @@ export default defineComponent({
     ...freeFieldProps,
   },
   emits: ['input'],
-  setup(props, { emit }){
+  setup(props, { emit, expose }){
     if (!props.Field) return {};
 
     const { proxy:vm } = getCurrentInstance();
@@ -86,7 +86,8 @@ export default defineComponent({
     const validate = () => {
       if (props.Field.Required) {
         hasError.value = typeof fieldData.value === 'undefined' || !fieldData.value;
-        return !hasError.value;
+
+        if (hasError.value) return false;
       }
 
       const rules = Array.isArray(typeof props.Field.Rules)
@@ -100,13 +101,19 @@ export default defineComponent({
         if (typeof r === 'function') {
           isValid = isValid && r(fieldData.value);
         }
+
+        if (!isValid) return false;
       }
 
       hasError.value = !isValid;
       return isValid;
     };
 
-    defineExpose({
+    watch(() => fieldData.value, () => {
+      validate();
+    });
+
+    expose({
       validate,
     })
 

package/free-field/Fields/Check.js

@@ -69,7 +69,7 @@ export default defineComponent({
     ...freeFieldProps,
   },
   emits: ['input'],
-  setup(props, { emit, slots }){
+  setup(props, { emit, slots, expose }){
     if (!props.Field) return {};
 
     const { fieldData, setFieldData } = useFreeField(props);
@@ -86,6 +86,14 @@ export default defineComponent({
       class: 'field-label-empty'
     });
 
+    const validate = () => {
+      if (props.Field?.Required) {
+        return fieldData.value === true;
+      }
+
+      return true;
+    };
+
     const checkboxNode = () => h(QCheckbox, {
       disable: props.Field?.ReadOnly,
       label: props.Field?.showLabel ? '' : props.Field?.Label,
@@ -96,6 +104,10 @@ export default defineComponent({
       'onUpdate:modelValue': (v) => {
         setFieldData(v, emit);
       },
+    });
+
+    expose({
+      validate,
     })
 
     return () => h('div', {

package/free-field/Fields/File.vue

@@ -114,7 +114,7 @@ function parseStaticResourceParams(paramStr, route) {
 
   let finalParamStr = paramStr || '';
 
-  const paramList = paramStr.match(/\{[^\}]+\}/g);
+  const paramList = paramStr.match(/\{[^\\}]+\}/g);
   const paramValuesMap = {};
   for (let i = 0; i < paramList.length; i += 1) {
     const varItem = paramList[i];

package/free-field/Fields/FileList.vue

@@ -136,7 +136,7 @@ function parseStaticResourceParams(paramStr, route) {
 
   let finalParamStr = paramStr || '';
 
-  const paramList = paramStr.match(/\{[^\}]+\}/g);
+  const paramList = paramStr.match(/\{[^\\}]+\}/g);
   const paramValuesMap = {};
   for (let i = 0; i < paramList.length; i += 1) {
     const varItem = paramList[i];

package/free-field/Fields/FreeFieldList.vue

@@ -121,7 +121,7 @@ export default defineComponent({
               {
                 Label: '标题',
                 Name: 'Label',
-                style: 'max-width: 300px; min-width: 100px',
+                style: 'max-width: 300px; min-width: 100px;white-space: wrap; text-align: left;',
                 sortable: true,
               },
               {

package/free-field/Fields/Image.vue

@@ -123,7 +123,7 @@ function parseStaticResourceParams(paramStr, route) {
 
   let finalParamStr = paramStr || '';
 
-  const paramList = paramStr.match(/\{[^\}]+\}/g);
+  const paramList = paramStr.match(/\{[^\\}]+\}/g);
   const paramValuesMap = {};
   for (let i = 0; i < paramList.length; i += 1) {
     const varItem = paramList[i];

package/free-field/Fields/ImageList.vue

@@ -115,7 +115,7 @@ function parseStaticResourceParams(paramStr, route) {
 
   let finalParamStr = paramStr || '';
 
-  const paramList = paramStr.match(/\{[^\}]+\}/g);
+  const paramList = paramStr.match(/\{[^\\}]+\}/g);
   const paramValuesMap = {};
   for (let i = 0; i < paramList.length; i += 1) {
     const varItem = paramList[i];

package/free-field/Fields/Row.vue

@@ -138,7 +138,11 @@ export default defineComponent({
   },
   computed: {
     rowClasses() {
-      return this.Field.Options?.NoWrap ? 'nowrap' : '' + this.Field.Options?.ItemsAlign + ' ' + this.Field.Options?.JustifyAlign;
+      const wrap = this.Field.Options?.NoWrap ? 'nowrap' : '';
+      const itemsAlign = this.Field.Options?.ItemsAlign || '';
+      const justifyAlign = this.Field.Options?.JustifyAlign || '';
+
+      return [wrap, itemsAlign, justifyAlign].filter((cls) => cls).join(' ');
     },
   },
 });

package/free-field/Fields/Select.vue

@@ -68,7 +68,7 @@
           @keyup.stop
           @input="innerExtraFieldInput(fld)"
           v-for="(fld, idx) in selectedOptionsExtra" :key="idx"
-          :Field="{...fld, ReadOnly: Field.ReadOnly || fld.ReadOnly}"
+          :Field="{...fld, ReadOnly: Field.ReadOnly || fld?.ReadOnly}"
           :values="values"
           ref="fieldToValid">
         </free-field>
@@ -128,7 +128,7 @@
                   @keyup.stop
                   @input="innerExtraFieldInput(fld)"
                   v-for="(fld, idx) in option.InnerExtra || []" :key="idx"
-                  :Field="{...fld, ReadOnly: Field.ReadOnly || fld.ReadOnly}"
+                  :Field="{...fld, ReadOnly: Field.ReadOnly || fld?.ReadOnly}"
                   :values="values"
                   ref="fieldToValid">
                 </free-field>
@@ -470,7 +470,7 @@ export default defineComponent({
         opts = (localOptions.value || []).filter((opt) => opt.Value === fieldData.value);
       }
 
-      return opts.map((opt) => opt.Extra).flat();
+      return opts.map((opt) => opt.Extra).flat().filter((f) => f?.Name || f?.Label);
     });
 
 

package/package.json

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