mooho-base-admin-plus 2.4.27 → 2.4.29

package/history.md

@@ -59,3 +59,7 @@
 2.4.25 - 增加上传文件大小限制
 2.4.26 - 优化计算列，避免转换对象
 2.4.27 - 优化标题默认样式
+2.4.28 - 修复可筛选下拉框选中内容会跳回原值的bug
+2.4.29 - 修复新增、修改开放接口用户密码未加密的bug
+2.4.30 - 批量选择支持默认值
+2.4.31 - 增加自定义功能导入导出

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

@@ -22597,6 +22597,20 @@ var customPageApi = {
         id
       }
     });
+  },
+  async exportFile(ids) {
+    const result2 = await service({
+      url: `api/${res$j}/exportFile`,
+      method: "post",
+      responseType: "blob",
+      data: {
+        ids
+      }
+    });
+    const blob = new Blob([result2], {
+      type: "application/octet-stream"
+    });
+    saveAs(blob, "CustomPage-" + format$3(new Date(), "yyyyMMddHHmmss") + ".cp");
   }
 };
 var viewPage$1 = {
@@ -25776,11 +25790,33 @@ const _sfc_main$1i = {
   computed: {},
   created() {
   },
-  methods: {}
+  methods: {
+    exportFile() {
+      let ids = this.$refs.table.getSelected().map((x2) => {
+        return x2.id;
+      });
+      if (ids.length > 0) {
+        customPageApi.exportFile(ids);
+      } else {
+        this.error("Front_Msg_Please_Select_Export_Item");
+      }
+    },
+    importFileSuccess(res2) {
+      if (res2.code == 0) {
+        this.success("Front_Msg_Success", () => {
+          this.$refs.table.loadData();
+        });
+      } else {
+        this.error(res2.message);
+      }
+    }
+  }
 };
 const _hoisted_1$12 = { class: "i-layout-page-header" };
 function _sfc_render$1i(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_PageHeader = resolveComponent("PageHeader");
+  const _component_Button = resolveComponent("Button");
+  const _component_file_upload = resolveComponent("file-upload");
   const _component_view_table = resolveComponent("view-table");
   const _component_Card = resolveComponent("Card");
   const _component_modal_form = resolveComponent("modal-form");
@@ -25801,9 +25837,42 @@ function _sfc_render$1i(_ctx, _cache, $props, $setup, $data, $options) {
         createVNode$1(_component_view_table, {
           ref: "table",
           "view-code": "CustomPage",
-          onCreate: _cache[0] || (_cache[0] = ($event) => _ctx.$refs.form.open()),
-          onEdit: _cache[1] || (_cache[1] = ({ row, index: index2 }) => _ctx.$refs.form.open(row))
+          selectEnable: true,
+          onCreate: _cache[1] || (_cache[1] = ($event) => _ctx.$refs.form.open()),
+          onEdit: _cache[2] || (_cache[2] = ({ row, index: index2 }) => _ctx.$refs.form.open(row))
         }, {
+          filterCommand: withCtx(() => [
+            createVNode$1(_component_Button, {
+              size: "small",
+              type: "info",
+              "custom-icon": "fa fa-cloud-download-alt",
+              onClick: _cache[0] || (_cache[0] = ($event) => $options.exportFile())
+            }, {
+              default: withCtx(() => [
+                createTextVNode(toDisplayString$1(_ctx.$t("Front_Btn_Export")), 1)
+              ]),
+              _: 1
+            }),
+            createVNode$1(_component_file_upload, {
+              url: "api/CustomPage/importFile",
+              accept: ".cp",
+              onOnSuccess: $options.importFileSuccess
+            }, {
+              default: withCtx(() => [
+                createVNode$1(_component_Button, {
+                  type: "primary",
+                  "custom-icon": "fa fa-cloud-upload-alt",
+                  size: "small"
+                }, {
+                  default: withCtx(() => [
+                    createTextVNode(toDisplayString$1(_ctx.$t("Front_Btn_Import")), 1)
+                  ]),
+                  _: 1
+                })
+              ]),
+              _: 1
+            }, 8, ["onOnSuccess"])
+          ]),
           command: withCtx(({}) => [
             createCommentVNode(' <Button size="small"\r\n                  title="\u9875\u9762\u7EC4\u4EF6"\r\n                  type="info"\r\n                  custom-icon="fa fa-window-maximize"\r\n                  @click="$refs.componentTable.open({customPageID: row.id})"></Button>\r\n              <Button size="small"\r\n                  title="\u9875\u9762\u63A7\u4EF6"\r\n                  type="info"\r\n                  custom-icon="fa fa-clone"\r\n                  @click="$refs.controlTable.open({customPageID: row.id})"></Button> ')
           ]),
@@ -25815,7 +25884,7 @@ function _sfc_render$1i(_ctx, _cache, $props, $setup, $data, $options) {
     createVNode$1(_component_modal_form, {
       ref: "form",
       "view-code": "CustomPageEdit",
-      onOnAfterSave: _cache[2] || (_cache[2] = ($event) => _ctx.$refs.table.loadData())
+      onOnAfterSave: _cache[3] || (_cache[3] = ($event) => _ctx.$refs.table.loadData())
     }, null, 512),
     createCommentVNode(' <modal-table ref="componentTable"\r\n            view-code="CustomPageComponent"\r\n            @create="(param)=>$refs.componentForm.openDefault(param)"\r\n            @edit="({row, index})=>$refs.componentForm.open(row)">\r\n            <template slot-scope="{ row }"\r\n                slot="command">\r\n                <Button size="small"\r\n                    title="\u9875\u9762\u63A7\u4EF6"\r\n                    type="info"\r\n                    custom-icon="fa fa-clone"\r\n                    @click="$refs.controlTable.open({customPageID: row.customPageID, customPageComponentID: row.id})"></Button>\r\n            </template>\r\n        </modal-table>\r\n        <modal-form ref="componentForm"\r\n            view-code="CustomPageComponentEdit"\r\n            @on-after-save="$refs.componentTable.loadData()" />\r\n        <modal-table ref="controlTable"\r\n            view-code="CustomPageControl"\r\n            @create="(param)=>$refs.controlForm.openDefault(param)"\r\n            @edit="({row, index})=>$refs.controlForm.open(row)" />\r\n        <modal-form ref="controlForm"\r\n            view-code="CustomPageControlEdit"\r\n            @on-after-save="$refs.controlTable.loadData()" /> ')
   ]);
@@ -27116,6 +27185,10 @@ const _sfc_main$16 = {
   created() {
   },
   methods: {
+    edit({ row, index: index2 }) {
+      row.password = "$$$$$$$$";
+      this.$refs.form.open(row);
+    },
     async openApiTableOpen(row) {
       this.openUserID = row.id;
       let openApis = await openApiPermissionApi.queryForCheck(row.id);
@@ -27147,6 +27220,7 @@ function _sfc_render$16(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Button = resolveComponent("Button");
   const _component_view_table = resolveComponent("view-table");
   const _component_Card = resolveComponent("Card");
+  const _component_Input = resolveComponent("Input");
   const _component_modal_form = resolveComponent("modal-form");
   const _component_modal_table = resolveComponent("modal-table");
   return openBlock(), createElementBlock("div", null, [
@@ -27167,7 +27241,7 @@ function _sfc_render$16(_ctx, _cache, $props, $setup, $data, $options) {
           ref: "table",
           "view-code": "OpenUser",
           onCreate: _cache[0] || (_cache[0] = ($event) => _ctx.$refs.form.open()),
-          onEdit: _cache[1] || (_cache[1] = ({ row, index: index2 }) => _ctx.$refs.form.open(row))
+          onEdit: $options.edit
         }, {
           command: withCtx(({ row }) => [
             createVNode$1(_component_Button, {
@@ -27179,15 +27253,28 @@ function _sfc_render$16(_ctx, _cache, $props, $setup, $data, $options) {
             }, null, 8, ["title", "onClick"])
           ]),
           _: 1
-        }, 512)
+        }, 8, ["onEdit"])
       ]),
       _: 1
     }),
     createVNode$1(_component_modal_form, {
       ref: "form",
       "view-code": "OpenUserEdit",
-      onOnAfterSave: _cache[2] || (_cache[2] = ($event) => _ctx.$refs.table.loadData())
-    }, null, 512),
+      onOnAfterSave: _cache[1] || (_cache[1] = ($event) => _ctx.$refs.table.loadData())
+    }, {
+      column: withCtx(({ data: data2, column, code: code2 }) => [
+        code2 == "password" ? (openBlock(), createBlock(_component_Input, {
+          key: 0,
+          type: "password",
+          "model-value": _ctx.parseData(data2, column.code),
+          "onUpdate:modelValue": ($event) => _ctx.setData(data2, column.code, $event),
+          readonly: _ctx.readonly || column.isReadonly,
+          style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
+          maxlength: column.maxLength
+        }, null, 8, ["model-value", "onUpdate:modelValue", "readonly", "style", "maxlength"])) : createCommentVNode("v-if", true)
+      ]),
+      _: 1
+    }, 512),
     createVNode$1(_component_modal_table, {
       ref: "openApiTable",
       "view-code": "OpenApiCheck",
@@ -27199,7 +27286,7 @@ function _sfc_render$16(_ctx, _cache, $props, $setup, $data, $options) {
         createVNode$1(_component_Button, {
           type: "primary",
           "custom-icon": "fa fa-save",
-          onClick: _cache[3] || (_cache[3] = ($event) => $options.saveOpenApiPermission())
+          onClick: _cache[2] || (_cache[2] = ($event) => $options.saveOpenApiPermission())
         }, {
           default: withCtx(() => [
             createTextVNode(toDisplayString$1(_ctx.$t("Front_Btn_Save")), 1)
@@ -27209,7 +27296,7 @@ function _sfc_render$16(_ctx, _cache, $props, $setup, $data, $options) {
         createVNode$1(_component_Button, {
           type: "default",
           "custom-icon": "fa fa-times",
-          onClick: _cache[4] || (_cache[4] = ($event) => _ctx.$refs.openApiTable.close())
+          onClick: _cache[3] || (_cache[3] = ($event) => _ctx.$refs.openApiTable.close())
         }, {
           default: withCtx(() => [
             createTextVNode(toDisplayString$1(_ctx.$t("Front_Btn_Close")), 1)
@@ -37670,9 +37757,8 @@ const _sfc_main$w = {
           res2.data.forEach((item) => {
             let v = this.parseData(item, column.sourceDataCode);
             let label = this.parseData(item, column.sourceDisplayCode);
-            if (column.controlType == "ComboSelect") {
-              this.$refs["control_" + column.code][0].$data.query = label;
-            }
+            if (column.controlType == "ComboSelect")
+              ;
             let newValue = pendings.find((i3) => i3.value == v);
             if (newValue) {
               newValue.label = label;
@@ -42167,9 +42253,8 @@ const _sfc_main$r = {
           res2.data.forEach((item) => {
             let v = this.parseData(item, column.sourceDataCode);
             let label = this.parseData(item, column.sourceDisplayCode);
-            if (column.controlType == "ComboSelect") {
-              this.$refs["control_" + column.code][0].$data.query = label;
-            }
+            if (column.controlType == "ComboSelect")
+              ;
             let newValue = pendings.find((i3) => i3.value == v);
             if (newValue) {
               newValue.label = label;
@@ -42187,7 +42272,7 @@ const _hoisted_2$f = {
   class: "label"
 };
 const _hoisted_3$d = {
-  key: 15,
+  key: 16,
   style: { "line-height": "24px" }
 };
 function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
@@ -42397,10 +42482,40 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                     }), 128))
                   ]),
                   _: 2
-                }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange"])) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
+                }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange"])) : column.controlType === "ComboSelect" ? (openBlock(), createBlock(_component_Select, {
                   key: 10,
                   ref_for: true,
                   ref: "control_" + column.code,
+                  "model-value": $options.parseComboData($data.data, column),
+                  "onUpdate:modelValue": ($event) => _ctx.setData($data.data, column.code, $event),
+                  disabled: _ctx.readonly || column.isReadonly,
+                  clearable: true,
+                  filterable: "",
+                  remote: "",
+                  "remote-method": (search) => $options.loadOption($data.data, column, search),
+                  style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
+                  placeholder: column.description,
+                  transfer: true,
+                  onOnChange: (selected) => $options.onSelectDataChange(column, selected)
+                }, {
+                  default: withCtx(() => [
+                    (openBlock(true), createElementBlock(Fragment, null, renderList($options.getDataSource($data.data, column), (item) => {
+                      return openBlock(), createBlock(_component_Option, {
+                        key: item.id,
+                        value: item.id
+                      }, {
+                        default: withCtx(() => [
+                          createTextVNode(toDisplayString$1(item.name), 1)
+                        ]),
+                        _: 2
+                      }, 1032, ["value"]);
+                    }), 128))
+                  ]),
+                  _: 2
+                }, 1032, ["model-value", "onUpdate:modelValue", "disabled", "remote-method", "style", "placeholder", "onOnChange"])) : column.controlType === "MultiComboSelect" ? (openBlock(), createBlock(_component_Select, {
+                  key: 11,
+                  ref_for: true,
+                  ref: "control_" + column.code,
                   size: "small",
                   "model-value": $options.parseMultiComboData($data.data, column),
                   "onUpdate:modelValue": ($event) => $options.setArrayFilterData($data.data, column, $event),
@@ -42429,7 +42544,7 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                   ]),
                   _: 2
                 }, 1032, ["model-value", "onUpdate:modelValue", "remote-method", "style", "placeholder", "onOnChange"])) : column.controlType === "DialogSelect" ? (openBlock(), createBlock(_component_dialog_select, {
-                  key: 11,
+                  key: 12,
                   size: "small",
                   "model-value": $options.parseFilterData($data.data, column),
                   "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column, $event),
@@ -42440,7 +42555,7 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                   controlWidth: column.controlWidth,
                   onOnChange: (selected) => $options.onSelectDataChange(column, selected)
                 }, null, 8, ["model-value", "onUpdate:modelValue", "source", "source-data-code", "source-display-code", "param", "controlWidth", "onOnChange"])) : column.controlType === "Date" || column.controlType === "DateTime" || column.controlType === "Year" || column.controlType === "Month" || column.controlType === "DateRange" ? (openBlock(), createBlock(_component_DatePicker, {
-                  key: 12,
+                  key: 13,
                   size: "small",
                   type: column.controlType.toLowerCase(),
                   "model-value": $options.parseFilterData($data.data, column),
@@ -42452,7 +42567,7 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                     $options.onDataChange(column);
                   }
                 }, null, 8, ["type", "model-value", "placeholder", "style", "onOnChange"])) : column.controlType === "Time" ? (openBlock(), createBlock(_component_TimePicker, {
-                  key: 13,
+                  key: 14,
                   size: "small",
                   type: "time",
                   "model-value": $options.parseFilterData($data.data, column),
@@ -42462,7 +42577,7 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                   style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
                   onOnChange: ($event) => $options.onDataChange(column)
                 }, null, 8, ["model-value", "onUpdate:modelValue", "placeholder", "style", "onOnChange"])) : column.controlType === "Check" ? (openBlock(), createBlock(_component_Checkbox, {
-                  key: 14,
+                  key: 15,
                   size: "small",
                   style: { "line-height": "26px" },
                   "model-value": !!$options.parseFilterData($data.data, column),
@@ -42476,7 +42591,7 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                     onOnChange: ($event) => $options.onDataChange(column)
                   }, null, 8, ["model-value", "onUpdate:modelValue", "onOnChange"])
                 ])) : column.controlType === "Radio" ? (openBlock(), createBlock(_component_RadioGroup, {
-                  key: 16,
+                  key: 17,
                   size: "small",
                   style: { "line-height": "22px" },
                   "model-value": $options.parseFilterData($data.data, column),
@@ -42498,14 +42613,14 @@ function _sfc_render$r(_ctx, _cache, $props, $setup, $data, $options) {
                   ]),
                   _: 2
                 }, 1032, ["model-value", "onUpdate:modelValue", "onOnChange"])) : column.controlType === "TextArea" ? (openBlock(), createBlock(_component_Input, {
-                  key: 17,
+                  key: 18,
                   type: "textarea",
                   "model-value": $options.parseFilterData($data.data, column.code),
                   "onUpdate:modelValue": ($event) => $options.setFilterData($data.data, column.code, $event),
                   style: normalizeStyle$1({ width: column.controlWidth == null ? null : column.controlWidth + "px" }),
                   rows: column.controlHeight / 20,
                   placeholder: column.description
-                }, null, 8, ["model-value", "onUpdate:modelValue", "style", "rows", "placeholder"])) : (openBlock(), createElementBlock(Fragment, { key: 18 }, [
+                }, null, 8, ["model-value", "onUpdate:modelValue", "style", "rows", "placeholder"])) : (openBlock(), createElementBlock(Fragment, { key: 19 }, [
                   createTextVNode(toDisplayString$1(_ctx.$t("Front_Label_Control_Type_Not_Supported")) + " " + toDisplayString$1(column.controlType), 1)
                 ], 64))
               ]),
@@ -43746,7 +43861,7 @@ const _sfc_main$q = {
         if (!this.staticData.some((item) => {
           return item[batchSelectDataCode] == selected[i3].id;
         })) {
-          let item = {};
+          let item = this.getDefaultData();
           item[batchSelectDataCode] = selected[i3].id;
           item[key] = selected[i3];
           this.staticData.push(item);
@@ -44025,9 +44140,8 @@ const _sfc_main$q = {
           res2.data.forEach((item) => {
             let v = this.parseData(item, column.sourceDataCode);
             let label = this.parseData(item, column.sourceDisplayCode);
-            if (column.controlType == "ComboSelect") {
-              this.$refs["control_" + column.code + "_" + index2].$data.query = label;
-            }
+            if (column.controlType == "ComboSelect")
+              ;
             let newValue = pendings.find((i3) => i3.value == v);
             if (newValue) {
               newValue.label = label;
@@ -52070,9 +52184,8 @@ const _sfc_main$o = {
           res2.data.forEach((item) => {
             let v = this.parseData(item, column.sourceDataCode);
             let label = this.parseData(item, column.sourceDisplayCode);
-            if (column.controlType == "ComboSelect") {
-              this.$refs["control_" + column.code][0].$data.query = label;
-            }
+            if (column.controlType == "ComboSelect")
+              ;
             let newValue = pendings.find((i3) => i3.value == v);
             if (newValue) {
               newValue.label = label;