free-fe-core-modules 0.0.51 → 0.0.53

package/components/ThemeSwitch/index.vue

@@ -18,7 +18,7 @@
             :key="index"
             clickable
             v-close-popup
-            @click="theme = tm"
+            @click="setTheme(tm)"
             :active="theme === tm"
           >
             <q-item-section>{{$t(tm)}}</q-item-section>
@@ -39,6 +39,7 @@ export default defineComponent({
     icon: { type: String, default: 'fas fa-palette' },
     dense: { type: Boolean, default: true },
     hide: { type: Boolean, default: false },
+    reload: { type: Boolean, default: false },
   },
   data() {
     return {
@@ -102,6 +103,17 @@ export default defineComponent({
     const appStore = useAppStore();
     this.theme = appStore.theme || this.ctx.config.defaultTheme || (this.themes && (this.themes.length > 0) && this.themes[0]);
   },
+  methods: {
+    setTheme(tm) {
+      if (!tm || this.theme === tm) return;
+
+      this.theme = tm;
+
+      if (this.reload) {
+        window.location.reload();
+      }
+    },
+  },
 });
 </script>
 

package/free-field/Fields/File.vue

@@ -282,8 +282,8 @@ export default defineComponent({
 
     const selfValidate = () => {
       if (props.Field?.Required) {
-        hasError.value = fieldData.value?.length <= 0;
-        return fieldData.value?.length > 0;
+        hasError.value = !!fieldData.value?.id;
+        return !!fieldData.value?.id;
       }
 
       const rules = Array.isArray(typeof props.Field.Rules) ? props.Field.Rules : [props.Field.Rules];
@@ -309,42 +309,41 @@ export default defineComponent({
     };
 
     const uploaded = (info) => {
-      const uploadedFiles = [];
-      for (let i = 0; i < info.files.length; i += 1) {
-        const file = info.files[i];
+      // File组件只允许一个文件
+      const file = info.files[0];
 
-        const { xhr } = file;
-        let res;
-        if (xhr && xhr.response) {
-          if (typeof xhr.response === 'string') {
-            //
-            res = JSON.parse(xhr.response);
-          } else if (typeof xhr.response === 'object') {
-            //
-            res = xhr.response;
-          } else {
-            //
-            return;
-          }
+      if (!file) return;
 
-          if (res && res.msg === 'OK') {
-            uploadedFiles.push({
-              id: res.data.id,
-              // eslint-disable-next-line no-underscore-dangle
-              sizeLabel: file.__sizeLabel,
-              name: file.name,
-              size: file.size,
-              type: file.type,
-            });
-          }
-        } else if (file.id) {
-          // old files
-          uploadedFiles.push(file);
+      const { xhr } = file;
+      let res;
+      if (xhr && xhr.response) {
+        if (typeof xhr.response === 'string') {
+          //
+          res = JSON.parse(xhr.response);
+        } else if (typeof xhr.response === 'object') {
+          //
+          res = xhr.response;
+        } else {
+          //
+          return;
         }
-      }
 
-      setFieldData(uploadedFiles, emit);
-      selfValidate();
+        if (res && res.msg === 'OK') {
+          setFieldData({
+            id: res.data.id,
+            // eslint-disable-next-line no-underscore-dangle
+            sizeLabel: file.__sizeLabel,
+            name: file.name,
+            size: file.size,
+            type: file.type,
+          }, emit);
+          selfValidate();
+        }
+      } else if (file.id) {
+        // old files
+        setFieldData(file, emit);
+        selfValidate();
+      }
     }
 
     const { validate } = useFormValidator();

package/free-field/Fields/Image.vue

@@ -108,8 +108,8 @@
             flat
             class="file-list-item"
             v-for="(file, index) in fieldData.value" :key="index">
-              <e-icon class="file-image" 
-                :name="fileThumb(file)" 
+              <e-icon class="file-image"
+                :name="fileThumb(file)"
                 :thumb="!Field?.Options?.NoThumb"
                 :relative="filePreviewType(file) !== 'image'"
                 @click="preview(file)">
@@ -249,8 +249,8 @@ export default defineComponent({
 
     const selfValidate = () => {
       if (props.Field?.Required) {
-        hasError.value = fieldData.value?.length <= 0;
-        return fieldData.value?.length > 0;
+        hasError.value = !!fieldData.value?.id;
+        return !!fieldData.value?.id;
       }
 
       const rules = Array.isArray(typeof props.Field.Rules) ? props.Field.Rules : [props.Field.Rules];
@@ -276,42 +276,41 @@ export default defineComponent({
     };
 
     const uploaded = (info) => {
-      const uploadedFiles = [];
-      for (let i = 0; i < info.files.length; i += 1) {
-        const file = info.files[i];
+      // Image组件只允许一个图片
+      const file = info.files[0];
 
-        const { xhr } = file;
-        let res;
-        if (xhr && xhr.response) {
-          if (typeof xhr.response === 'string') {
-            //
-            res = JSON.parse(xhr.response);
-          } else if (typeof xhr.response === 'object') {
-            //
-            res = xhr.response;
-          } else {
-            //
-            return;
-          }
+      if (!file) return;
 
-          if (res && res.msg === 'OK') {
-            uploadedFiles.push({
-              id: res.data.id,
-              // eslint-disable-next-line no-underscore-dangle
-              sizeLabel: file.__sizeLabel,
-              name: file.name,
-              size: file.size,
-              type: file.type,
-            });
-          }
-        } else if (file.id) {
-          // old files
-          uploadedFiles.push(file);
+      const { xhr } = file;
+      let res;
+      if (xhr && xhr.response) {
+        if (typeof xhr.response === 'string') {
+          //
+          res = JSON.parse(xhr.response);
+        } else if (typeof xhr.response === 'object') {
+          //
+          res = xhr.response;
+        } else {
+          //
+          return;
         }
-      }
 
-      setFieldData(uploadedFiles, emit);
-      selfValidate();
+        if (res && res.msg === 'OK') {
+          setFieldData({
+            id: res.data.id,
+            // eslint-disable-next-line no-underscore-dangle
+            sizeLabel: file.__sizeLabel,
+            name: file.name,
+            size: file.size,
+            type: file.type,
+          }, emit);
+          selfValidate();
+        }
+      } else if (file.id) {
+        // old files
+        setFieldData(file, emit);
+        selfValidate();
+      }
     }
 
     const { validate } = useFormValidator();

package/free-field/Fields/Number.js

@@ -157,7 +157,7 @@ export default defineComponent({
 
     const inputNode = computed(() => h(QInput, {
       type: mask.value ? 'text' : 'number',
-      mask,
+      mask: mask.value,
       maxlength: props.Field.Options?.MaxLength,
       autocomplete: 'off',
       // bottomSlots: true,

package/free-field/Fields/Select.vue

@@ -166,10 +166,10 @@
               {{$t(option.opt.Tooltip) || ''}}
             </q-tooltip>
             <div class="option-inner-extra" v-if="option.InnerExtra?.length">
-              <input-field
+              <free-field
                 v-for="(fld, idx) in option.InnerExtra || []" :key="idx"
                 :Field="fld"
-                :values="data"></input-field>
+                :values="data"></free-field>
             </div>
           </q-checkbox>
         </div>

package/free-field/Fields/Tabs.vue

@@ -164,7 +164,7 @@ export default defineComponent({
     }
   }
 
-  .input-field-tabs-panel-field-empty {
+  .free-field-tabs-panel-field-empty {
     display: none;
   }
 }

package/package.json

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