mooho-base-admin-plus 2.3.11 → 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

@@ -53186,7 +53186,7 @@ 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[2] || (_cache[2] = ($event) => $data.opened = $event),
+      "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => $data.opened = $event),
       scrollable: "",
       fullscreen: $data.isFullscreen,
       "mask-closable": $props.maskClosable == null ? _ctx.layout.maskClosable : $props.maskClosable,
@@ -53207,20 +53207,26 @@ function _sfc_render$m(_ctx, _cache, $props, $setup, $data, $options) {
         ])
       ]),
       close: withCtx(() => [
-        createElementVNode("div", null, [
+        createElementVNode("div", {
+          onClick: _cache[3] || (_cache[3] = withModifiers(() => {
+          }, ["stop"]))
+        }, [
           !$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"]))
+            onClick: _cache[0] || (_cache[0] = ($event) => $data.isFullscreen = !$data.isFullscreen)
           })) : 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"]))
+            onClick: _cache[1] || (_cache[1] = ($event) => $data.isFullscreen = !$data.isFullscreen)
           })) : createCommentVNode("v-if", true),
-          createVNode$1(_component_Icon, { type: "ios-close" })
+          createVNode$1(_component_Icon, {
+            type: "ios-close",
+            onClick: _cache[2] || (_cache[2] = ($event) => $options.clickClose())
+          })
         ])
       ]),
       footer: withCtx(() => [
@@ -53540,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) {
@@ -53582,7 +53601,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createBlock(_component_Modal, {
     ref: "modal",
     modelValue: $data.opened,
-    "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => $data.opened = $event),
+    "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => $data.opened = $event),
     scrollable: "",
     fullscreen: $data.isFullscreen,
     "mask-closable": $props.maskClosable == null ? _ctx.layout.maskClosable : $props.maskClosable,
@@ -53604,20 +53623,26 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
       ])
     ]),
     close: withCtx(() => [
-      createElementVNode("div", null, [
+      createElementVNode("div", {
+        onClick: _cache[3] || (_cache[3] = withModifiers(() => {
+        }, ["stop"]))
+      }, [
         !$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"]))
+          onClick: _cache[0] || (_cache[0] = ($event) => $data.isFullscreen = !$data.isFullscreen)
         })) : 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"]))
+          onClick: _cache[1] || (_cache[1] = ($event) => $data.isFullscreen = !$data.isFullscreen)
         })) : createCommentVNode("v-if", true),
-        createVNode$1(_component_Icon, { type: "ios-close" })
+        createVNode$1(_component_Icon, {
+          type: "ios-close",
+          onClick: _cache[2] || (_cache[2] = ($event) => $options.clickClose())
+        })
       ])
     ]),
     footer: withCtx(() => [

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

@@ -345,9 +345,9 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                                 </AutoComplete>\r
                             </template> `),require$$0.createVNode(v,{ref:"control_"+L.code,"model-value":u.parseComboData(l.data,L),"onUpdate:modelValue":q=>a.setData(l.data,L.code,q),disabled:L.isReadonly,clearable:!0,filterable:"",remote:"","remote-method":q=>u.loadOption(l.data,L,q),style:require$$0.normalizeStyle({width:L.controlWidth==null?null:L.controlWidth+"px"}),placeholder:L.description,transfer:!0,onOnChange:q=>a.onSelectDataChange(L,q)},{default:require$$0.withCtx(()=>[(require$$0.openBlock(!0),require$$0.createElementBlock(require$$0.Fragment,null,require$$0.renderList(u.getDataSource(l.data,L),q=>(require$$0.openBlock(),require$$0.createBlock(p,{key:q.id,value:q.id},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(q.name),1)]),_:2},1032,["value"]))),128))]),_:2},1032,["model-value","onUpdate:modelValue","disabled","remote-method","style","placeholder","onOnChange"])],64)):L.controlType==="MultiComboSelect"?(require$$0.openBlock(),require$$0.createBlock(v,{key:11,ref:"control_"+L.code,"model-value":u.parseMultiComboData(l.data,L),"onUpdate:modelValue":q=>a.setArrayData(l.data,L.code,q),clearable:!0,multiple:!0,filterable:"",remote:"","remote-method":q=>u.loadOption(l.data,L,q),style:require$$0.normalizeStyle({width:L.controlWidth==null?null:L.controlWidth+"px"}),placeholder:L.description,transfer:!0,onOnChange:q=>a.onSelectDataChange(L,q)},{default:require$$0.withCtx(()=>[(require$$0.openBlock(!0),require$$0.createElementBlock(require$$0.Fragment,null,require$$0.renderList(u.getDataSource(l.data,L),q=>(require$$0.openBlock(),require$$0.createBlock(p,{key:q.id,value:q.id},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(q.name),1)]),_:2},1032,["value"]))),128))]),_:2},1032,["model-value","onUpdate:modelValue","remote-method","style","placeholder","onOnChange"])):L.controlType==="DialogSelect"?(require$$0.openBlock(),require$$0.createBlock(y,{key:12,"model-value":a.parseData(l.data,L.code),"onUpdate:modelValue":q=>a.setData(l.data,L.code,q),readonly:L.isReadonly,source:L.source,"source-data-code":L.sourceDataCode,"source-display-code":L.sourceDisplayCode,param:a.getParam(l.data,L),controlWidth:L.controlWidth,onOnChange:q=>u.onDataChange(L,q)},null,8,["model-value","onUpdate:modelValue","readonly","source","source-data-code","source-display-code","param","controlWidth","onOnChange"])):L.controlType==="MultiDialogSelect"?(require$$0.openBlock(),require$$0.createBlock(y,{key:13,"model-value":a.parseData(l.data,L.code),"onUpdate:modelValue":q=>a.setData(l.data,L.code,q),multi:!0,readonly:L.isReadonly,source:L.source,"source-data-code":L.sourceDataCode,"source-display-code":L.sourceDisplayCode,param:a.getParam(l.data,L),controlWidth:L.controlWidth,onOnChange:q=>u.onDataChange(L,q)},null,8,["model-value","onUpdate:modelValue","readonly","source","source-data-code","source-display-code","param","controlWidth","onOnChange"])):L.controlType==="Date"||L.controlType==="DateTime"||L.controlType==="Year"||L.controlType==="Month"?(require$$0.openBlock(),require$$0.createBlock($,{key:14,type:L.controlType.toLowerCase(),"model-value":a.parseData(l.data,L.code),readonly:L.isReadonly,placeholder:L.description,transfer:!0,style:require$$0.normalizeStyle({width:L.controlWidth==null?null:L.controlWidth+"px"}),onOnChange:q=>{a.setData(l.data,L.code,q),u.onDataChange(L)}},null,8,["type","model-value","readonly","placeholder","style","onOnChange"])):L.controlType==="DateRange"?(require$$0.openBlock(),require$$0.createBlock($,{key:15,type:L.controlType.toLowerCase(),"model-value":a.parseDateRangeData(l.data,L.code),"onUpdate:modelValue":q=>a.setArrayData(l.data,L.code,q),readonly:L.isReadonly,placeholder:L.description,transfer:!0,style:require$$0.normalizeStyle({width:L.controlWidth==null?null:L.controlWidth+"px"}),onOnChange:q=>u.onDataChange(L)},null,8,["type","model-value","onUpdate:modelValue","readonly","placeholder","style","onOnChange"])):L.controlType==="Time"?(require$$0.openBlock(),require$$0.createBlock(_,{key:16,type:"time","model-value":a.parseData(l.data,L.code),"onUpdate:modelValue":q=>a.setData(l.data,L.code,q),readonly:L.isReadonly,placeholder:L.description,transfer:!0,style:require$$0.normalizeStyle({width:L.controlWidth==null?null:L.controlWidth+"px"}),onOnChange:q=>{a.setData(l.data,L.code,q),u.onDataChange(L)}},null,8,["model-value","onUpdate:modelValue","readonly","placeholder","style","onOnChange"])):L.controlType==="Check"?(require$$0.openBlock(),require$$0.createBlock(C,{key:17,"model-value":!!a.parseData(l.data,L.code),"onUpdate:modelValue":q=>a.setData(l.data,L.code,q),disabled:L.isReadonly,size:"large",onOnChange:q=>u.onDataChange(L)},null,8,["model-value","onUpdate:modelValue","disabled","onOnChange"])):L.controlType==="Switch"?(require$$0.openBlock(),require$$0.createBlock(b,{key:18,"model-value":!!a.parseData(l.data,L.code),"onUpdate:modelValue":q=>a.setData(l.data,L.code,q),disabled:L.isReadonly,onOnChange:q=>u.onDataChange(L)},null,8,["model-value","onUpdate:modelValue","disabled","onOnChange"])):L.controlType==="Radio"?(require$$0.openBlock(),require$$0.createBlock(x,{key:19,"model-value":a.parseData(l.data,L.code),"onUpdate:modelValue":q=>a.setData(l.data,L.code,q),onOnChange:q=>u.onDataChange(L)},{default:require$$0.withCtx(()=>[(require$$0.openBlock(!0),require$$0.createElementBlock(require$$0.Fragment,null,require$$0.renderList(u.getDataSource(l.data,L),q=>(require$$0.openBlock(),require$$0.createBlock(w,{key:q.id,label:q.id,disabled:L.isReadonly},{default:require$$0.withCtx(()=>[require$$0.createElementVNode("span",null,require$$0.toDisplayString(q.name),1)]),_:2},1032,["label","disabled"]))),128))]),_:2},1032,["model-value","onUpdate:modelValue","onOnChange"])):L.controlType==="CheckGroup"?(require$$0.openBlock(),require$$0.createBlock(D,{key:20,"model-value":a.parseArrayData(l.data,L.code),"onUpdate:modelValue":q=>a.setArrayData(l.data,L.code,q),onOnChange:q=>u.onDataChange(L)},{default:require$$0.withCtx(()=>[(require$$0.openBlock(!0),require$$0.createElementBlock(require$$0.Fragment,null,require$$0.renderList(u.getDataSource(l.data,L),q=>(require$$0.openBlock(),require$$0.createBlock(C,{key:q.id,label:q.id,disabled:L.isReadonly},{default:require$$0.withCtx(()=>[require$$0.createElementVNode("span",null,require$$0.toDisplayString(q.name),1)]),_:2},1032,["label","disabled"]))),128))]),_:2},1032,["model-value","onUpdate:modelValue","onOnChange"])):L.controlType==="TextArea"?(require$$0.openBlock(),require$$0.createBlock(h,{key:21,type:"textarea","model-value":a.parseData(l.data,L.code),"onUpdate:modelValue":q=>a.setData(l.data,L.code,q),readonly:L.isReadonly,style:require$$0.normalizeStyle({width:L.controlWidth==null?null:L.controlWidth+"px"}),rows:L.controlHeight/20,maxlength:L.maxLength,placeholder:L.description},null,8,["model-value","onUpdate:modelValue","readonly","style","rows","maxlength","placeholder"])):L.controlType==="RichEditor"?(require$$0.openBlock(),require$$0.createBlock(A,{key:22,"model-value":a.parseData(l.data,L.code),"onUpdate:modelValue":q=>a.setData(l.data,L.code,q),readonly:L.isReadonly,height:L.controlHeight,width:L.controlWidth},null,8,["model-value","onUpdate:modelValue","readonly","height","width"])):L.controlType==="Attachment"?(require$$0.openBlock(),require$$0.createBlock(E,{key:23,"model-value":a.parseData(l.data,L.code),"onUpdate:modelValue":q=>a.setData(l.data,L.code,q),readonly:L.isReadonly,maxCount:L.maxLength,accept:L.pattern,draggable:L.mergeSame},null,8,["model-value","onUpdate:modelValue","readonly","maxCount","accept","draggable"])):L.controlType==="Image"?(require$$0.openBlock(),require$$0.createBlock(P,{key:24,"model-value":a.parseData(l.data,L.code),"onUpdate:modelValue":q=>a.setData(l.data,L.code,q),readonly:L.isReadonly,maxCount:L.maxLength,height:L.controlHeight,width:L.controlWidth},null,8,["model-value","onUpdate:modelValue","readonly","maxCount","height","width"])):L.controlType==="Slider"?(require$$0.openBlock(),require$$0.createElementBlock(require$$0.Fragment,{key:25},[L.isReadonly?require$$0.createCommentVNode("v-if",!0):(require$$0.openBlock(),require$$0.createBlock(O,{key:0,"model-value":a.parseData(l.data,L.code),"onUpdate:modelValue":q=>a.setData(l.data,L.code,q),"show-input":"",style:require$$0.normalizeStyle({width:L.controlWidth==null?null:L.controlWidth+"px"}),max:L.maxValue,min:L.minValue},null,8,["model-value","onUpdate:modelValue","style","max","min"])),L.isReadonly?(require$$0.openBlock(),require$$0.createBlock(h,{key:1,type:"number",number:"",readonly:"","model-value":a.parseData(l.data,L.code),style:require$$0.normalizeStyle({width:L.controlWidth==null?"100px":L.controlWidth+"px"}),placeholder:L.description},null,8,["model-value","style","placeholder"])):require$$0.createCommentVNode("v-if",!0)],64)):require$$0.createCommentVNode("v-if",!0)]),_:2},1032,["label","prop","rules","error"])):require$$0.createCommentVNode("v-if",!0)],46,_hoisted_1$f)]),_:1},8,["modelValue","onStart","onEnd"])]),_:1},8,["model"]),require$$0.createCommentVNode(` <FooterToolbar>\r
             <Button type="primary" size="large">{{ $t('Front_Btn_Submit') }}</Button>\r
-        </FooterToolbar>`)])}var viewFormDraggable=_export_sfc(_sfc_main$o,[["render",_sfc_render$o],["__file","D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/view-form-draggable.vue"]]),formSettingLayout_vue_vue_type_style_index_0_scoped_true_lang="";const _sfc_main$n={mixins:[mixinPage],components:{columnEdit,columnSelect,viewFormDraggable,draggable},data(){return{columnWidth:"Column6",opened:!1,dataView:{},componentGroups:[]}},async created(){},props:{isSetting:{type:Boolean,default:!1}},computed:{},methods:{...mapActions("admin/dataView",{saveDataView:"save",saveDataViewSetting:"saveSetting"}),async open(a,r){this.dataView=a,this.$refs.form.init(this.dataView,this.copy(r)),this.opened=!0;const o=await enumApi.query("ControlType");this.componentGroups=[{key:"Normal",name:this.$t("Front_Label_Normal_Control"),components:[]},{key:"Datasource",name:this.$t("Front_Label_Data_Source_Control"),components:[]},{key:"DateTime",name:this.$t("Front_Label_Date_Time_Control"),components:[]},{key:"Other",name:this.$t("Front_Label_Other_Control"),components:[]}],o.forEach(s=>{let l={code:null,name:s.name,controlType:s.id,isShow:!0,isVirtual:a.isVirtual,columnWidth:this.columnWidth,dataView:a};s.id=="Label"||s.id=="TextInput"||s.id=="NumberInput"||s.id=="Hyperlink"||s.id=="Check"||s.id=="Switch"||s.id=="Slider"||s.id=="TextArea"?this.componentGroups.find(u=>u.key=="Normal").components.push(l):s.id=="Select"||s.id=="SelectWithOther"||s.id=="MultiSelect"||s.id=="ComboSelect"||s.id=="MultiComboSelect"||s.id=="DialogSelect"||s.id=="MultiDialogSelect"||s.id=="TreeSelect"||s.id=="MultiTreeSelect"||s.id=="Radio"||s.id=="CheckGroup"?this.componentGroups.find(u=>u.key=="Datasource").components.push(l):s.id=="Date"||s.id=="Time"||s.id=="DateTime"||s.id=="Year"||s.id=="Month"||s.id=="DateRange"?this.componentGroups.find(u=>u.key=="DateTime").components.push(l):(s.id=="Title"||s.id=="Description"||s.id=="Table"||s.id=="List"||s.id=="Attachment"||s.id=="Image"||s.id=="RichEditor"||s.id=="Custom"||s.id=="Placeholder")&&this.componentGroups.find(u=>u.key=="Other").components.push(l)})},close(){this.opened=!1},edit(a,r){this.$refs.columnEdit.open(a,r,this.$refs.form.columns,o=>{lodash$1.exports.get(this.$refs.form.data,o.code)==null&&lodash$1.exports.set(this.$refs.form.data,o.code,null),this.$refs.form.columns.splice(r,1,o)})},remove(a,r){this.confirm("Front_Msg_Sure_To_Remove_Control",async()=>{this.$refs.form.columns.splice(r,1)})},openColumnSelect(){this.$refs.columnSelect.open(this.dataView,this.$refs.form.columns,a=>{let r=this.$refs.form.columns.filter(o=>a.some(s=>o.code===s.code)||o.isVirtual);this.$refs.form.columns.splice(0,this.$refs.form.columns.length),r.forEach(o=>{this.$refs.form.columns.push(o)}),a.forEach(o=>{if(!this.$refs.form.columns.some(s=>s.code===o.code)){let s=this.$refs.form.data;lodash$1.exports.get(s,o.code)==null&&lodash$1.exports.set(s,o.code,null);let l={code:o.code,name:o.name,dataType:o.dataType,dataView:this.dataView,isShow:!0,controlType:o.code.indexOf(".")>0?"Label":this.getDefaultControlType(o.dataType),columnWidth:this.columnWidth,source:o.objColumn!=null?o.objColumn.dataType:null,sourceDataCode:o.objColumn!=null?"id":null,sourceModel:o.objColumn!=null?o.objColumn.dataType:null,sourceDisplayCode:o.objColumn!=null&&o.objColumn.columns.some(function(u){return u.code===o.objColumn.code+".name"})?"name":null};this.$refs.form.columns.push(l)}})})},globalSave(){this.confirm("Front_Msg_Sure_To_Save_Global_Setting",()=>{this.confirm("Front_Msg_Sure_To_Save_Global_Setting_Confirm",async()=>{await this.saveDataView({code:this.dataView.code,columns:this.$refs.form.columns}),this.$emit("on-change",this.dataView.code),this.success("Front_Msg_Success",()=>{this.close()})})})},save(){this.confirm("Front_Msg_Sure_To_Save_Setting",async()=>{await this.saveDataView({code:this.dataView.code,columns:this.$refs.form.columns}),this.success("Front_Msg_Success",()=>{this.close()})})},columnWidthChange(){this.componentGroups.forEach(a=>{a.components.forEach(r=>{r.columnWidth=this.columnWidth})})},clone(a){return this.copy(a)},dblclick(a){this.$refs.form.columns.push(this.copy(a))},setting(){this.$refs.setting.open(this.copy(this.dataView))},saveSetting(){this.confirm("Front_Msg_Sure_To_Save_Setting",async()=>{let a=await this.saveDataViewSetting(this.$refs.setting.data);this.dataView=a.dataView,this.$emit("on-change",this.dataView.code),this.success("Front_Msg_Success",()=>{this.$refs.setting.close()})})},listMode(){this.$emit("list-mode",{dataView:this.dataView,columns:this.$refs.form.columns})},getDefaultControlType(a){return a=="Integer"||a=="BigInteger"||a=="Decimal"||a=="Float"||a=="Double"?"NumberInput":a=="Boolean"?"Check":a=="DateTime"?"Date":"TextInput"}}},_hoisted_1$e={class:"title"},_hoisted_2$c={class:"description"},_hoisted_3$a={class:"container"},_hoisted_4$4={class:"left"},_hoisted_5$2={style:{width:"100%",display:"flex"}},_hoisted_6$1={style:{width:"50%",float:"left"}},_hoisted_7$1={class:"right"},_hoisted_8$1={class:"ivu-ml-8 ivu-mr-8"};function _sfc_render$n(a,r,o,s,l,u){const c=require$$0.resolveComponent("Divider"),d=require$$0.resolveComponent("Radio"),f=require$$0.resolveComponent("RadioGroup"),h=require$$0.resolveComponent("Button"),p=require$$0.resolveComponent("draggable"),v=require$$0.resolveComponent("Card"),g=require$$0.resolveComponent("view-form-draggable"),y=require$$0.resolveComponent("Modal"),$=require$$0.resolveComponent("column-select"),_=require$$0.resolveComponent("column-edit"),C=require$$0.resolveComponent("modal-form");return require$$0.openBlock(),require$$0.createElementBlock("div",null,[require$$0.createVNode(y,{ref:"modal",modelValue:l.opened,"onUpdate:modelValue":r[3]||(r[3]=b=>l.opened=b),scrollable:"","mask-closable":a.layout.maskClosable,draggable:a.layout.draggable,sticky:!0,"reset-drag-position":!0,width:(l.dataView&&l.dataView.width?l.dataView.width:800)+350},{header:require$$0.withCtx(()=>[require$$0.createElementVNode("div",null,[require$$0.renderSlot(a.$slots,"header",{},()=>[require$$0.createElementVNode("span",_hoisted_1$e,require$$0.toDisplayString(l.dataView.name),1),require$$0.createElementVNode("span",_hoisted_2$c,require$$0.toDisplayString(l.dataView.description),1)],!0)])]),footer:require$$0.withCtx(()=>[require$$0.createElementVNode("div",null,[require$$0.createVNode(h,{type:"primary",ghost:"","custom-icon":"fa fa-bars",onClick:u.listMode},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_List_Mode")),1)]),_:1},8,["onClick"]),l.dataView.isVirtual?require$$0.createCommentVNode("v-if",!0):(require$$0.openBlock(),require$$0.createBlock(h,{key:0,type:"primary",ghost:"","custom-icon":"fa fa-indent",onClick:u.openColumnSelect},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Select_Column")),1)]),_:1},8,["onClick"])),o.isSetting?require$$0.createCommentVNode("v-if",!0):(require$$0.openBlock(),require$$0.createBlock(h,{key:1,type:"primary","custom-icon":"fa fa-save",onClick:u.save},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Save")),1)]),_:1},8,["onClick"])),o.isSetting?(require$$0.openBlock(),require$$0.createBlock(h,{key:2,type:"error","custom-icon":"fa fa-save",onClick:u.globalSave},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Global_Save")),1)]),_:1},8,["onClick"])):require$$0.createCommentVNode("v-if",!0),o.isSetting?(require$$0.openBlock(),require$$0.createBlock(h,{key:3,type:"error","custom-icon":"fa fa-cog",onClick:u.setting},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Form_Setting")),1)]),_:1},8,["onClick"])):require$$0.createCommentVNode("v-if",!0)])]),default:require$$0.withCtx(()=>[require$$0.createElementVNode("div",_hoisted_3$a,[require$$0.createElementVNode("div",_hoisted_4$4,[require$$0.createVNode(v,{bordered:!1,"dis-hover":"",class:"toolbox"},{default:require$$0.withCtx(()=>[require$$0.createVNode(c,{plain:!0,dashed:"",class:"title",size:"small"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Label_Default_Column_Width")),1)]),_:1}),require$$0.createVNode(f,{modelValue:l.columnWidth,"onUpdate:modelValue":r[0]||(r[0]=b=>l.columnWidth=b),onOnChange:u.columnWidthChange},{default:require$$0.withCtx(()=>[require$$0.createVNode(d,{label:"Column12"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Enum_ColumnWidth_Column12")),1)]),_:1}),require$$0.createVNode(d,{label:"Column6"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Enum_ColumnWidth_Column6")),1)]),_:1}),require$$0.createVNode(d,{label:"Column4"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Enum_ColumnWidth_Column4")),1)]),_:1}),require$$0.createVNode(d,{label:"Column3"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Enum_ColumnWidth_Column3")),1)]),_:1}),require$$0.createVNode(d,{label:"Column2"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Enum_ColumnWidth_Column2")),1)]),_:1})]),_:1},8,["modelValue","onOnChange"]),(require$$0.openBlock(!0),require$$0.createElementBlock(require$$0.Fragment,null,require$$0.renderList(l.componentGroups,(b,w)=>(require$$0.openBlock(),require$$0.createElementBlock(require$$0.Fragment,{key:w},[require$$0.createVNode(c,{plain:!0,dashed:"",class:"title",size:"small"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(b.name),1)]),_:2},1024),require$$0.createElementVNode("div",_hoisted_5$2,[require$$0.createVNode(p,{animation:500,modelValue:b.components,"onUpdate:modelValue":x=>b.components=x,"item-key":"index",scroll:!0,group:{name:"sort",pull:"clone",put:!1},sort:!1,clone:u.clone,filter:""},{item:require$$0.withCtx(({element:x})=>[require$$0.createElementVNode("div",_hoisted_6$1,[require$$0.createVNode(h,{icon:"md-list-box",onDblclick:D=>u.dblclick(x),class:"component"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(x.name),1)]),_:2},1032,["onDblclick"])])]),_:2},1032,["modelValue","onUpdate:modelValue","clone"])])],64))),128))]),_:1})]),require$$0.createElementVNode("div",_hoisted_7$1,[require$$0.createElementVNode("div",_hoisted_8$1,[require$$0.createVNode(g,{ref:"form",onEdit:r[1]||(r[1]=({column:b,index:w})=>u.edit(b,w)),onRemove:r[2]||(r[2]=({column:b,index:w})=>u.remove(b,w))},null,512)])])])]),_:3},8,["modelValue","mask-closable","draggable","width"]),require$$0.createVNode($,{ref:"columnSelect"},null,512),require$$0.createVNode(_,{ref:"columnEdit","view-type":"FormView"},null,512),o.isSetting?(require$$0.openBlock(),require$$0.createBlock(C,{key:0,ref:"setting","view-code":"FormViewSetting"},{footer:require$$0.withCtx(()=>[require$$0.createVNode(h,{type:"primary","custom-icon":"fa fa-save",onClick:u.saveSetting},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Save")),1)]),_:1},8,["onClick"])]),_:1},512)):require$$0.createCommentVNode("v-if",!0)])}var FormSettingLayout=_export_sfc(_sfc_main$n,[["render",_sfc_render$n],["__scopeId","data-v-5a7f5816"],["__file","D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/form-setting-layout.vue"]]);const _sfc_main$m={mixins:[mixinPage],components:{formSetting:FormSetting,formSettingLayout:FormSettingLayout},data(){return{opened:!1,isFullscreen:!1,formView:{},settingActive:!1}},async created(){},props:{viewCode:{type:String},readonly:{type:Boolean,default:!1},defaultData:{type:Object,default(){return{}}},createEnable:{type:Boolean,default:!0},editEnable:{type:Boolean,default:!0},saveEnable:{type:Boolean,default:!0},maskClosable:{type:Boolean,default:null},draggable:{type:Boolean,default:null},settingEnable:{type:Boolean,default:!0},validateFunction:{type:Function},beforeClose:{type:Function}},computed:{data(){return this.$refs.form.data},columns(){return this.$refs.form.columns}},methods:{async init(a,r,o){await this.$refs.form.init(a,r,o)},loadView(a){this.$refs.form.loadView(a)},open(a,r){a?(this.$refs.form.data=this.copy(a),this.$refs.form.compareData=r):this.$refs.form.setDefault(),setTimeout(()=>{this.$refs.form.onDataChange(),this.$refs.form.clearValidate(),this.opened=!0})},openDefault(a){this.$refs.form.setDefault(a),setTimeout(()=>{this.$refs.form.onDataChange(),this.$refs.form.clearValidate(),this.opened=!0})},setData(a){this.$refs.form.data=a},async close(){this.opened=!1},setDefault(a){this.$refs.form.setDefault(a)},validate(){return this.$refs.form.validate()},getFullData(){return this.$refs.form.getFullData()},onChange(a,r,o,s){this.$emit("on-change",a,r,o,s)},setTableData(a,r){this.$refs.form.setTableData(a,r)},refresh(){this.$refs.form.refresh()},onReady(a){this.formView=a},onVisibleChange(a){a||(this.$refs.form.reset(),this.$emit("on-close"))},canSave(){return this.readonly?!1:this.$refs.form&&this.$refs.form.data?this.$refs.form.data.id?this.editEnable:this.createEnable:!0},async onSave(){if(!await this.$refs.form.validate())this.error("Front_Msg_Form_Validate_Fail");else{if(this.validateFunction&&!this.validateFunction())return;this.$emit("on-before-save");let r=this.$refs.form.getFullData();if(!r)return;this.confirm("Front_Msg_Sure_To_Save",async()=>{this.formView.isCustom?r.id?await customModelApi.update(this.formView.model,r):await customModelApi.add(this.formView.model,r):r.id?await modelApi.update(this.formView.model,r):await modelApi.add(this.formView.model,r),this.success("Front_Msg_Success",()=>{this.$refs.form.data={},this.$emit("on-after-save",r),this.close()})})}},settingOpen(){this.settingActive=!0,setTimeout(async()=>{this.$refs.settingLayout.open(this.formView,this.copy(this.formView.columns))})},listMode({dataView:a,columns:r}){this.$refs.settingLayout.close(),this.$refs.setting.open(a,r)},layoutMode({dataView:a,columns:r}){this.$refs.setting.close(),this.$refs.settingLayout.open(a,r)},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$d={class:"title"},_hoisted_2$b={class:"description"},_hoisted_3$9={class:"ivu-ml-8 ivu-mr-8"};function _sfc_render$m(a,r,o,s,l,u){const c=require$$0.resolveComponent("Icon"),d=require$$0.resolveComponent("view-form"),f=require$$0.resolveComponent("Button"),h=require$$0.resolveComponent("Modal"),p=require$$0.resolveComponent("form-setting"),v=require$$0.resolveComponent("form-setting-layout");return require$$0.openBlock(),require$$0.createElementBlock("div",null,[require$$0.createVNode(h,{modelValue:l.opened,"onUpdate:modelValue":r[2]||(r[2]=g=>l.opened=g),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.formView.width||"800","before-close":o.beforeClose,onOnVisibleChange:u.onVisibleChange},{header:require$$0.withCtx(()=>[require$$0.createElementVNode("div",null,[require$$0.createCommentVNode(`\r
+        </FooterToolbar>`)])}var viewFormDraggable=_export_sfc(_sfc_main$o,[["render",_sfc_render$o],["__file","D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/view-form-draggable.vue"]]),formSettingLayout_vue_vue_type_style_index_0_scoped_true_lang="";const _sfc_main$n={mixins:[mixinPage],components:{columnEdit,columnSelect,viewFormDraggable,draggable},data(){return{columnWidth:"Column6",opened:!1,dataView:{},componentGroups:[]}},async created(){},props:{isSetting:{type:Boolean,default:!1}},computed:{},methods:{...mapActions("admin/dataView",{saveDataView:"save",saveDataViewSetting:"saveSetting"}),async open(a,r){this.dataView=a,this.$refs.form.init(this.dataView,this.copy(r)),this.opened=!0;const o=await enumApi.query("ControlType");this.componentGroups=[{key:"Normal",name:this.$t("Front_Label_Normal_Control"),components:[]},{key:"Datasource",name:this.$t("Front_Label_Data_Source_Control"),components:[]},{key:"DateTime",name:this.$t("Front_Label_Date_Time_Control"),components:[]},{key:"Other",name:this.$t("Front_Label_Other_Control"),components:[]}],o.forEach(s=>{let l={code:null,name:s.name,controlType:s.id,isShow:!0,isVirtual:a.isVirtual,columnWidth:this.columnWidth,dataView:a};s.id=="Label"||s.id=="TextInput"||s.id=="NumberInput"||s.id=="Hyperlink"||s.id=="Check"||s.id=="Switch"||s.id=="Slider"||s.id=="TextArea"?this.componentGroups.find(u=>u.key=="Normal").components.push(l):s.id=="Select"||s.id=="SelectWithOther"||s.id=="MultiSelect"||s.id=="ComboSelect"||s.id=="MultiComboSelect"||s.id=="DialogSelect"||s.id=="MultiDialogSelect"||s.id=="TreeSelect"||s.id=="MultiTreeSelect"||s.id=="Radio"||s.id=="CheckGroup"?this.componentGroups.find(u=>u.key=="Datasource").components.push(l):s.id=="Date"||s.id=="Time"||s.id=="DateTime"||s.id=="Year"||s.id=="Month"||s.id=="DateRange"?this.componentGroups.find(u=>u.key=="DateTime").components.push(l):(s.id=="Title"||s.id=="Description"||s.id=="Table"||s.id=="List"||s.id=="Attachment"||s.id=="Image"||s.id=="RichEditor"||s.id=="Custom"||s.id=="Placeholder")&&this.componentGroups.find(u=>u.key=="Other").components.push(l)})},close(){this.opened=!1},edit(a,r){this.$refs.columnEdit.open(a,r,this.$refs.form.columns,o=>{lodash$1.exports.get(this.$refs.form.data,o.code)==null&&lodash$1.exports.set(this.$refs.form.data,o.code,null),this.$refs.form.columns.splice(r,1,o)})},remove(a,r){this.confirm("Front_Msg_Sure_To_Remove_Control",async()=>{this.$refs.form.columns.splice(r,1)})},openColumnSelect(){this.$refs.columnSelect.open(this.dataView,this.$refs.form.columns,a=>{let r=this.$refs.form.columns.filter(o=>a.some(s=>o.code===s.code)||o.isVirtual);this.$refs.form.columns.splice(0,this.$refs.form.columns.length),r.forEach(o=>{this.$refs.form.columns.push(o)}),a.forEach(o=>{if(!this.$refs.form.columns.some(s=>s.code===o.code)){let s=this.$refs.form.data;lodash$1.exports.get(s,o.code)==null&&lodash$1.exports.set(s,o.code,null);let l={code:o.code,name:o.name,dataType:o.dataType,dataView:this.dataView,isShow:!0,controlType:o.code.indexOf(".")>0?"Label":this.getDefaultControlType(o.dataType),columnWidth:this.columnWidth,source:o.objColumn!=null?o.objColumn.dataType:null,sourceDataCode:o.objColumn!=null?"id":null,sourceModel:o.objColumn!=null?o.objColumn.dataType:null,sourceDisplayCode:o.objColumn!=null&&o.objColumn.columns.some(function(u){return u.code===o.objColumn.code+".name"})?"name":null};this.$refs.form.columns.push(l)}})})},globalSave(){this.confirm("Front_Msg_Sure_To_Save_Global_Setting",()=>{this.confirm("Front_Msg_Sure_To_Save_Global_Setting_Confirm",async()=>{await this.saveDataView({code:this.dataView.code,columns:this.$refs.form.columns}),this.$emit("on-change",this.dataView.code),this.success("Front_Msg_Success",()=>{this.close()})})})},save(){this.confirm("Front_Msg_Sure_To_Save_Setting",async()=>{await this.saveDataView({code:this.dataView.code,columns:this.$refs.form.columns}),this.success("Front_Msg_Success",()=>{this.close()})})},columnWidthChange(){this.componentGroups.forEach(a=>{a.components.forEach(r=>{r.columnWidth=this.columnWidth})})},clone(a){return this.copy(a)},dblclick(a){this.$refs.form.columns.push(this.copy(a))},setting(){this.$refs.setting.open(this.copy(this.dataView))},saveSetting(){this.confirm("Front_Msg_Sure_To_Save_Setting",async()=>{let a=await this.saveDataViewSetting(this.$refs.setting.data);this.dataView=a.dataView,this.$emit("on-change",this.dataView.code),this.success("Front_Msg_Success",()=>{this.$refs.setting.close()})})},listMode(){this.$emit("list-mode",{dataView:this.dataView,columns:this.$refs.form.columns})},getDefaultControlType(a){return a=="Integer"||a=="BigInteger"||a=="Decimal"||a=="Float"||a=="Double"?"NumberInput":a=="Boolean"?"Check":a=="DateTime"?"Date":"TextInput"}}},_hoisted_1$e={class:"title"},_hoisted_2$c={class:"description"},_hoisted_3$a={class:"container"},_hoisted_4$4={class:"left"},_hoisted_5$2={style:{width:"100%",display:"flex"}},_hoisted_6$1={style:{width:"50%",float:"left"}},_hoisted_7$1={class:"right"},_hoisted_8$1={class:"ivu-ml-8 ivu-mr-8"};function _sfc_render$n(a,r,o,s,l,u){const c=require$$0.resolveComponent("Divider"),d=require$$0.resolveComponent("Radio"),f=require$$0.resolveComponent("RadioGroup"),h=require$$0.resolveComponent("Button"),p=require$$0.resolveComponent("draggable"),v=require$$0.resolveComponent("Card"),g=require$$0.resolveComponent("view-form-draggable"),y=require$$0.resolveComponent("Modal"),$=require$$0.resolveComponent("column-select"),_=require$$0.resolveComponent("column-edit"),C=require$$0.resolveComponent("modal-form");return require$$0.openBlock(),require$$0.createElementBlock("div",null,[require$$0.createVNode(y,{ref:"modal",modelValue:l.opened,"onUpdate:modelValue":r[3]||(r[3]=b=>l.opened=b),scrollable:"","mask-closable":a.layout.maskClosable,draggable:a.layout.draggable,sticky:!0,"reset-drag-position":!0,width:(l.dataView&&l.dataView.width?l.dataView.width:800)+350},{header:require$$0.withCtx(()=>[require$$0.createElementVNode("div",null,[require$$0.renderSlot(a.$slots,"header",{},()=>[require$$0.createElementVNode("span",_hoisted_1$e,require$$0.toDisplayString(l.dataView.name),1),require$$0.createElementVNode("span",_hoisted_2$c,require$$0.toDisplayString(l.dataView.description),1)],!0)])]),footer:require$$0.withCtx(()=>[require$$0.createElementVNode("div",null,[require$$0.createVNode(h,{type:"primary",ghost:"","custom-icon":"fa fa-bars",onClick:u.listMode},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_List_Mode")),1)]),_:1},8,["onClick"]),l.dataView.isVirtual?require$$0.createCommentVNode("v-if",!0):(require$$0.openBlock(),require$$0.createBlock(h,{key:0,type:"primary",ghost:"","custom-icon":"fa fa-indent",onClick:u.openColumnSelect},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Select_Column")),1)]),_:1},8,["onClick"])),o.isSetting?require$$0.createCommentVNode("v-if",!0):(require$$0.openBlock(),require$$0.createBlock(h,{key:1,type:"primary","custom-icon":"fa fa-save",onClick:u.save},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Save")),1)]),_:1},8,["onClick"])),o.isSetting?(require$$0.openBlock(),require$$0.createBlock(h,{key:2,type:"error","custom-icon":"fa fa-save",onClick:u.globalSave},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Global_Save")),1)]),_:1},8,["onClick"])):require$$0.createCommentVNode("v-if",!0),o.isSetting?(require$$0.openBlock(),require$$0.createBlock(h,{key:3,type:"error","custom-icon":"fa fa-cog",onClick:u.setting},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Form_Setting")),1)]),_:1},8,["onClick"])):require$$0.createCommentVNode("v-if",!0)])]),default:require$$0.withCtx(()=>[require$$0.createElementVNode("div",_hoisted_3$a,[require$$0.createElementVNode("div",_hoisted_4$4,[require$$0.createVNode(v,{bordered:!1,"dis-hover":"",class:"toolbox"},{default:require$$0.withCtx(()=>[require$$0.createVNode(c,{plain:!0,dashed:"",class:"title",size:"small"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Label_Default_Column_Width")),1)]),_:1}),require$$0.createVNode(f,{modelValue:l.columnWidth,"onUpdate:modelValue":r[0]||(r[0]=b=>l.columnWidth=b),onOnChange:u.columnWidthChange},{default:require$$0.withCtx(()=>[require$$0.createVNode(d,{label:"Column12"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Enum_ColumnWidth_Column12")),1)]),_:1}),require$$0.createVNode(d,{label:"Column6"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Enum_ColumnWidth_Column6")),1)]),_:1}),require$$0.createVNode(d,{label:"Column4"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Enum_ColumnWidth_Column4")),1)]),_:1}),require$$0.createVNode(d,{label:"Column3"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Enum_ColumnWidth_Column3")),1)]),_:1}),require$$0.createVNode(d,{label:"Column2"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Enum_ColumnWidth_Column2")),1)]),_:1})]),_:1},8,["modelValue","onOnChange"]),(require$$0.openBlock(!0),require$$0.createElementBlock(require$$0.Fragment,null,require$$0.renderList(l.componentGroups,(b,w)=>(require$$0.openBlock(),require$$0.createElementBlock(require$$0.Fragment,{key:w},[require$$0.createVNode(c,{plain:!0,dashed:"",class:"title",size:"small"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(b.name),1)]),_:2},1024),require$$0.createElementVNode("div",_hoisted_5$2,[require$$0.createVNode(p,{animation:500,modelValue:b.components,"onUpdate:modelValue":x=>b.components=x,"item-key":"index",scroll:!0,group:{name:"sort",pull:"clone",put:!1},sort:!1,clone:u.clone,filter:""},{item:require$$0.withCtx(({element:x})=>[require$$0.createElementVNode("div",_hoisted_6$1,[require$$0.createVNode(h,{icon:"md-list-box",onDblclick:D=>u.dblclick(x),class:"component"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(x.name),1)]),_:2},1032,["onDblclick"])])]),_:2},1032,["modelValue","onUpdate:modelValue","clone"])])],64))),128))]),_:1})]),require$$0.createElementVNode("div",_hoisted_7$1,[require$$0.createElementVNode("div",_hoisted_8$1,[require$$0.createVNode(g,{ref:"form",onEdit:r[1]||(r[1]=({column:b,index:w})=>u.edit(b,w)),onRemove:r[2]||(r[2]=({column:b,index:w})=>u.remove(b,w))},null,512)])])])]),_:3},8,["modelValue","mask-closable","draggable","width"]),require$$0.createVNode($,{ref:"columnSelect"},null,512),require$$0.createVNode(_,{ref:"columnEdit","view-type":"FormView"},null,512),o.isSetting?(require$$0.openBlock(),require$$0.createBlock(C,{key:0,ref:"setting","view-code":"FormViewSetting"},{footer:require$$0.withCtx(()=>[require$$0.createVNode(h,{type:"primary","custom-icon":"fa fa-save",onClick:u.saveSetting},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Save")),1)]),_:1},8,["onClick"])]),_:1},512)):require$$0.createCommentVNode("v-if",!0)])}var FormSettingLayout=_export_sfc(_sfc_main$n,[["render",_sfc_render$n],["__scopeId","data-v-5a7f5816"],["__file","D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/form-setting-layout.vue"]]);const _sfc_main$m={mixins:[mixinPage],components:{formSetting:FormSetting,formSettingLayout:FormSettingLayout},data(){return{opened:!1,isFullscreen:!1,formView:{},settingActive:!1}},async created(){},props:{viewCode:{type:String},readonly:{type:Boolean,default:!1},defaultData:{type:Object,default(){return{}}},createEnable:{type:Boolean,default:!0},editEnable:{type:Boolean,default:!0},saveEnable:{type:Boolean,default:!0},maskClosable:{type:Boolean,default:null},draggable:{type:Boolean,default:null},settingEnable:{type:Boolean,default:!0},validateFunction:{type:Function},beforeClose:{type:Function}},computed:{data(){return this.$refs.form.data},columns(){return this.$refs.form.columns}},methods:{async init(a,r,o){await this.$refs.form.init(a,r,o)},loadView(a){this.$refs.form.loadView(a)},open(a,r){a?(this.$refs.form.data=this.copy(a),this.$refs.form.compareData=r):this.$refs.form.setDefault(),setTimeout(()=>{this.$refs.form.onDataChange(),this.$refs.form.clearValidate(),this.opened=!0})},openDefault(a){this.$refs.form.setDefault(a),setTimeout(()=>{this.$refs.form.onDataChange(),this.$refs.form.clearValidate(),this.opened=!0})},setData(a){this.$refs.form.data=a},async close(){this.opened=!1},setDefault(a){this.$refs.form.setDefault(a)},validate(){return this.$refs.form.validate()},getFullData(){return this.$refs.form.getFullData()},onChange(a,r,o,s){this.$emit("on-change",a,r,o,s)},setTableData(a,r){this.$refs.form.setTableData(a,r)},refresh(){this.$refs.form.refresh()},onReady(a){this.formView=a},onVisibleChange(a){a||(this.$refs.form.reset(),this.$emit("on-close"))},canSave(){return this.readonly?!1:this.$refs.form&&this.$refs.form.data?this.$refs.form.data.id?this.editEnable:this.createEnable:!0},async onSave(){if(!await this.$refs.form.validate())this.error("Front_Msg_Form_Validate_Fail");else{if(this.validateFunction&&!this.validateFunction())return;this.$emit("on-before-save");let r=this.$refs.form.getFullData();if(!r)return;this.confirm("Front_Msg_Sure_To_Save",async()=>{this.formView.isCustom?r.id?await customModelApi.update(this.formView.model,r):await customModelApi.add(this.formView.model,r):r.id?await modelApi.update(this.formView.model,r):await modelApi.add(this.formView.model,r),this.success("Front_Msg_Success",()=>{this.$refs.form.data={},this.$emit("on-after-save",r),this.close()})})}},settingOpen(){this.settingActive=!0,setTimeout(async()=>{this.$refs.settingLayout.open(this.formView,this.copy(this.formView.columns))})},listMode({dataView:a,columns:r}){this.$refs.settingLayout.close(),this.$refs.setting.open(a,r)},layoutMode({dataView:a,columns:r}){this.$refs.setting.close(),this.$refs.settingLayout.open(a,r)},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$d={class:"title"},_hoisted_2$b={class:"description"},_hoisted_3$9={class:"ivu-ml-8 ivu-mr-8"};function _sfc_render$m(a,r,o,s,l,u){const c=require$$0.resolveComponent("Icon"),d=require$$0.resolveComponent("view-form"),f=require$$0.resolveComponent("Button"),h=require$$0.resolveComponent("Modal"),p=require$$0.resolveComponent("form-setting"),v=require$$0.resolveComponent("form-setting-layout");return require$$0.openBlock(),require$$0.createElementBlock("div",null,[require$$0.createVNode(h,{modelValue:l.opened,"onUpdate:modelValue":r[4]||(r[4]=g=>l.opened=g),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.formView.width||"800","before-close":o.beforeClose,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$d,require$$0.toDisplayString(u.getNameI18n(l.formView)),1),require$$0.createElementVNode("span",_hoisted_2$b,require$$0.toDisplayString(u.getDescI18n(l.formView)),1)])])]),close:require$$0.withCtx(()=>[require$$0.createElementVNode("div",null,[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]=require$$0.withModifiers(g=>l.isFullscreen=!l.isFullscreen,["stop"]))})),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]=require$$0.withModifiers(g=>l.isFullscreen=!l.isFullscreen,["stop"]))})):require$$0.createCommentVNode("v-if",!0),require$$0.createVNode(c,{type:"ios-close"})])]),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$d,require$$0.toDisplayString(u.getNameI18n(l.formView)),1),require$$0.createElementVNode("span",_hoisted_2$b,require$$0.toDisplayString(u.getDescI18n(l.formView)),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]=g=>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]=g=>l.isFullscreen=!l.isFullscreen)})):require$$0.createCommentVNode("v-if",!0),require$$0.createVNode(c,{type:"ios-close",onClick:r[2]||(r[2]=g=>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",{},()=>[u.canSave()&&o.saveEnable&&!l.formView.editEnable?(require$$0.openBlock(),require$$0.createBlock(f,{key:0,type:"primary","custom-icon":"fa fa-save",onClick:u.onSave},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Save")),1)]),_:1},8,["onClick"])):require$$0.createCommentVNode("v-if",!0)]),require$$0.createVNode(f,{type:"default","custom-icon":"fa fa-times",onClick:u.clickClose},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Close")),1)]),_:1},8,["onClick"]),o.settingEnable&&a.allow("permission/formView")?(require$$0.openBlock(),require$$0.createBlock(f,{key:0,type:"error",title:a.$t("Front_Btn_Setting"),"custom-icon":"fa fa-cog",onClick:u.settingOpen},null,8,["title","onClick"])):require$$0.createCommentVNode("v-if",!0)])]),default:require$$0.withCtx(()=>[require$$0.createElementVNode("div",_hoisted_3$9,[require$$0.createVNode(d,{ref:"form","view-code":o.viewCode,readonly:!u.canSave(),defaultData:o.defaultData,"setting-enable":o.settingEnable,onOnChange:u.onChange,onOnReady:u.onReady},{top:require$$0.withCtx(({form:g})=>[require$$0.createCommentVNode(`\r
                 @slot \u9876\u90E8\r
@@ -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[2]||(r[2]=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",null,[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]=require$$0.withModifiers(h=>l.isFullscreen=!l.isFullscreen,["stop"]))})),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]=require$$0.withModifiers(h=>l.isFullscreen=!l.isFullscreen,["stop"]))})):require$$0.createCommentVNode("v-if",!0),require$$0.createVNode(c,{type:"ios-close"})])]),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.11",
+  "version": "2.3.13",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

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

@@ -24,10 +24,10 @@
         </div>
       </template>
       <template #close>
-        <div>
-          <Icon v-if="!isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-expand" @click.stop="isFullscreen = !isFullscreen" />
-          <Icon v-if="isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-contract" @click.stop="isFullscreen = !isFullscreen" />
-          <Icon type="ios-close" />
+        <div @click.stop>
+          <Icon v-if="!isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-expand" @click="isFullscreen = !isFullscreen" />
+          <Icon v-if="isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-contract" @click="isFullscreen = !isFullscreen" />
+          <Icon type="ios-close" @click="clickClose()" />
         </div>
       </template>
       <div class="ivu-ml-8 ivu-mr-8">

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

@@ -25,10 +25,10 @@
       </div>
     </template>
     <template #close>
-      <div>
-        <Icon v-if="!isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-expand" @click.stop="isFullscreen = !isFullscreen" />
-        <Icon v-if="isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-contract" @click.stop="isFullscreen = !isFullscreen" />
-        <Icon type="ios-close" />
+      <div @click.stop>
+        <Icon v-if="!isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-expand" @click="isFullscreen = !isFullscreen" />
+        <Icon v-if="isFullscreen" style="font-size: 20px; color: #999; position: relative; top: -3px" type="ios-contract" @click="isFullscreen = !isFullscreen" />
+        <Icon type="ios-close" @click="clickClose()" />
       </div>
     </template>
     <div class="ivu-ml-8 ivu-mr-8">
@@ -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) {