free-fe-core-modules 0.0.41 → 0.0.42

package/components/Basic/EIcon.vue

@@ -19,12 +19,11 @@
         </div>
       </template>
     </q-img>
-    <!-- <q-icon v-else :name="ctx.config.defaultIcon">he</q-icon> -->
   </span>
 </template>
 
 <script>
-import { defineComponent } from 'vue';
+import { ref, computed, defineComponent, getCurrentInstance, watchEffect, nextTick } from 'vue';
 
 export default defineComponent({
   name: 'EIcon',
@@ -36,28 +35,38 @@ export default defineComponent({
     hideError: { type: Boolean, default: false },
     defaultSize: { type: String, default: '@2x' },
   },
-  computed: {
-    isIcon() {
-      return this.name && (typeof this.name === 'string') && (this.name.startsWith('img:') || this.name.indexOf('/') < 0);
-    },
-    imgPath() {
-      if (typeof this.name !== 'string' || !this.name) return '';
+  setup(props) {
+    const { proxy:vm } = getCurrentInstance();
 
-      if (this.name.startsWith('data:')) return this.name;
+    const imgPath = ref('');
+    watchEffect(() => {
+      if (typeof props.name !== 'string' || !props.name) return '';
 
-      if (this.name.startsWith('http://')) return this.name;
+      if (props.name.startsWith('data:')) return props.name;
 
-      if (this.name.startsWith('https://')) return this.name;
+      if (props.name.startsWith('http://')) return props.name;
 
-      if (this.name.startsWith('blob:')) return this.name;
+      if (props.name.startsWith('https://')) return props.name;
+
+      if (props.name.startsWith('blob:')) return props.name;
 
       // TODO:默认使用二倍图？
-      if (this.relative) return `images/${this.name}${this.defaultSize}.png`;
+      if (props.relative) return `images/${props.name}${props.defaultSize}.png`;
+
+      const ret = props.thumb
+        ? vm.$filter('serverThumb', props.name)
+        : vm.$filter('serverImage', props.name);
+
+      // 某些情况下不能及时显示缩略图，延迟设置图片路径
+      setTimeout(() => {
+        imgPath.value = ret;
+      }, 200);
+    })
 
-      return this.thumb
-        ? this.$filter('serverThumb', this.name)
-        : this.$filter('serverImage', this.name);
-    },
+    return {
+      isIcon: computed(() => props.name && (typeof props.name === 'string') && (props.name.startsWith('img:') || props.name.indexOf('/') < 0)),
+      imgPath,
+    };
   },
 });
 </script>

package/free-field/Fields/Image.vue

@@ -62,7 +62,7 @@
         >
           <q-uploader-add-trigger />
         </q-btn>
-        
+
         <div v-else-if="(Field.onlyIcon || onlyIcon) && fieldData.value && fieldData.value[0]?.id">
           <q-img
             :src="$filter('serverThumb', `${fieldData.value[0].id}`)"
@@ -187,9 +187,9 @@
 
 <script>
 import { defineComponent, getCurrentInstance, ref } from 'vue';
-import { useFreeField, freeFieldProps } from '../composible/useFreeField';
-import { useFormValidator} from '../../composible/useFormValidator';
-import { useUploader } from '../composible/useUploader';
+import { useFreeField, freeFieldProps } from 'free-fe-core-modules/free-field/composible/useFreeField';
+import { useFormValidator} from 'free-fe-core-modules/composible/useFormValidator';
+import { useUploader } from 'free-fe-core-modules/free-field/composible/useUploader';
 
 export default defineComponent({
   name: 'InputFieldImage',
@@ -333,17 +333,16 @@ export default defineComponent({
       factoryFn,
       uploaded,
 
-      removeFile: () => {
+      removeFile: (files = []) => {
         setFieldData([], emit);
         selfValidate();
+
+        uploader.value.files = uploader.value.files.filter((f) => {
+          return files.findIndex((file) => file.name === f.name && file.size === f.size) < 0;
+        });
       },
     };
   },
-  // methods: {
-  //   fileAdded(files) {
-  //     this.$refs.uploader.files = files;
-  //   },
-  // },
 });
 </script>
 

package/free-field/Fields/ImageList.vue

@@ -340,10 +340,14 @@ export default defineComponent({
         return fieldData.value?.length < props.Field?.Options?.MaxCount;
       }),
       dense: computed(() => props.Field?.dense || props.Field?.Options?.Dense),
-      removeFile: (files) => {
+      removeFile: (files = []) => {
         localFiles.value = localFiles.value.filter((f) => !files.includes(f));
         setFieldData(fieldData.value.filter((f) => !files.includes(f)), emit);
         selfValidate();
+
+        uploader.value.files = uploader.value.files.filter((f) => {
+          return files.findIndex((file) => file.name === f.name && file.size === f.size) < 0;
+        });
       },
     };
   },

package/free-field/composible/useUploader.js

@@ -297,6 +297,9 @@ export function useUploader(props, ctx) {
     filePreview,
 
     filesRejected (rejectedEntries) {
+      // 忽略duplicate错误
+      rejectedEntries = rejectedEntries.filter((entry) => entry.failedPropValidation !== 'duplicate');
+
       if (rejectedEntries && rejectedEntries.length > 0) {
         const fName = rejectedEntries[0] && rejectedEntries[0].file && rejectedEntries[0].file.name;
         const fSize = fileSizeNumberToStr(

package/package.json

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