mooho-base-admin-plus 2.3.9 → 2.3.11

package/history.md

@@ -27,3 +27,5 @@
 2.3.7 - 继续解决修改筛选导致的弹出选择框 bug
 2.3.8 - 增加可筛选选择框支持
 2.3.9 - 优化默认筛选参数:filter 的处理方式
+2.3.10 - 可筛选选择框 bug 修复
+2.3.11 - 弹出框增加全屏按钮

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

@@ -37553,7 +37553,7 @@ const _sfc_main$w = {
       if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
         return;
       }
-      if (this.$refs["control_" + column.code]) {
+      if (this.$refs["control_" + column.code] && data2) {
         let values = this.$refs["control_" + column.code][0].$data.values;
         let pendings = [];
         if (column.controlType == "MultiComboSelect") {
@@ -42002,7 +42002,7 @@ const _sfc_main$r = {
       if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
         return;
       }
-      if (this.$refs["control_" + column.code]) {
+      if (this.$refs["control_" + column.code] && data2) {
         let values = this.$refs["control_" + column.code][0].$data.values;
         let pendings = [];
         if (column.controlType == "MultiComboSelect") {
@@ -43850,7 +43850,7 @@ const _sfc_main$q = {
       if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
         return;
       }
-      if (this.$refs["control_" + column.code + "_" + index2]) {
+      if (this.$refs["control_" + column.code + "_" + index2] && data2) {
         let values = this.$refs["control_" + column.code + "_" + index2].$data.values;
         let pendings = [];
         if (column.controlType == "MultiComboSelect") {
@@ -51884,7 +51884,7 @@ const _sfc_main$o = {
       if (column.isStaticItem || column.dataType && column.dataType.startsWith("Enum:")) {
         return;
       }
-      if (this.$refs["control_" + column.code]) {
+      if (this.$refs["control_" + column.code] && data2) {
         let values = this.$refs["control_" + column.code][0].$data.values;
         let pendings = [];
         if (column.controlType == "MultiComboSelect") {
@@ -52942,6 +52942,7 @@ const _sfc_main$m = {
   data() {
     return {
       opened: false,
+      isFullscreen: false,
       formView: {},
       settingActive: false
     };
@@ -53176,6 +53177,7 @@ const _hoisted_1$d = { class: "title" };
 const _hoisted_2$b = { class: "description" };
 const _hoisted_3$9 = { class: "ivu-ml-8 ivu-mr-8" };
 function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_Icon = resolveComponent("Icon");
   const _component_view_form = resolveComponent("view-form");
   const _component_Button = resolveComponent("Button");
   const _component_Modal = resolveComponent("Modal");
@@ -53184,8 +53186,9 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createElementBlock("div", null, [
     createVNode$1(_component_Modal, {
       modelValue: $data.opened,
-      "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => $data.opened = $event),
+      "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => $data.opened = $event),
       scrollable: "",
+      fullscreen: $data.isFullscreen,
       "mask-closable": $props.maskClosable == null ? _ctx.layout.maskClosable : $props.maskClosable,
       draggable: $props.draggable == null ? _ctx.layout.draggable : $props.draggable,
       sticky: true,
@@ -53203,6 +53206,23 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
           ])
         ])
       ]),
+      close: withCtx(() => [
+        createElementVNode("div", null, [
+          !$data.isFullscreen ? (openBlock(), createBlock(_component_Icon, {
+            key: 0,
+            style: { "font-size": "20px", "color": "#999", "position": "relative", "top": "-3px" },
+            type: "ios-expand",
+            onClick: _cache[0] || (_cache[0] = withModifiers(($event) => $data.isFullscreen = !$data.isFullscreen, ["stop"]))
+          })) : createCommentVNode("v-if", true),
+          $data.isFullscreen ? (openBlock(), createBlock(_component_Icon, {
+            key: 1,
+            style: { "font-size": "20px", "color": "#999", "position": "relative", "top": "-3px" },
+            type: "ios-contract",
+            onClick: _cache[1] || (_cache[1] = withModifiers(($event) => $data.isFullscreen = !$data.isFullscreen, ["stop"]))
+          })) : createCommentVNode("v-if", true),
+          createVNode$1(_component_Icon, { type: "ios-close" })
+        ])
+      ]),
       footer: withCtx(() => [
         createElementVNode("div", null, [
           createCommentVNode("\r\n            @slot \u9875\u811A\r\n          "),
@@ -53293,7 +53313,7 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
         ])
       ]),
       _: 3
-    }, 8, ["modelValue", "mask-closable", "draggable", "width", "before-close", "onOnVisibleChange"]),
+    }, 8, ["modelValue", "fullscreen", "mask-closable", "draggable", "width", "before-close", "onOnVisibleChange"]),
     $data.settingActive ? (openBlock(), createBlock(_component_form_setting, {
       key: 0,
       ref: "setting",
@@ -53317,6 +53337,7 @@ const _sfc_main$l = {
   data() {
     return {
       opened: false,
+      isFullscreen: false,
       tableView: {},
       param: {}
     };
@@ -53555,13 +53576,15 @@ const _hoisted_1$c = { class: "title" };
 const _hoisted_2$a = { class: "description" };
 const _hoisted_3$8 = { class: "ivu-ml-8 ivu-mr-8" };
 function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_Icon = resolveComponent("Icon");
   const _component_view_table = resolveComponent("view-table");
   const _component_Modal = resolveComponent("Modal");
   return openBlock(), createBlock(_component_Modal, {
     ref: "modal",
     modelValue: $data.opened,
-    "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => $data.opened = $event),
+    "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => $data.opened = $event),
     scrollable: "",
+    fullscreen: $data.isFullscreen,
     "mask-closable": $props.maskClosable == null ? _ctx.layout.maskClosable : $props.maskClosable,
     draggable: $props.draggable == null ? _ctx.layout.draggable : $props.draggable,
     sticky: true,
@@ -53580,6 +53603,23 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
         ])
       ])
     ]),
+    close: withCtx(() => [
+      createElementVNode("div", null, [
+        !$data.isFullscreen ? (openBlock(), createBlock(_component_Icon, {
+          key: 0,
+          style: { "font-size": "20px", "color": "#999", "position": "relative", "top": "-3px" },
+          type: "ios-expand",
+          onClick: _cache[0] || (_cache[0] = withModifiers(($event) => $data.isFullscreen = !$data.isFullscreen, ["stop"]))
+        })) : createCommentVNode("v-if", true),
+        $data.isFullscreen ? (openBlock(), createBlock(_component_Icon, {
+          key: 1,
+          style: { "font-size": "20px", "color": "#999", "position": "relative", "top": "-3px" },
+          type: "ios-contract",
+          onClick: _cache[1] || (_cache[1] = withModifiers(($event) => $data.isFullscreen = !$data.isFullscreen, ["stop"]))
+        })) : createCommentVNode("v-if", true),
+        createVNode$1(_component_Icon, { type: "ios-close" })
+      ])
+    ]),
     footer: withCtx(() => [
       createElementVNode("div", null, [
         createCommentVNode("\r\n          @slot \u9875\u811A\r\n        "),
@@ -53676,7 +53716,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
       ])
     ]),
     _: 3
-  }, 8, ["modelValue", "mask-closable", "draggable", "width", "before-close", "footer-hide", "onOnVisibleChange"]);
+  }, 8, ["modelValue", "fullscreen", "mask-closable", "draggable", "width", "before-close", "footer-hide", "onOnVisibleChange"]);
 }
 var ModalTable = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$l], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/modal-table.vue"]]);
 var index$1 = "";