free-fe-core-modules 0.0.16 → 0.0.18

package/components/Basic/EIcon.vue

@@ -49,8 +49,11 @@ export default defineComponent({
 
       if (this.name.startsWith('https://')) return this.name;
 
+      if (this.name.startsWith('blob:')) return this.name;
+
       // TODO:默认使用二倍图？
       if (this.relative) return `images/${this.name}${this.defaultSize}.png`;
+
       return this.thumb
         ? this.$filter('serverThumb', this.name)
         : this.$filter('serverImage', this.name);

package/composible/useFormValidator.js

@@ -43,6 +43,10 @@ export function useFormValidator(...list) {
             hasErr = !validFun() || hasErr;
 
             if (hasErr) {
+              if (refi.el?.className) {
+                refi.el.className += ' hasError';
+              }
+
               console.error('got error', args)
               break;
             }

package/free-field/Fields/AgreementCheck.js

@@ -125,15 +125,15 @@ export default defineComponent({
 
     const tipsNode = () => h('div', {},[
       h('span', {
-        class: 'input-field-tips-prefix'
+        class: 'free-field-ips-prefix'
       }),
       h('span',{
         class: 'tips-list'
       }, (props.Field.Tips || []).map((tip) => h('span', {
-        class:'input-field-tips-tip',
+        class:'free-field-tips-tip',
       }, [
         h('span', {
-          class: 'input-field-tips-tip-prefix'
+          class: 'free-field-tips-tip-prefix'
         }),
         fieldTip(tip).map((t) => h('span', {}, [
           t.Link ? h('span', {
@@ -147,25 +147,25 @@ export default defineComponent({
           ]) : h('span',{class: 'tip-text'}, t.Text),
         ])),
         h('span', {
-          class: 'input-field-tips-tip-postfix'
+          class: 'free-field-tips-tip-postfix'
         })
       ]))),
       h('span',{
-        class: 'input-field-tips-postfix'
+        class: 'free-field-tips-postfix'
       })
     ]);
 
     return () => h('div', {
-      class: `input-field-agreement-check row items-center no-wrap\
+      class: `free-field-agreement-check row items-center no-wrap\
               ${props.Field.Options?.Center ? 'center full-width justify-center' : ''}`,
     }, h('div',{
-      class: `row no-wrap items-center relative-position ${hasError.value ? 'input-field--error' : ''}`,
+      class: `row no-wrap items-center relative-position ${hasError.value ? 'free-field--error' : ''}`,
     },[
       props.Field.Options?.Center || h('span', { class: 'field-label-empty', }),
       checkboxNode(),
       tipsNode(),
       hasError.value && h('div', {
-        class: 'input-field--error-tag',
+        class: 'free-field--error-tag',
       }, h(QIcon,{
         name: 'error',
       }))

package/free-field/Fields/ApiCall.js

@@ -111,7 +111,7 @@ export default defineComponent({
     });
 
     return () => h('div', {
-      class: 'simple-field input-field-apicall row items-center no-wrap',
+      class: 'simple-field free-field-apicall row items-center no-wrap',
     }, [
       readonlyNode(),
       slots.warning && slots.warning(),

package/free-field/Fields/Boolean.js

@@ -1,4 +1,4 @@
-import { defineComponent, h, ref } from 'vue';
+import { defineComponent, h, watchEffect } from 'vue';
 import { useFreeField, freeFieldProps } from '../composible/useFreeField';
 import { QToggle } from 'quasar';
 import freeFieldLabel from '../composible/freeFieldLabel';
@@ -11,57 +11,18 @@ export default defineComponent({
     Value: 'Boolean',
     Extra: [
       {
-        Type: 'FixedList',
-        Label: '选项',
-        Name: 'Options',
+        Type: 'Boolean',
+        Label: '显示标签',
+        Name: 'Options.ShowLabel',
         Options: {
-          Columns: [
-            {
-              Label: 'Label',
-              Name: 'Label',
-              ReadOnly: true,
-            },
-            {
-              Label: 'Value',
-              Name: 'Value',
-              ReadOnly: true,
-            },
-            {
-              Label: 'Extra',
-              Name: 'Extra',
-              Type: 'FieldList',
-              Options: {
-                Columns: [
-                  {
-                    Label: '#',
-                    Name: 'Index',
-                  },
-                  {
-                    Label: '名称',
-                    Name: 'Name',
-                  },
-                  {
-                    Label: '标题',
-                    Name: 'Label',
-                  },
-                ],
-              },
-            },
-          ],
-          Default: [
-            {
-              Label: '开',
-              Value: true,
-              Extra: [],
-            },
-            {
-              Label: '关',
-              Value: false,
-              Extra: [],
-            },
-          ],
+          ShowLabel: true,
         },
       },
+      {
+        Type: 'String',
+        Label: '右侧标签',
+        Name: 'Options.RightLabel',
+      },
     ],
     Description: '',
   },
@@ -74,7 +35,13 @@ export default defineComponent({
 
     const { fieldData, setFieldData } = useFreeField(props);
 
-    const before = (props.Field.showLabel && !props.Field.dense && props.Field.Label !== void 0) ? () => h(freeFieldLabel, {
+    watchEffect(() => {
+      if (fieldData.value === void 0) {
+        setFieldData(props.Field.Default || false);
+      }
+    })
+
+    const before = (props.Field.Options?.showLabel && !props.Field.dense && props.Field.Label !== void 0) ? () => h(freeFieldLabel, {
       Field: props.Field,
     }) : () => h('div', {
       class: 'field-label-empty'
@@ -82,7 +49,7 @@ export default defineComponent({
 
     const toggleNode = () => h(QToggle, {
       disable: props.Field?.ReadOnly,
-      label: props.Field?.showLabel ? props.Field?.Lable :  '',
+      label: props.Field?.Options?.RightLabel || (!props.Field?.Options?.showLabel && props.Field?.Label) ||  '',
 
       style: props.Field.Info?.Style,
 
@@ -93,7 +60,7 @@ export default defineComponent({
     })
 
     return () => h('div', {
-      class: 'simple-field input-field-boolean row items-center no-wrap',
+      class: 'simple-field free-field-boolean row items-center no-wrap',
     }, [
       before(),
       toggleNode(),

package/free-field/Fields/Category.js

@@ -18,7 +18,7 @@ export default defineComponent({
     if (!props.Field || (typeof props.Field.Label === 'undefined')) return;
 
     return () => h('div', {
-      class: 'simple-field input-field-category row items-center no-wrap',
+      class: 'simple-field free-field-category row items-center no-wrap',
     }, [
       h('span', {
         class: 'label'

package/free-field/Fields/Check.js

@@ -1,4 +1,4 @@
-import { defineComponent, h, ref } from 'vue';
+import { defineComponent, h, watchEffect } from 'vue';
 import { useFreeField, freeFieldProps } from '../composible/useFreeField';
 import { QCheckbox } from 'quasar';
 import freeFieldLabel from '../composible/freeFieldLabel';
@@ -73,7 +73,12 @@ export default defineComponent({
     if (!props.Field) return {};
 
     const { fieldData, setFieldData } = useFreeField(props);
-    fieldData.value = fieldData.value || false;
+
+    watchEffect(() => {
+      if (fieldData.value === void 0) {
+        setFieldData(props.Field.Default || false);
+      }
+    })
 
     const before = (props.Field.showLabel && !props.Field.dense && props.Field.Label !== void 0) ? () => h(freeFieldLabel, {
       Field: props.Field,
@@ -94,7 +99,7 @@ export default defineComponent({
     })
 
     return () => h('div', {
-      class: 'simple-field input-field-check row items-center no-wrap',
+      class: 'simple-field free-field-check row items-center no-wrap',
     }, [
       before(),
       checkboxNode(),

package/free-field/Fields/Column.vue

@@ -1,20 +1,23 @@
 <template>
-  <div class="input-field-column column" :class="columnClasses">
-    <input-field
-      v-for="(field, idx) in Field.Options.List"
+  <div class="free-field-column column" :class="columnClasses" v-if="Field">
+    <free-field
+      v-for="(field, idx) in Field.Options?.List"
       :Field="field"
       :values="fieldData"
       :key="idx"
-      @input="$emit('input')"></input-field>
+      @input="$emit('input')"></free-field>
   </div>
 </template>
 
 <script>
-import { InputFieldMixin } from 'eis-admin-mixins';
+import { defineComponent } from 'vue';
+import { freeFieldProps } from '../composible/useFreeField';
 
-export default {
+export default defineComponent({
   name: 'InputFieldColumn',
-  mixins: [InputFieldMixin],
+  props: {
+    ...freeFieldProps,
+  },
   fieldInfo: {
     Category: 'Container',
     Label: '列',
@@ -116,10 +119,10 @@ export default {
   },
   computed: {
     columnClasses() {
-      return '';
+      return this.Field.Options?.NoWrap ? 'nowrap' : '' + this.Field.Options?.ItemsAlign + ' ' + this.Field.Options?.JustifyAlign;
     },
   },
-};
+});
 </script>
 
 <style lang="scss" scoped>

package/free-field/Fields/Customize.js

@@ -77,7 +77,7 @@ export default defineComponent({
     }, );
 
     return () => h('div', {
-      class: 'input-field-customize',
+      class: 'free-field-customize',
     }, [
       before(),
       contentNode(),

package/free-field/Fields/Date.js

@@ -2,6 +2,7 @@ import { ref, defineComponent, getCurrentInstance, h, computed } from 'vue';
 import { QInput, QIcon, QPopupProxy, QDate } from 'quasar';
 import { useFreeField, freeFieldProps } from '../composible/useFreeField';
 import freeFieldLabel from '../composible/freeFieldLabel';
+import ReadonlyContent from '../composible/readonlyContent';
 import { useFormValidator} from '../../composible/useFormValidator';
 
 export default defineComponent({
@@ -43,7 +44,7 @@ export default defineComponent({
 
     const { proxy: vm } = getCurrentInstance();
 
-    const { fieldData, setFieldData } = useFreeField(props);
+    const { fieldData, setFieldData, inputControlSettings } = useFreeField(props);
 
     const before = (props.Field.Label !== void 0) ? () => h(freeFieldLabel, {
       Field: props.Field,
@@ -86,6 +87,9 @@ export default defineComponent({
 
       rules: props.Field.Rules,
 
+      ...inputControlSettings.value,
+
+      class: 'full-width',
       modelValue: localDate.value,
       'onUpdate:modelValue': (v) => {
         setFieldData(v, emit);
@@ -121,6 +125,11 @@ export default defineComponent({
       }),
     }));
 
+    const readonlyNode = () => h(ReadonlyContent, {
+      Field: props.Field,
+      Content: fieldData.value,
+    });
+
     const {
       validate,
     } = useFormValidator(DateNode);
@@ -129,7 +138,7 @@ export default defineComponent({
     })
 
     return () => h('div', {
-      class: 'simple-field input-field-date row items-center no-wrap',
+      class: 'simple-field free-field-date row items-center no-wrap',
     }, [
       props.Field.ReadOnly ? readonlyNode() : DateNode.value,
       slots.warning && slots.warning(),

package/free-field/Fields/DateRange.js

@@ -43,7 +43,7 @@ export default defineComponent({
 
     const { proxy: vm } = getCurrentInstance();
 
-    const { fieldData, setFieldData } = useFreeField(props);
+    const { fieldData, setFieldData, inputControlSettings } = useFreeField(props);
 
     const updateFieldDate = () => {
       setFieldData([min.value, max.value].join(props.Field.Separator || '~'), emit);
@@ -125,6 +125,8 @@ export default defineComponent({
 
       rules: props.Field.Rules,
 
+      ...inputControlSettings.value,
+
       modelValue: min.value,
       'onUpdate:modelValue': (v) => {
         min.value = v;
@@ -170,6 +172,8 @@ export default defineComponent({
 
       rules: props.Field.Rules,
 
+      ...inputControlSettings.value,
+
       modelValue: max.value,
       'onUpdate:modelValue': (v) => {
         max.value = v;
@@ -212,14 +216,14 @@ export default defineComponent({
     })
 
     return () => h('div', {
-      class: 'simple-field input-field-date row items-center no-wrap',
+      class: 'simple-field free-field-date row items-center no-wrap',
     }, [
       props.Field.ReadOnly ? readonlyNode() : h('div', {
         class: 'row items-center no-wrap'
       }, [
         minDateNode.value,
         h('span', {
-          class: 'input-field-range-separator'
+          class: 'free-field-range-separator'
         },props.Field.Separator || '~'),
         maxDateNode.value,
       ]),

package/free-field/Fields/DynamicList.js

@@ -504,6 +504,7 @@ export default defineComponent({
             colspan: slotProps.value ? slotProps.value.colspan || "1" : "1",
             rowspan: slotProps.value ? slotProps.value.rowspan || "1" : "1",
             class: "items-center justify-center",
+            style: "padding:0;margin:0;height:auto;width:auto",
           },
           () => h(
             "span",
@@ -556,7 +557,7 @@ export default defineComponent({
 
 
     return () => h('div', {
-      class: 'input-field-dynamic-list row',
+      class: 'free-field-dynamic-list row',
     }, [
       before,
       tableNode(),