mooho-base-admin-plus 2.3.12 → 2.4.0

package/history.md

@@ -29,3 +29,6 @@
 2.3.9 - 优化默认筛选参数:filter 的处理方式
 2.3.10 - 可筛选选择框 bug 修复
 2.3.11 - 弹出框增加全屏按钮
+2.3.12 - 解决弹出框全屏按钮有时会关闭窗口的 bug
+2.3.13 - 解决表格弹出框无法关闭的 bug
+2.4.0 - 增加表格弹出显示表单

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

@@ -23899,7 +23899,7 @@ const _hoisted_7$b = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createEl
 ], -1));
 const _hoisted_8$a = { class: "stat" };
 const _hoisted_9$8 = { class: "icon" };
-const _hoisted_10$5 = { class: "content" };
+const _hoisted_10$7 = { class: "content" };
 const _hoisted_11$3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "value1" }, "\u5F85\u5206\u6D3E", -1));
 const _hoisted_12$3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { class: "value2" }, "\u5DF2\u5206\u6D3E", -1));
 const _hoisted_13$3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("p", null, [
@@ -24007,7 +24007,7 @@ function _sfc_render$1p(_ctx, _cache, $props, $setup, $data, $options) {
                                 color: "rgb(250, 173, 20)"
                               })
                             ]),
-                            createElementVNode("div", _hoisted_10$5, [
+                            createElementVNode("div", _hoisted_10$7, [
                               createElementVNode("div", null, [
                                 withDirectives(createVNode$1(_component_Numeral, {
                                   value: "85",
@@ -28200,7 +28200,7 @@ const _hoisted_7$a = /* @__PURE__ */ createElementVNode("marker", {
 ], -1);
 const _hoisted_8$9 = ["id", "d"];
 const _hoisted_9$7 = ["width"];
-const _hoisted_10$4 = ["x", "y", "width", "height"];
+const _hoisted_10$6 = ["x", "y", "width", "height"];
 const _hoisted_11$2 = ["x", "y", "font-size"];
 const _hoisted_12$2 = ["x", "y", "width", "height", "onMousedown", "onMouseup", "onDblclick"];
 const _hoisted_13$2 = ["x", "y", "width", "height"];
@@ -28340,7 +28340,7 @@ function _sfc_render$10(_ctx, _cache, $props, $setup, $data, $options) {
                     y: item.y - $data.setting.rectHeight / 2,
                     width: $data.setting.rectWidth,
                     height: $data.setting.rectHeight
-                  }, null, 8, _hoisted_10$4),
+                  }, null, 8, _hoisted_10$6),
                   createElementVNode("text", {
                     fill: "#000",
                     x: item.x,
@@ -33084,6 +33084,7 @@ const _hoisted_6$8 = { key: 4 };
 const _hoisted_7$7 = { key: 5 };
 const _hoisted_8$7 = { key: 6 };
 const _hoisted_9$5 = { key: 7 };
+const _hoisted_10$5 = { key: 8 };
 function _sfc_render$O(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_PageHeader = resolveComponent("PageHeader");
   const _component_Button = resolveComponent("Button");
@@ -33181,7 +33182,7 @@ function _sfc_render$O(_ctx, _cache, $props, $setup, $data, $options) {
       ref: "form",
       "view-code": "TableViewEdit",
       onOnChange: $options.formChange,
-      onOnAfterSave: _cache[5] || (_cache[5] = ($event) => _ctx.$refs.table.loadData())
+      onOnAfterSave: _cache[6] || (_cache[6] = ($event) => _ctx.$refs.table.loadData())
     }, {
       column: withCtx(({ data: data2, code: code2 }) => [
         code2 == "keywordColumn" ? (openBlock(), createElementBlock("div", _hoisted_2$r, [
@@ -33316,14 +33317,36 @@ function _sfc_render$O(_ctx, _cache, $props, $setup, $data, $options) {
             _: 2
           }, 1032, ["onClick"])
         ])) : createCommentVNode("v-if", true),
-        code2 == "removeEnable" ? (openBlock(), createElementBlock("div", _hoisted_9$5, [
+        code2 == "showEnable" ? (openBlock(), createElementBlock("div", _hoisted_9$5, [
+          $options.showCheck(data2.showEnableJson) ? (openBlock(), createBlock(_component_Switch, {
+            key: 0,
+            "model-value": !!data2.showEnable,
+            "onUpdate:modelValue": ($event) => {
+              data2.showEnable = $event;
+            },
+            onOnChange: _cache[3] || (_cache[3] = ($event) => $options.checkChange("showEnableJson", "showEnable"))
+          }, null, 8, ["model-value", "onUpdate:modelValue"])) : createCommentVNode("v-if", true),
+          createVNode$1(_component_Button, {
+            style: { "margin-left": "8px" },
+            onClick: ($event) => _ctx.$refs.conditionEdit.open(data2, "showEnableJson", "showEnable", _ctx.$refs.form.data.model),
+            type: "primary",
+            size: "small",
+            icon: "ios-settings"
+          }, {
+            default: withCtx(() => [
+              createTextVNode(toDisplayString$1(_ctx.$t("Front_Btn_Condition")), 1)
+            ]),
+            _: 2
+          }, 1032, ["onClick"])
+        ])) : createCommentVNode("v-if", true),
+        code2 == "removeEnable" ? (openBlock(), createElementBlock("div", _hoisted_10$5, [
           $options.showCheck(data2.removeEnableJson) ? (openBlock(), createBlock(_component_Switch, {
             key: 0,
             "model-value": !!data2.removeEnable,
             "onUpdate:modelValue": ($event) => {
               data2.removeEnable = $event;
             },
-            onOnChange: _cache[3] || (_cache[3] = ($event) => $options.checkChange("removeEnableJson", "removeEnable"))
+            onOnChange: _cache[4] || (_cache[4] = ($event) => $options.checkChange("removeEnableJson", "removeEnable"))
           }, null, 8, ["model-value", "onUpdate:modelValue"])) : createCommentVNode("v-if", true),
           createVNode$1(_component_Button, {
             style: { "margin-left": "8px" },
@@ -33343,7 +33366,7 @@ function _sfc_render$O(_ctx, _cache, $props, $setup, $data, $options) {
         createVNode$1(_component_Button, {
           type: "primary",
           "custom-icon": "fa fa-save",
-          onClick: _cache[4] || (_cache[4] = () => _ctx.$refs.form.onSave())
+          onClick: _cache[5] || (_cache[5] = () => _ctx.$refs.form.onSave())
         }, {
           default: withCtx(() => [
             createTextVNode(toDisplayString$1(_ctx.$t("Front_Btn_Save")), 1)
@@ -34997,6 +35020,11 @@ const _sfc_main$I = {
         if (!!(this.page.formViewCode || "").trim()) {
           this.$refs.form.init(this.page.formViewCode);
         }
+        if (!!(this.page.showViewCode || "").trim()) {
+          this.$refs.showForm.init(this.page.showViewCode);
+        } else if (!!(this.page.formViewCode || "").trim()) {
+          this.$refs.showForm.init(this.page.formViewCode);
+        }
         this.page.controls = res2.customPageControls.filter((item) => {
           return item.customPageComponentID == null;
         });
@@ -35063,7 +35091,8 @@ function _sfc_render$I(_ctx, _cache, $props, $setup, $data, $options) {
           createEnable: _ctx.allow("create"),
           removeEnable: _ctx.allow("remove"),
           onCreate: _cache[0] || (_cache[0] = ($event) => _ctx.$refs.form.open()),
-          onEdit: _cache[1] || (_cache[1] = ({ row, index: index2 }) => _ctx.$refs.form.open(row))
+          onEdit: _cache[1] || (_cache[1] = ({ row, index: index2 }) => _ctx.$refs.form.open(row)),
+          onShow: _cache[2] || (_cache[2] = ({ row, index: index2 }) => _ctx.$refs.showForm.open(row))
         }, {
           command: withCtx(({ row }) => [
             (openBlock(true), createElementBlock(Fragment, null, renderList($data.page.controls, (item) => {
@@ -35087,9 +35116,15 @@ function _sfc_render$I(_ctx, _cache, $props, $setup, $data, $options) {
       ref: "form",
       createEnable: _ctx.allow("create"),
       editEnable: _ctx.allow("edit"),
-      onOnAfterSave: _cache[2] || (_cache[2] = ($event) => _ctx.$refs.table.loadData())
+      onOnAfterSave: _cache[3] || (_cache[3] = ($event) => _ctx.$refs.table.loadData())
     }, null, 8, ["createEnable", "editEnable"])) : createCommentVNode("v-if", true),
-    $data.inited ? (openBlock(true), createElementBlock(Fragment, { key: 1 }, renderList($data.tables, (table) => {
+    $data.page ? (openBlock(), createBlock(_component_modal_form, {
+      key: 1,
+      ref: "showForm",
+      readonly: $data.page.showViewCode == null,
+      "save-enable": false
+    }, null, 8, ["readonly"])) : createCommentVNode("v-if", true),
+    $data.inited ? (openBlock(true), createElementBlock(Fragment, { key: 2 }, renderList($data.tables, (table) => {
       return openBlock(), createBlock(_component_modal_table, {
         key: table.id,
         ref_for: true,
@@ -35115,7 +35150,7 @@ function _sfc_render$I(_ctx, _cache, $props, $setup, $data, $options) {
         _: 2
       }, 1032, ["view-code", "onCreate", "onEdit"]);
     }), 128)) : createCommentVNode("v-if", true),
-    $data.inited ? (openBlock(true), createElementBlock(Fragment, { key: 2 }, renderList($data.forms, (form) => {
+    $data.inited ? (openBlock(true), createElementBlock(Fragment, { key: 3 }, renderList($data.forms, (form) => {
       return openBlock(), createBlock(_component_modal_form, {
         key: form.id,
         ref_for: true,
@@ -37606,7 +37641,7 @@ const _hoisted_6$6 = ["innerHTML"];
 const _hoisted_7$6 = ["innerHTML"];
 const _hoisted_8$6 = ["href", "target"];
 const _hoisted_9$4 = ["innerHTML"];
-const _hoisted_10$3 = ["href"];
+const _hoisted_10$4 = ["href"];
 function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Divider = resolveComponent("Divider");
   const _component_view_table = resolveComponent("view-table");
@@ -38143,7 +38178,7 @@ function _sfc_render$w(_ctx, _cache, $props, $setup, $data, $options) {
                                 createVNode$1(_component_Icon, { type: "ios-document" }),
                                 createTextVNode(" " + toDisplayString$1(attachment.name), 1)
                               ])
-                            ], 8, _hoisted_10$3);
+                            ], 8, _hoisted_10$4);
                           }), 128)) : createCommentVNode("v-if", true)
                         ], 64)) : column.controlType === "Image" ? (openBlock(), createBlock(_component_upload_image, {
                           key: 25,
@@ -41154,7 +41189,8 @@ const _hoisted_5$5 = { key: 4 };
 const _hoisted_6$4 = { key: 5 };
 const _hoisted_7$4 = { key: 6 };
 const _hoisted_8$4 = { key: 7 };
-const _hoisted_9$3 = { class: "title" };
+const _hoisted_9$3 = { key: 8 };
+const _hoisted_10$3 = { class: "title" };
 function _sfc_render$s(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Button = resolveComponent("Button");
   const _component_modal_table = resolveComponent("modal-table");
@@ -41418,14 +41454,36 @@ function _sfc_render$s(_ctx, _cache, $props, $setup, $data, $options) {
             _: 2
           }, 1032, ["onClick"])
         ])) : createCommentVNode("v-if", true),
-        code2 == "removeEnable" ? (openBlock(), createElementBlock("div", _hoisted_8$4, [
+        code2 == "showEnable" ? (openBlock(), createElementBlock("div", _hoisted_8$4, [
+          $options.showCheck(data2.showEnableJson) ? (openBlock(), createBlock(_component_Switch, {
+            key: 0,
+            "model-value": !!data2.showEnable,
+            "onUpdate:modelValue": ($event) => {
+              data2.showEnable = $event;
+            },
+            onOnChange: _cache[8] || (_cache[8] = ($event) => $options.checkChange("showEnableJson", "showEnable"))
+          }, null, 8, ["model-value", "onUpdate:modelValue"])) : createCommentVNode("v-if", true),
+          createVNode$1(_component_Button, {
+            style: { "margin-left": "8px" },
+            onClick: ($event) => _ctx.$refs.conditionEdit.open(data2, "showEnableJson", "showEnable", $data.dataView.model),
+            type: "primary",
+            size: "small",
+            icon: "ios-settings"
+          }, {
+            default: withCtx(() => [
+              createTextVNode(toDisplayString$1(_ctx.$t("Front_Btn_Condition")), 1)
+            ]),
+            _: 2
+          }, 1032, ["onClick"])
+        ])) : createCommentVNode("v-if", true),
+        code2 == "removeEnable" ? (openBlock(), createElementBlock("div", _hoisted_9$3, [
           $options.showCheck(data2.removeEnableJson) ? (openBlock(), createBlock(_component_Switch, {
             key: 0,
             "model-value": !!data2.removeEnable,
             "onUpdate:modelValue": ($event) => {
               data2.removeEnable = $event;
             },
-            onOnChange: _cache[8] || (_cache[8] = ($event) => $options.checkChange("removeEnableJson", "removeEnable"))
+            onOnChange: _cache[9] || (_cache[9] = ($event) => $options.checkChange("removeEnableJson", "removeEnable"))
           }, null, 8, ["model-value", "onUpdate:modelValue"])) : createCommentVNode("v-if", true),
           createVNode$1(_component_Button, {
             style: { "margin-left": "8px" },
@@ -41449,7 +41507,7 @@ function _sfc_render$s(_ctx, _cache, $props, $setup, $data, $options) {
           size: "small"
         }, {
           default: withCtx(() => [
-            createElementVNode("span", _hoisted_9$3, toDisplayString$1(_ctx.$t("Front_Label_Command_Button")), 1)
+            createElementVNode("span", _hoisted_10$3, toDisplayString$1(_ctx.$t("Front_Label_Command_Button")), 1)
           ]),
           _: 1
         }),
@@ -42561,6 +42619,10 @@ const _sfc_main$q = {
       type: Boolean,
       default: true
     },
+    showEnable: {
+      type: Boolean,
+      default: true
+    },
     removeEnable: {
       type: Boolean,
       default: true
@@ -42888,6 +42950,9 @@ const _sfc_main$q = {
     edit(row, index2) {
       this.$emit("edit", { row, index: index2 });
     },
+    show(row, index2) {
+      this.$emit("show", { row, index: index2 });
+    },
     remove(row, index2) {
       this.confirm("Front_Msg_Sure_To_Delete_Item", async () => {
         if (this.embedded) {
@@ -43996,7 +44061,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                   _: 3
                 }, 8, ["columns", "table-view", "onOnKeyup"]),
                 createVNode$1(_component_Col, mergeProps(_ctx.getGrid($data.tableView.filterWidth), {
-                  style: { "text-align": $data.tableView.filterAlign == null ? "left" : $data.tableView.filterAlign.toLowerCase() }
+                  style: { "text-align": !($data.tableView.filterAlign || "").trim() ? "left" : $data.tableView.filterAlign.toLowerCase() }
                 }), {
                   default: withCtx(() => [
                     createVNode$1(_component_FormItem, { "label-width": 0 }, {
@@ -44013,7 +44078,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
                           ]),
                           _: 1
                         })) : createCommentVNode("v-if", true),
-                        $data.tableView.createEnable && $props.createEnable ? (openBlock(), createBlock(_component_Button, {
+                        $data.tableView.createEnable && $props.createEnable && !$props.readonly ? (openBlock(), createBlock(_component_Button, {
                           key: 1,
                           type: "primary",
                           "custom-icon": "fa fa-plus",
@@ -44548,16 +44613,24 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
               "custom-icon": "fa fa-edit",
               onClick: ($event) => $options.edit($options.rowData(row, index2), index2)
             }, null, 8, ["title", "onClick"])) : createCommentVNode("v-if", true),
-            $options.judge($data.tableView.removeEnable, $data.tableView.removeEnableJson, $options.rowData(row, index2)) && $props.removeEnable && !$props.readonly ? (openBlock(), createBlock(_component_Button, {
+            $options.judge($data.tableView.showEnable, $data.tableView.showEnableJson, $options.rowData(row, index2)) && $props.showEnable ? (openBlock(), createBlock(_component_Button, {
               key: 1,
               size: "small",
+              title: _ctx.$t("Front_Btn_Detail"),
+              type: "info",
+              "custom-icon": "fa fa-file-alt",
+              onClick: ($event) => $options.show($options.rowData(row, index2), index2)
+            }, null, 8, ["title", "onClick"])) : createCommentVNode("v-if", true),
+            $options.judge($data.tableView.removeEnable, $data.tableView.removeEnableJson, $options.rowData(row, index2)) && $props.removeEnable && !$props.readonly ? (openBlock(), createBlock(_component_Button, {
+              key: 2,
+              size: "small",
               title: _ctx.$t("Front_Btn_Remove"),
               type: "warning",
               "custom-icon": "fa fa-trash-alt",
               onClick: ($event) => $options.remove($options.rowData(row, index2), index2)
             }, null, 8, ["title", "onClick"])) : createCommentVNode("v-if", true),
             $props.static && $data.tableView.adjustEnable && !$props.readonly ? (openBlock(), createBlock(_component_Button, {
-              key: 2,
+              key: 3,
               size: "small",
               title: _ctx.$t("Front_Btn_Up"),
               type: "primary",
@@ -44565,7 +44638,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
               onClick: ($event) => $options.up($options.rowData(row, index2), index2)
             }, null, 8, ["title", "onClick"])) : createCommentVNode("v-if", true),
             $props.static && $data.tableView.adjustEnable && !$props.readonly ? (openBlock(), createBlock(_component_Button, {
-              key: 3,
+              key: 4,
               size: "small",
               title: _ctx.$t("Front_Btn_Down"),
               type: "primary",
@@ -53546,6 +53619,19 @@ const _sfc_main$l = {
     dragDrop(args) {
       this.$emit("on-drag-drop", args);
     },
+    clickClose() {
+      if (typeof this.beforeClose == "function") {
+        this.beforeClose().then(
+          () => {
+            this.close();
+          },
+          () => {
+          }
+        );
+      } else {
+        this.close();
+      }
+    },
     getNameI18n(tableView2) {
       if (this.layout.showI18n) {
         if (tableView2.code) {
@@ -53628,7 +53714,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
         })) : createCommentVNode("v-if", true),
         createVNode$1(_component_Icon, {
           type: "ios-close",
-          onClick: _cache[2] || (_cache[2] = ($event) => _ctx.clickClose())
+          onClick: _cache[2] || (_cache[2] = ($event) => $options.clickClose())
         })
       ])
     ]),