mali-ui-plus 1.0.4 → 1.0.6

package/lib/mali-ui-plus.common.js

@@ -68389,11 +68389,7 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
   __name: 'MlUpload',
   props: {
     modelValue: {
-      type: Array,
-      default: () => []
-    },
-    urlList: {
-      type: Array,
+      type: [Array, String, Object],
       default: () => []
     },
     params: {
@@ -68521,8 +68517,14 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
       return fieldMaps.value.fileName || 'fileName';
     });
     const loadList = () => {
+      let vals = [];
+      if (xe_utils_default().isArray(props.modelValue)) {
+        vals = props.modelValue;
+      } else if (props.modelValue && xe_utils_default().isString(props.modelValue)) {
+        vals = [props.modelValue];
+      }
       if (props.simpleValue) {
-        fileList.value = (props.urlList && props.urlList.length ? props.urlList : props.modelValue || []).map(url => {
+        fileList.value = vals.map(url => {
           const name = getUrlName(url);
           return {
             [nameField.value]: name,
@@ -68530,12 +68532,8 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
             [urlField.value]: url
           };
         });
-        if (props.urlList && props.urlList.length) {
-          isModelUpdate = true;
-          updateModel();
-        }
       } else {
-        fileList.value = (props.modelValue || []).map(item => {
+        fileList.value = vals.map(item => {
           const url = item[urlField.value] || item.url;
           const name = item[nameField.value] || getUrlName(url);
           return Object.assign(item, {
@@ -68548,7 +68546,11 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
     };
     const updateModel = () => {
       const urlList = fileList.value.map(item => item[urlField.value]);
-      const value = props.simpleValue ? urlList : fileList.value;
+      const rest = props.simpleValue ? urlList : fileList.value;
+      let value = rest;
+      if (!props.multiple) {
+        value = rest[0] || null;
+      }
       // 自动更新校验状态
       if ($xeform && $xeformiteminfo) {
         $xeform.triggerItemEvent(new Event('change'), $xeformiteminfo.itemConfig.field, value);
@@ -68648,82 +68650,6 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
         });
       });
     };
-    const customRequest = action => {
-      if (isReadonly.value || isDisabled.value || loading.value) {
-        return;
-      }
-      if (props.limit && fileList.value.length >= props.limit) {
-        VXETable.modal.message({
-          status: 'error',
-          content: props.mediatype === 'image' ? `最多只允许选择 ${props.limit} 个图片！` : `最多只允许选择 ${props.limit} 个文件！`
-        });
-        return;
-      }
-      const file = action.file;
-      const fileSuffix = getSuffix(file.name);
-      if (props.mediatype === 'image') {
-        if (!imgTypes.value.includes(fileSuffix)) {
-          VXETable.modal.message({
-            status: 'error',
-            content: `只支持 ${imgTypes.value.join(', ')} 格式的图片，请重新选择！`
-          });
-          return;
-        }
-      } else {
-        if (fileTypes.value.length && !fileTypes.value.includes(fileSuffix)) {
-          VXETable.modal.message({
-            status: 'error',
-            content: `只支持 ${fileTypes.value.join(', ')} 格式的文件，请重新选择！`
-          });
-          return;
-        }
-      }
-      const uploadMethod = props.uploadFile ? props.uploadFile : config_0.upload ? config_0.upload.uploadFile : null;
-      if (uploadMethod) {
-        loading.value = true;
-        Promise.resolve(uploadMethod({
-          file,
-          params: props.params
-        })).then(res => {
-          const item = {
-            ...res,
-            [nameField.value]: res[nameField.value] || file.name,
-            [typeField.value]: res[typeField.value] || fileSuffix
-          };
-          isModelUpdate = true;
-          fileList.value.push(item);
-          updateModel();
-          emit('success', {
-            item,
-            file
-          });
-          loading.value = false;
-        }).catch(e => {
-          const item = {
-            [nameField.value]: file.name,
-            [typeField.value]: fileSuffix
-          };
-          emit('error', {
-            item,
-            file
-          });
-          loading.value = false;
-          console.error(e);
-        });
-      } else {
-        const item = {
-          [nameField.value]: file.name,
-          [typeField.value]: fileSuffix
-        };
-        isModelUpdate = true;
-        fileList.value.push(item);
-        updateModel();
-        emit('success', {
-          item
-        });
-        console.error('[MlUpload] 代码检查：未设置上传方法，请通过 MaliUI.config({ ... }) 全局设置 upload.uploadFile');
-      }
-    };
     const hidePreview = () => {
       previewVisible.value = false;
       previewItem.value = null;
@@ -68813,9 +68739,6 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
       }
       isModelUpdate = false;
     });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.urlList, () => {
-      loadList();
-    });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
       if (config_0.upload && !config_0.upload.fileProps) {
         console.warn('[MlUpload] 代码检查：全局参数 upload.fileProps 字段属性未配置');
@@ -68958,10 +68881,10 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
 }));
 ;// CONCATENATED MODULE: ./components/ml-upload/MlUpload.vue?vue&type=script&lang=ts&setup=true
  
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./components/ml-upload/MlUpload.vue?vue&type=style&index=0&id=54fcb21e&lang=scss
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./components/ml-upload/MlUpload.vue?vue&type=style&index=0&id=6997de74&lang=scss
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./components/ml-upload/MlUpload.vue?vue&type=style&index=0&id=54fcb21e&lang=scss
+;// CONCATENATED MODULE: ./components/ml-upload/MlUpload.vue?vue&type=style&index=0&id=6997de74&lang=scss
 
 ;// CONCATENATED MODULE: ./components/ml-upload/MlUpload.vue
 
@@ -71490,7 +71413,7 @@ function index_config(options) {
   return config_0;
 }
 const MaliUI = {
-  version: "1.0.3",
+  version: "1.0.5",
   modal: index_esm.modal,
   install: index_install,
   config: index_config,

package/lib/mali-ui-plus.umd.js

@@ -68399,11 +68399,7 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
   __name: 'MlUpload',
   props: {
     modelValue: {
-      type: Array,
-      default: () => []
-    },
-    urlList: {
-      type: Array,
+      type: [Array, String, Object],
       default: () => []
     },
     params: {
@@ -68531,8 +68527,14 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
       return fieldMaps.value.fileName || 'fileName';
     });
     const loadList = () => {
+      let vals = [];
+      if (xe_utils_default().isArray(props.modelValue)) {
+        vals = props.modelValue;
+      } else if (props.modelValue && xe_utils_default().isString(props.modelValue)) {
+        vals = [props.modelValue];
+      }
       if (props.simpleValue) {
-        fileList.value = (props.urlList && props.urlList.length ? props.urlList : props.modelValue || []).map(url => {
+        fileList.value = vals.map(url => {
           const name = getUrlName(url);
           return {
             [nameField.value]: name,
@@ -68540,12 +68542,8 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
             [urlField.value]: url
           };
         });
-        if (props.urlList && props.urlList.length) {
-          isModelUpdate = true;
-          updateModel();
-        }
       } else {
-        fileList.value = (props.modelValue || []).map(item => {
+        fileList.value = vals.map(item => {
           const url = item[urlField.value] || item.url;
           const name = item[nameField.value] || getUrlName(url);
           return Object.assign(item, {
@@ -68558,7 +68556,11 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
     };
     const updateModel = () => {
       const urlList = fileList.value.map(item => item[urlField.value]);
-      const value = props.simpleValue ? urlList : fileList.value;
+      const rest = props.simpleValue ? urlList : fileList.value;
+      let value = rest;
+      if (!props.multiple) {
+        value = rest[0] || null;
+      }
       // 自动更新校验状态
       if ($xeform && $xeformiteminfo) {
         $xeform.triggerItemEvent(new Event('change'), $xeformiteminfo.itemConfig.field, value);
@@ -68658,82 +68660,6 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
         });
       });
     };
-    const customRequest = action => {
-      if (isReadonly.value || isDisabled.value || loading.value) {
-        return;
-      }
-      if (props.limit && fileList.value.length >= props.limit) {
-        VXETable.modal.message({
-          status: 'error',
-          content: props.mediatype === 'image' ? `最多只允许选择 ${props.limit} 个图片！` : `最多只允许选择 ${props.limit} 个文件！`
-        });
-        return;
-      }
-      const file = action.file;
-      const fileSuffix = getSuffix(file.name);
-      if (props.mediatype === 'image') {
-        if (!imgTypes.value.includes(fileSuffix)) {
-          VXETable.modal.message({
-            status: 'error',
-            content: `只支持 ${imgTypes.value.join(', ')} 格式的图片，请重新选择！`
-          });
-          return;
-        }
-      } else {
-        if (fileTypes.value.length && !fileTypes.value.includes(fileSuffix)) {
-          VXETable.modal.message({
-            status: 'error',
-            content: `只支持 ${fileTypes.value.join(', ')} 格式的文件，请重新选择！`
-          });
-          return;
-        }
-      }
-      const uploadMethod = props.uploadFile ? props.uploadFile : config_0.upload ? config_0.upload.uploadFile : null;
-      if (uploadMethod) {
-        loading.value = true;
-        Promise.resolve(uploadMethod({
-          file,
-          params: props.params
-        })).then(res => {
-          const item = {
-            ...res,
-            [nameField.value]: res[nameField.value] || file.name,
-            [typeField.value]: res[typeField.value] || fileSuffix
-          };
-          isModelUpdate = true;
-          fileList.value.push(item);
-          updateModel();
-          emit('success', {
-            item,
-            file
-          });
-          loading.value = false;
-        }).catch(e => {
-          const item = {
-            [nameField.value]: file.name,
-            [typeField.value]: fileSuffix
-          };
-          emit('error', {
-            item,
-            file
-          });
-          loading.value = false;
-          console.error(e);
-        });
-      } else {
-        const item = {
-          [nameField.value]: file.name,
-          [typeField.value]: fileSuffix
-        };
-        isModelUpdate = true;
-        fileList.value.push(item);
-        updateModel();
-        emit('success', {
-          item
-        });
-        console.error('[MlUpload] 代码检查：未设置上传方法，请通过 MaliUI.config({ ... }) 全局设置 upload.uploadFile');
-      }
-    };
     const hidePreview = () => {
       previewVisible.value = false;
       previewItem.value = null;
@@ -68823,9 +68749,6 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
       }
       isModelUpdate = false;
     });
-    (0,external_commonjs_vue_commonjs2_vue_root_Vue_.watch)(() => props.urlList, () => {
-      loadList();
-    });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onMounted)(() => {
       if (config_0.upload && !config_0.upload.fileProps) {
         console.warn('[MlUpload] 代码检查：全局参数 upload.fileProps 字段属性未配置');
@@ -68968,10 +68891,10 @@ const MlUploadvue_type_script_lang_ts_setup_true_hoisted_21 = ["src"];
 }));
 ;// CONCATENATED MODULE: ./components/ml-upload/MlUpload.vue?vue&type=script&lang=ts&setup=true
  
-;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-67.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-67.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-67.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-67.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./components/ml-upload/MlUpload.vue?vue&type=style&index=0&id=54fcb21e&lang=scss
+;// CONCATENATED MODULE: ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-67.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-67.use[1]!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-67.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-67.use[3]!./node_modules/vue-loader/dist/index.js??ruleSet[0].use[0]!./components/ml-upload/MlUpload.vue?vue&type=style&index=0&id=6997de74&lang=scss
 // extracted by mini-css-extract-plugin
 
-;// CONCATENATED MODULE: ./components/ml-upload/MlUpload.vue?vue&type=style&index=0&id=54fcb21e&lang=scss
+;// CONCATENATED MODULE: ./components/ml-upload/MlUpload.vue?vue&type=style&index=0&id=6997de74&lang=scss
 
 ;// CONCATENATED MODULE: ./components/ml-upload/MlUpload.vue
 
@@ -71500,7 +71423,7 @@ function index_config(options) {
   return config_0;
 }
 const MaliUI = {
-  version: "1.0.3",
+  version: "1.0.5",
   modal: index_esm.modal,
   install: index_install,
   config: index_config,