mooho-base-admin-plus 2.2.8 → 2.2.10

package/history.md

@@ -10,3 +10,5 @@
 2.2.6 - 流程模板页面增加 create 权限的判断
 2.2.7 - 静态选项支持数字
 2.2.8 - 增加描述类型控件
+2.2.9 - 枚举类型加载时不再判断 source 字段
+2.2.10 - 图片上传控件可设置接受的文件格式

package/package/mooho-base-admin-plus.min.esm.js

@@ -36294,7 +36294,8 @@ function _sfc_render$A(_ctx, _cache, $props, $setup, $data, $options) {
       "on-preview": $options.onUploadPreview,
       "on-remove": $options.onUploadRemove,
       disabled: $props.readonly,
-      accept: $props.accept,
+      accept: !!($props.accept || "").trim() ? $props.accept.split(",").map((item) => "." + item.replaceAll(".", "")).join(",") : null,
+      format: !!($props.accept || "").trim() ? $props.accept.split(",").map((item) => item.replaceAll(".", "")) : null,
       multiple: true,
       type: $props.draggable ? "drag" : "select"
     }, {
@@ -36319,7 +36320,7 @@ function _sfc_render$A(_ctx, _cache, $props, $setup, $data, $options) {
         ])) : createCommentVNode("v-if", true)
       ]),
       _: 1
-    }, 8, ["action", "headers", "default-file-list", "before-upload", "on-success", "on-preview", "on-remove", "disabled", "accept", "type"]),
+    }, 8, ["action", "headers", "default-file-list", "before-upload", "on-success", "on-preview", "on-remove", "disabled", "accept", "format", "type"]),
     withDirectives(createVNode$1(_component_Input, {
       type: "text",
       "model-value": $props.modelValue,
@@ -36355,6 +36356,9 @@ const _sfc_main$z = {
     },
     height: {
       type: Number
+    },
+    accept: {
+      type: String
     }
   },
   computed: {
@@ -36489,7 +36493,8 @@ function _sfc_render$z(_ctx, _cache, $props, $setup, $data, $options) {
       }), 128)),
       !$props.readonly ? (openBlock(), createBlock(_component_Upload, {
         key: 0,
-        accept: "image/*",
+        accept: !!($props.accept || "").trim() ? $props.accept.split(",").map((item) => "." + item.replaceAll(".", "")).join(",") : "image/*",
+        format: !!($props.accept || "").trim() ? $props.accept.split(",").map((item) => item.replaceAll(".", "")) : null,
         action: _ctx.uploadURL,
         headers: _ctx.uploadHeaders,
         "show-upload-list": false,
@@ -36510,7 +36515,7 @@ function _sfc_render$z(_ctx, _cache, $props, $setup, $data, $options) {
           ], 4)) : createCommentVNode("v-if", true)
         ]),
         _: 1
-      }, 8, ["action", "headers", "before-upload", "on-success"])) : createCommentVNode("v-if", true),
+      }, 8, ["accept", "format", "action", "headers", "before-upload", "on-success"])) : createCommentVNode("v-if", true),
       withDirectives(createVNode$1(_component_Input, {
         type: "text",
         "model-value": $props.modelValue
@@ -37123,7 +37128,7 @@ const _sfc_main$w = {
         column.triggers = [];
       });
       this.columns.filter((column) => {
-        return !column.isStaticItem && !!(column.source || "").trim() && !!(column.param || "").trim();
+        return !column.isStaticItem && !!(column.source || "").trim() && !!(column.param || "").trim() && !column.dataType.startsWith("Enum:");
       }).forEach((column) => {
         let param = JSON.parse(column.param);
         for (let key in param) {
@@ -37328,7 +37333,7 @@ const _sfc_main$w = {
       }
       if (sender == null || sender.triggers && sender.triggers !== []) {
         this.columns.forEach(function(column) {
-          if (!column.isStaticItem && !!(column.source || "").trim() && (sender == null || sender.triggers.some((item) => {
+          if (!column.isStaticItem && !!(column.source || "").trim() && !column.dataType.startsWith("Enum:") && (sender == null || sender.triggers.some((item) => {
             return item.code == column.code;
           }))) {
             column.needRefresh = true;
@@ -37347,7 +37352,7 @@ const _sfc_main$w = {
           column.triggers.forEach((item) => {
             item.needClear = true;
           });
-        } else if (column.needRefresh && !!(column.source || "").trim()) {
+        } else if (column.needRefresh && !!(column.source || "").trim() && !column.dataType.startsWith("Enum:")) {
           let param = this.getParam(this.data, column);
           if (column.controlType === "Select" || column.controlType === "MultiSelect" || column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect" || column.controlType === "SelectWithOther" || column.controlType === "ComboSelect" || column.controlType === "Radio" || column.controlType === "CheckGroup") {
             if (param != null) {
@@ -38021,8 +38026,9 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                           readonly: $props.readonly || column.isReadonly,
                           maxCount: column.maxLength,
                           height: column.controlHeight,
-                          width: column.controlWidth
-                        }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "maxCount", "height", "width"])) : column.controlType === "Slider" ? (openBlock(), createElementBlock(Fragment, { key: 25 }, [
+                          width: column.controlWidth,
+                          accept: column.pattern
+                        }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "maxCount", "height", "width", "accept"])) : column.controlType === "Slider" ? (openBlock(), createElementBlock(Fragment, { key: 25 }, [
                           !$props.readonly && !column.isReadonly ? (openBlock(), createBlock(_component_Slider, {
                             key: 0,
                             "model-value": _ctx.parseData($data.data, column.code),
@@ -39524,7 +39530,7 @@ function _sfc_render$v(_ctx, _cache, $props, $setup, $data, $options) {
                     ]),
                     _: 1
                   }, 16)) : createCommentVNode("v-if", true),
-                  $data.data.controlType == "Attachment" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 32 }, _ctx.grid8)), {
+                  $data.data.controlType == "Attachment" || $data.data.controlType == "Image" ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 32 }, _ctx.grid8)), {
                     default: withCtx(() => [
                       createVNode$1(_component_FormItem, {
                         label: "\u63A5\u53D7\u7684\u6587\u4EF6\u7C7B\u578B",
@@ -41512,7 +41518,7 @@ const _sfc_main$r = {
         column.triggers = [];
       });
       this.columns.filter((column) => {
-        return !column.isStaticItem && !!(column.source || "").trim() && !!(column.param || "").trim();
+        return !column.isStaticItem && !!(column.source || "").trim() && !!(column.param || "").trim() && !column.dataType.startsWith("Enum:");
       }).forEach((column) => {
         let param = JSON.parse(column.param);
         for (let key in param) {
@@ -41629,7 +41635,7 @@ const _sfc_main$r = {
       });
       if (sender == null || sender.triggers !== []) {
         this.columns.forEach(function(column) {
-          if (!column.isStaticItem && !!(column.source || "").trim() && (sender == null || sender.triggers.some((item) => {
+          if (!column.isStaticItem && !!(column.source || "").trim() && !column.dataType.startsWith("Enum:") && (sender == null || sender.triggers.some((item) => {
             return item.id === column.id;
           }))) {
             column.needRefresh = true;
@@ -42837,7 +42843,7 @@ const _sfc_main$q = {
               }
             });
           } else {
-            if (!!(column.source || "").trim()) {
+            if (!!(column.source || "").trim() && !column.dataType.startsWith("Enum:")) {
               this.data.forEach((row) => {
                 if (row._dataSource && row._dataSource[column.code]) {
                   return;
@@ -42857,7 +42863,7 @@ const _sfc_main$q = {
         column.triggers = [];
       });
       this.columns.filter((column) => {
-        return !column.isStaticItem && !!(column.source || "").trim() && !!(column.param || "").trim();
+        return !column.isStaticItem && !!(column.source || "").trim() && !!(column.param || "").trim() && !column.dataType.startsWith("Enum:");
       }).forEach((column) => {
         let param = JSON.parse(column.param);
         for (let key in param) {
@@ -42991,7 +42997,7 @@ const _sfc_main$q = {
       this.$emit("on-change", data2, sender, selected);
       if (sender == null || sender.triggers !== []) {
         this.columns.forEach(function(column) {
-          if (!column.isStaticItem && !!(column.source || "").trim() && (sender == null || sender.triggers.some((item) => {
+          if (!column.isStaticItem && !!(column.source || "").trim() && !column.dataType.startsWith("Enum:") && (sender == null || sender.triggers.some((item) => {
             return item.code == column.code;
           }))) {
             if (data2._needRefresh) {
@@ -43012,7 +43018,7 @@ const _sfc_main$q = {
           column.triggers.forEach((item) => {
             data2._needClear[item.code] = true;
           });
-        } else if (data2._needRefresh[column.code] && !!(column.source || "").trim()) {
+        } else if (data2._needRefresh[column.code] && !!(column.source || "").trim() && !column.dataType.startsWith("Enum:")) {
           let param = this.getParam(data2, column, this.parentData);
           if (column.controlType === "Select" || column.controlType === "SelectWithOther" || column.controlType === "ComboSelect" || column.controlType === "MulitSelect" || column.controlType === "Radio" || column.controlType === "CheckGroup") {
             if (param != null) {
@@ -51117,7 +51123,7 @@ const _sfc_main$o = {
         column.triggers = [];
       });
       this.columns.filter((column) => {
-        return !!(column.source || "").trim() && !!(column.param || "").trim();
+        return !!(column.source || "").trim() && !!(column.param || "").trim() && !column.dataType.startsWith("Enum:");
       }).forEach((column) => {
         let param = JSON.parse(column.param);
         for (let key in param) {
@@ -51206,7 +51212,7 @@ const _sfc_main$o = {
     async onDataChange(sender) {
       if (sender == null || sender.triggers !== []) {
         this.columns.forEach(function(column) {
-          if (!!(column.source || "").trim() && (sender == null || sender.triggers.some((item) => {
+          if (!!(column.source || "").trim() && !column.dataType.startsWith("Enum:") && (sender == null || sender.triggers.some((item) => {
             return item.id === column.id;
           }))) {
             column.needRefresh = true;
@@ -51225,7 +51231,7 @@ const _sfc_main$o = {
           column.triggers.forEach((item) => {
             item.needClear = true;
           });
-        } else if (column.needRefresh && !!(column.source || "").trim()) {
+        } else if (column.needRefresh && !!(column.source || "").trim() && !column.dataType.startsWith("Enum:")) {
           let param = this.getParam(this.data, column);
           if (column.controlType === "Select" || column.controlType === "MultiSelect" || column.controlType === "TreeSelect" || column.controlType === "MultiTreeSelect" || column.controlType === "SelectWithOther" || column.controlType === "ComboSelect" || column.controlType === "Radio" || column.controlType === "CheckGroup") {
             if (param != null) {