mooho-base-admin-plus 2.3.12 → 2.3.13

package/history.md

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

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

@@ -53546,6 +53546,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 +53641,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())
         })
       ])
     ]),

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

@@ -377,9 +377,9 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
             `),require$$0.renderSlot(a.$slots,"tableCommand",{table:g.table,tableColumn:g.tableColumn,tableCode:g.tableCode,row:g.row,index:g.index})]),bottom:require$$0.withCtx(({form:g})=>[require$$0.createCommentVNode(`\r
                 @slot \u5E95\u90E8\r
                 @binding {object} form \u8868\u5355\u5BF9\u8C61\r
-            `),require$$0.renderSlot(a.$slots,"bottom",{form:g})]),_:3},8,["view-code","readonly","defaultData","setting-enable","onOnChange","onOnReady"])])]),_:3},8,["modelValue","fullscreen","mask-closable","draggable","width","before-close","onOnVisibleChange"]),l.settingActive?(require$$0.openBlock(),require$$0.createBlock(p,{key:0,ref:"setting","is-setting":!0,onLayoutMode:u.layoutMode,onOnChange:u.init},null,8,["onLayoutMode","onOnChange"])):require$$0.createCommentVNode("v-if",!0),l.settingActive?(require$$0.openBlock(),require$$0.createBlock(v,{key:1,ref:"settingLayout","is-setting":!0,onListMode:u.listMode,onOnChange:u.init},null,8,["onListMode","onOnChange"])):require$$0.createCommentVNode("v-if",!0)])}var ModalForm=_export_sfc(_sfc_main$m,[["render",_sfc_render$m],["__file","D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/modal-form.vue"]]);const _sfc_main$l={mixins:[mixinPage],components:{},data(){return{opened:!1,isFullscreen:!1,tableView:{},param:{}}},created(){},props:{viewCode:{type:String},static:{type:Boolean,default:!1},filter:{type:Object,default(){return{}}},footerEnable:{type:Boolean,default:!1},autoLoad:{type:Boolean,default:!0},maskClosable:{type:Boolean,default:null},draggable:{type:Boolean,default:null},settingEnable:{type:Boolean,default:!0},selectEnable:{type:Boolean,default:!1},checkCrossPage:{type:Boolean,default:!1},treeEnable:{type:Boolean,default:!1},treeColumn:{type:String},treeLoad:{type:Function},hasChildren:{type:Function},createEnable:{type:Boolean,default:!0},editEnable:{type:Boolean,default:!0},removeEnable:{type:Boolean,default:!0},filterEnable:{type:Boolean,default:!0},pageEnable:{type:Boolean,default:!0},embedded:{type:Boolean,default:!1},beforeLoadData:{type:Function},onSearch:{type:Function},summaryMethod:{type:Function},pageSizeOpts:{type:Array},beforeClose:{type:Function},spanMethod:{type:Function},loadDataEnable:{type:Boolean,default:!0},rowClassName:{type:Function}},computed:{data(){return this.$refs.table.data},table(){return this.$refs.table},filterData(){return this.$refs.table.filterData},screenWidth(){return document.body.clientWidth*.8}},methods:{async init(a,r,o){await this.$refs.table.init(a,r,o)},open(a){setTimeout(()=>{if(this.param)for(let r in this.param)delete this.filterData[r];if(this.param=a,this.param)for(let r in this.param)this.filterData[r]=this.param[r];this.$refs.table.loadData(),this.opened=!0})},async close(){this.opened=!1},validate(){return this.$refs.table.validate()},loadData(a){this.$refs.table.loadData(a)},getSelected(){return this.$refs.table.getSelected()},setSelected(a){this.$refs.table.setSelected(a)},getData(){return this.$refs.table.getData()},getDefaultData(){return this.$refs.table.getDefaultData()},onReady(a){this.tableView=a},onVisibleChange(a){a||(this.$refs.table.isStatic&&this.$refs.table.loadData([]),this.$emit("on-close"))},onLoadData(){this.$emit("on-load-data")},create(){this.$emit("create",this.param)},edit(a){this.$emit("edit",a)},remove(a){this.$refs.table.remove(a)},afterInit(){this.$emit("after-init")},selectAllCancel(){this.setSelected([])},clear(){this.$refs.table.clear()},dragDrop(a){this.$emit("on-drag-drop",a)},getNameI18n(a){if(this.layout.showI18n){if(a.code){let r="DataView_"+a.code,o=this.$t(r);return o==r?a.name:o}}else return a.name},getDescI18n(a){if(this.layout.showI18n){if(a.code){let r="DataView_"+a.code+"_$Desc",o=this.$t(r);return o==r?a.name:o}}else return a.description}}},_hoisted_1$c={class:"title"},_hoisted_2$a={class:"description"},_hoisted_3$8={class:"ivu-ml-8 ivu-mr-8"};function _sfc_render$l(a,r,o,s,l,u){const c=require$$0.resolveComponent("Icon"),d=require$$0.resolveComponent("view-table"),f=require$$0.resolveComponent("Modal");return require$$0.openBlock(),require$$0.createBlock(f,{ref:"modal",modelValue:l.opened,"onUpdate:modelValue":r[4]||(r[4]=h=>l.opened=h),scrollable:"",fullscreen:l.isFullscreen,"mask-closable":o.maskClosable==null?a.layout.maskClosable:o.maskClosable,draggable:o.draggable==null?a.layout.draggable:o.draggable,sticky:!0,"reset-drag-position":!0,width:l.tableView.width||u.screenWidth,"before-close":o.beforeClose,"footer-hide":!o.footerEnable,onOnVisibleChange:u.onVisibleChange},{header:require$$0.withCtx(()=>[require$$0.createElementVNode("div",null,[require$$0.createCommentVNode(`\r
+            `),require$$0.renderSlot(a.$slots,"bottom",{form:g})]),_:3},8,["view-code","readonly","defaultData","setting-enable","onOnChange","onOnReady"])])]),_:3},8,["modelValue","fullscreen","mask-closable","draggable","width","before-close","onOnVisibleChange"]),l.settingActive?(require$$0.openBlock(),require$$0.createBlock(p,{key:0,ref:"setting","is-setting":!0,onLayoutMode:u.layoutMode,onOnChange:u.init},null,8,["onLayoutMode","onOnChange"])):require$$0.createCommentVNode("v-if",!0),l.settingActive?(require$$0.openBlock(),require$$0.createBlock(v,{key:1,ref:"settingLayout","is-setting":!0,onListMode:u.listMode,onOnChange:u.init},null,8,["onListMode","onOnChange"])):require$$0.createCommentVNode("v-if",!0)])}var ModalForm=_export_sfc(_sfc_main$m,[["render",_sfc_render$m],["__file","D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/modal-form.vue"]]);const _sfc_main$l={mixins:[mixinPage],components:{},data(){return{opened:!1,isFullscreen:!1,tableView:{},param:{}}},created(){},props:{viewCode:{type:String},static:{type:Boolean,default:!1},filter:{type:Object,default(){return{}}},footerEnable:{type:Boolean,default:!1},autoLoad:{type:Boolean,default:!0},maskClosable:{type:Boolean,default:null},draggable:{type:Boolean,default:null},settingEnable:{type:Boolean,default:!0},selectEnable:{type:Boolean,default:!1},checkCrossPage:{type:Boolean,default:!1},treeEnable:{type:Boolean,default:!1},treeColumn:{type:String},treeLoad:{type:Function},hasChildren:{type:Function},createEnable:{type:Boolean,default:!0},editEnable:{type:Boolean,default:!0},removeEnable:{type:Boolean,default:!0},filterEnable:{type:Boolean,default:!0},pageEnable:{type:Boolean,default:!0},embedded:{type:Boolean,default:!1},beforeLoadData:{type:Function},onSearch:{type:Function},summaryMethod:{type:Function},pageSizeOpts:{type:Array},beforeClose:{type:Function},spanMethod:{type:Function},loadDataEnable:{type:Boolean,default:!0},rowClassName:{type:Function}},computed:{data(){return this.$refs.table.data},table(){return this.$refs.table},filterData(){return this.$refs.table.filterData},screenWidth(){return document.body.clientWidth*.8}},methods:{async init(a,r,o){await this.$refs.table.init(a,r,o)},open(a){setTimeout(()=>{if(this.param)for(let r in this.param)delete this.filterData[r];if(this.param=a,this.param)for(let r in this.param)this.filterData[r]=this.param[r];this.$refs.table.loadData(),this.opened=!0})},async close(){this.opened=!1},validate(){return this.$refs.table.validate()},loadData(a){this.$refs.table.loadData(a)},getSelected(){return this.$refs.table.getSelected()},setSelected(a){this.$refs.table.setSelected(a)},getData(){return this.$refs.table.getData()},getDefaultData(){return this.$refs.table.getDefaultData()},onReady(a){this.tableView=a},onVisibleChange(a){a||(this.$refs.table.isStatic&&this.$refs.table.loadData([]),this.$emit("on-close"))},onLoadData(){this.$emit("on-load-data")},create(){this.$emit("create",this.param)},edit(a){this.$emit("edit",a)},remove(a){this.$refs.table.remove(a)},afterInit(){this.$emit("after-init")},selectAllCancel(){this.setSelected([])},clear(){this.$refs.table.clear()},dragDrop(a){this.$emit("on-drag-drop",a)},clickClose(){typeof this.beforeClose=="function"?this.beforeClose().then(()=>{this.close()},()=>{}):this.close()},getNameI18n(a){if(this.layout.showI18n){if(a.code){let r="DataView_"+a.code,o=this.$t(r);return o==r?a.name:o}}else return a.name},getDescI18n(a){if(this.layout.showI18n){if(a.code){let r="DataView_"+a.code+"_$Desc",o=this.$t(r);return o==r?a.name:o}}else return a.description}}},_hoisted_1$c={class:"title"},_hoisted_2$a={class:"description"},_hoisted_3$8={class:"ivu-ml-8 ivu-mr-8"};function _sfc_render$l(a,r,o,s,l,u){const c=require$$0.resolveComponent("Icon"),d=require$$0.resolveComponent("view-table"),f=require$$0.resolveComponent("Modal");return require$$0.openBlock(),require$$0.createBlock(f,{ref:"modal",modelValue:l.opened,"onUpdate:modelValue":r[4]||(r[4]=h=>l.opened=h),scrollable:"",fullscreen:l.isFullscreen,"mask-closable":o.maskClosable==null?a.layout.maskClosable:o.maskClosable,draggable:o.draggable==null?a.layout.draggable:o.draggable,sticky:!0,"reset-drag-position":!0,width:l.tableView.width||u.screenWidth,"before-close":o.beforeClose,"footer-hide":!o.footerEnable,onOnVisibleChange:u.onVisibleChange},{header:require$$0.withCtx(()=>[require$$0.createElementVNode("div",null,[require$$0.createCommentVNode(`\r
           @slot \u9875\u5934\r
-        `),require$$0.renderSlot(a.$slots,"header",{},()=>[require$$0.createElementVNode("span",_hoisted_1$c,require$$0.toDisplayString(u.getNameI18n(l.tableView)),1),require$$0.createElementVNode("span",_hoisted_2$a,require$$0.toDisplayString(u.getDescI18n(l.tableView)),1)])])]),close:require$$0.withCtx(()=>[require$$0.createElementVNode("div",{onClick:r[3]||(r[3]=require$$0.withModifiers(()=>{},["stop"]))},[l.isFullscreen?require$$0.createCommentVNode("v-if",!0):(require$$0.openBlock(),require$$0.createBlock(c,{key:0,style:{"font-size":"20px",color:"#999",position:"relative",top:"-3px"},type:"ios-expand",onClick:r[0]||(r[0]=h=>l.isFullscreen=!l.isFullscreen)})),l.isFullscreen?(require$$0.openBlock(),require$$0.createBlock(c,{key:1,style:{"font-size":"20px",color:"#999",position:"relative",top:"-3px"},type:"ios-contract",onClick:r[1]||(r[1]=h=>l.isFullscreen=!l.isFullscreen)})):require$$0.createCommentVNode("v-if",!0),require$$0.createVNode(c,{type:"ios-close",onClick:r[2]||(r[2]=h=>a.clickClose())})])]),footer:require$$0.withCtx(()=>[require$$0.createElementVNode("div",null,[require$$0.createCommentVNode(`\r
+        `),require$$0.renderSlot(a.$slots,"header",{},()=>[require$$0.createElementVNode("span",_hoisted_1$c,require$$0.toDisplayString(u.getNameI18n(l.tableView)),1),require$$0.createElementVNode("span",_hoisted_2$a,require$$0.toDisplayString(u.getDescI18n(l.tableView)),1)])])]),close:require$$0.withCtx(()=>[require$$0.createElementVNode("div",{onClick:r[3]||(r[3]=require$$0.withModifiers(()=>{},["stop"]))},[l.isFullscreen?require$$0.createCommentVNode("v-if",!0):(require$$0.openBlock(),require$$0.createBlock(c,{key:0,style:{"font-size":"20px",color:"#999",position:"relative",top:"-3px"},type:"ios-expand",onClick:r[0]||(r[0]=h=>l.isFullscreen=!l.isFullscreen)})),l.isFullscreen?(require$$0.openBlock(),require$$0.createBlock(c,{key:1,style:{"font-size":"20px",color:"#999",position:"relative",top:"-3px"},type:"ios-contract",onClick:r[1]||(r[1]=h=>l.isFullscreen=!l.isFullscreen)})):require$$0.createCommentVNode("v-if",!0),require$$0.createVNode(c,{type:"ios-close",onClick:r[2]||(r[2]=h=>u.clickClose())})])]),footer:require$$0.withCtx(()=>[require$$0.createElementVNode("div",null,[require$$0.createCommentVNode(`\r
           @slot \u9875\u811A\r
         `),require$$0.renderSlot(a.$slots,"footer")])]),default:require$$0.withCtx(()=>[require$$0.createElementVNode("div",_hoisted_3$8,[require$$0.createVNode(d,{ref:"table","view-code":o.viewCode,static:this.static,"setting-enable":o.settingEnable,"auto-load":!1,"select-enable":o.selectEnable,"check-cross-page":o.checkCrossPage,"tree-enable":o.treeEnable,"tree-load":o.treeLoad,"has-children":o.hasChildren,"create-enable":o.createEnable,"edit-enable":o.editEnable,"remove-enable":o.removeEnable,draggable:o.draggable,"filter-enable":o.filterEnable,"page-enable":o.pageEnable,embedded:o.embedded,"before-load-data":o.beforeLoadData,"on-search":o.onSearch,"summary-method":o.summaryMethod,"page-size-opts":o.pageSizeOpts,"span-method":o.spanMethod,"load-data-enable":o.loadDataEnable,"row-class-name":o.rowClassName,onCreate:u.create,onEdit:u.edit,onOnReady:u.onReady,onOnLoadData:u.onLoadData,onAfterInit:u.afterInit,onOnDragDrop:u.dragDrop},{top:require$$0.withCtx(()=>[require$$0.createCommentVNode(`\r
               @slot \u9876\u90E8\r

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.3.12",
+  "version": "2.3.13",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/components/view/modal-table.vue

@@ -523,6 +523,19 @@
          */
         this.$emit('on-drag-drop', args);
       },
+      // 点击关闭按钮
+      clickClose() {
+        if (typeof this.beforeClose == 'function') {
+          this.beforeClose().then(
+            () => {
+              this.close();
+            },
+            () => {}
+          );
+        } else {
+          this.close();
+        }
+      },
       // 获取多语言名称
       getNameI18n(tableView) {
         if (this.layout.showI18n) {