mooho-base-admin-plus 2.4.28 → 2.4.29

package/history.md

@@ -60,3 +60,6 @@
 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 = {
@@ -23085,7 +23099,6 @@ var mixinPage = {
       return lodash$1.exports.get(model2, expression2);
     },
     setData(model2, expression2, value) {
-      console.log("setData", expression2, value);
       lodash$1.exports.set(model2, expression2, value);
     },
     parseDateTimeData(model2, expression2) {
@@ -25777,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");
@@ -25802,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> ')
           ]),
@@ -25816,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()" /> ')
   ]);
@@ -27117,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);
@@ -27148,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, [
@@ -27168,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, {
@@ -27180,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",
@@ -27200,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)
@@ -27210,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)
@@ -37625,7 +37711,6 @@ const _sfc_main$w = {
     },
     parseComboData(model2, column) {
       let value = this.parseData(model2, column.code);
-      console.log("parseComboData", column.code, value);
       this.loadComboDataLabel(model2, column, value);
       return value;
     },
@@ -37642,10 +37727,8 @@ const _sfc_main$w = {
       if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
         return;
       }
-      console.log("loadComboDataLabel", column.code, data2);
       if (this.$refs["control_" + column.code] && data2) {
         let values = this.$refs["control_" + column.code][0].$data.values;
-        console.log("values", values);
         let pendings = [];
         if (column.controlType == "MultiComboSelect") {
           data2.forEach((value) => {
@@ -37663,11 +37746,9 @@ const _sfc_main$w = {
           }
         }
         if (pendings.length > 0) {
-          console.log("pendings", pendings);
           let param = this.getParam(model2, column);
           param[column.sourceDataCode] = pendings.map((item) => item.value).join(",");
           let res2;
-          console.log("param", param);
           if (column.isSourceCustom) {
             res2 = await customModelApi.query(column.source, param);
           } else {
@@ -37676,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") {
-              console.log("label", label);
-            }
+            if (column.controlType == "ComboSelect")
+              ;
             let newValue = pendings.find((i3) => i3.value == v);
             if (newValue) {
               newValue.label = label;
@@ -43781,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);