mooho-base-admin-plus 2.3.6 → 2.3.7

package/history.md

@@ -24,3 +24,4 @@
 2.3.4 - 菜单筛选默认关闭
 2.3.5 - 解决菜单只能筛选两层的 bug
 2.3.6 - 解决修改筛选导致的弹出选择框 bug
+2.3.7 - 继续解决修改筛选导致的弹出选择框 bug

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

@@ -43606,8 +43606,7 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
     })) : createCommentVNode("v-if", true),
     createCommentVNode("\r\n        @slot \u9876\u90E8\r\n    "),
     renderSlot(_ctx.$slots, "top", {}, void 0, true),
-    $data.tableView.filterEnable && $props.filterEnable ? (openBlock(), createBlock(_component_Form, {
-      key: 1,
+    withDirectives(createVNode$1(_component_Form, {
       model: $props.filter,
       "label-width": $data.tableView.filterTitleWidth ? $data.tableView.filterTitleWidth : _ctx.layout.filterWidth,
       "label-colon": "\uFF1A",
@@ -43766,7 +43765,9 @@ function _sfc_render$q(_ctx, _cache, $props, $setup, $data, $options) {
         ], 512)
       ]),
       _: 3
-    }, 8, ["model", "label-width"])) : createCommentVNode("v-if", true),
+    }, 8, ["model", "label-width"]), [
+      [vShow, $data.tableView.filterEnable && $props.filterEnable]
+    ]),
     createCommentVNode("\r\n        @slot \u4E2D\u90E8\r\n    "),
     renderSlot(_ctx.$slots, "middle", {}, void 0, true),
     createElementVNode("div", {
@@ -52974,9 +52975,7 @@ const _sfc_main$l = {
           }
         }
         this.$refs.table.loadData();
-        setTimeout(() => {
-          this.opened = true;
-        });
+        this.opened = true;
       });
     },
     async close() {

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

@@ -249,7 +249,7 @@ ${f}`:d)}},onCacheKey:c=>shared$1.generateFormatCacheKey(r,o,c)}}function getMes
                   @binding {string} code \u5217\u4EE3\u7801\r
               `),require$$0.renderSlot(a.$slots,"column",{filter:l.data,column:D,code:D.code})],64)):D.controlType==="Label"?(require$$0.openBlock(),require$$0.createElementBlock("div",_hoisted_2$f,[require$$0.createElementVNode("div",null,require$$0.toDisplayString(a.showData(l.data,D)),1)])):D.controlType==="TextInput"?(require$$0.openBlock(),require$$0.createBlock(c,{key:2,size:"small",type:"text","model-value":u.parseFilterData(l.data,D),"onUpdate:modelValue":E=>u.setFilterData(l.data,D,E),onOnKeyup:r[0]||(r[0]=E=>u.onKeyup(E)),style:require$$0.normalizeStyle({width:D.controlWidth==null?null:D.controlWidth+"px"}),placeholder:D.description},null,8,["model-value","onUpdate:modelValue","style","placeholder"])):D.controlType==="NumberInput"?(require$$0.openBlock(),require$$0.createBlock(c,{key:3,size:"small",type:"number",number:"","model-value":u.parseFilterData(l.data,D),"onUpdate:modelValue":E=>u.setFilterData(l.data,D,E),onOnKeyup:r[1]||(r[1]=E=>u.onKeyup(E)),style:require$$0.normalizeStyle({width:D.controlWidth==null?"100px":D.controlWidth+"px"}),placeholder:D.description},null,8,["model-value","onUpdate:modelValue","style","placeholder"])):D.controlType==="Select"?(require$$0.openBlock(),require$$0.createBlock(f,{key:4,size:"small","model-value":u.parseFilterData(l.data,D),"onUpdate:modelValue":E=>u.setFilterData(l.data,D,E),clearable:"",style:require$$0.normalizeStyle({width:D.controlWidth==null?null:D.controlWidth+"px"}),placeholder:D.description,transfer:!0,onOnChange:E=>u.onSelectDataChange(D,E)},{default:require$$0.withCtx(()=>[(require$$0.openBlock(!0),require$$0.createElementBlock(require$$0.Fragment,null,require$$0.renderList(u.getDataSource(l.data,D),E=>(require$$0.openBlock(),require$$0.createBlock(d,{key:E.id,value:E.id},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(E.name),1)]),_:2},1032,["value"]))),128))]),_:2},1032,["model-value","onUpdate:modelValue","style","placeholder","onOnChange"])):D.controlType==="MultiSelect"?(require$$0.openBlock(),require$$0.createBlock(f,{key:5,size:"small","model-value":u.parseArrayFilterData(l.data,D),multiple:!0,clearable:"","onUpdate:modelValue":E=>u.setArrayFilterData(l.data,D,E),style:require$$0.normalizeStyle({width:D.controlWidth==null?null:D.controlWidth+"px"}),placeholder:D.description,transfer:!0,onOnChange:E=>u.onSelectDataChange(D,E)},{default:require$$0.withCtx(()=>[(require$$0.openBlock(!0),require$$0.createElementBlock(require$$0.Fragment,null,require$$0.renderList(u.getDataSource(l.data,D),E=>(require$$0.openBlock(),require$$0.createBlock(d,{key:E.id,value:E.id},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(E.name),1)]),_:2},1032,["value"]))),128))]),_:2},1032,["model-value","onUpdate:modelValue","style","placeholder","onOnChange"])):D.controlType==="TreeSelect"?(require$$0.openBlock(),require$$0.createBlock(h,{key:6,size:"small","model-value":u.parseTreeFilterData(l.data,D),"onUpdate:modelValue":E=>u.setFilterData(l.data,D,E),data:u.getDataSource(l.data,D),clearable:!0,style:require$$0.normalizeStyle({width:D.controlWidth==null?null:D.controlWidth+"px"}),placeholder:D.description,transfer:!0,onOnChange:E=>u.onSelectDataChange(D,E)},null,8,["model-value","onUpdate:modelValue","data","style","placeholder","onOnChange"])):D.controlType==="MultiTreeSelect"?(require$$0.openBlock(),require$$0.createBlock(h,{key:7,size:"small","model-value":u.parseArrayFilterData(l.data,D),"onUpdate:modelValue":E=>u.setArrayFilterData(l.data,D,E),data:u.getDataSource(l.data,D),multiple:!0,"show-checkbox":!0,clearable:!0,style:require$$0.normalizeStyle({width:D.controlWidth==null?null:D.controlWidth+"px"}),placeholder:D.description,transfer:!0,onOnChange:E=>u.onSelectDataChange(D,E)},null,8,["model-value","onUpdate:modelValue","data","style","placeholder","onOnChange"])):D.controlType==="SelectWithOther"?(require$$0.openBlock(),require$$0.createElementBlock(require$$0.Fragment,{key:8},[require$$0.createVNode(f,{size:"small","model-value":u.parseFilterDataWithOther(l.data,D),"onUpdate:modelValue":E=>u.setFilterDataWithOther(l.data,D,E),clearable:"",style:require$$0.normalizeStyle({width:D.controlWidth==null?"40%":D.controlWidth+"px"}),placeholder:D.description,transfer:!0,onOnChange:E=>u.onSelectDataChange(D,E)},{default:require$$0.withCtx(()=>[(require$$0.openBlock(!0),require$$0.createElementBlock(require$$0.Fragment,null,require$$0.renderList(u.getDataSource(l.data,D),E=>(require$$0.openBlock(),require$$0.createBlock(d,{key:E.id,value:E.id},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(E.name),1)]),_:2},1032,["value"]))),128)),require$$0.createVNode(d,{key:"__Other",value:"__Other"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Label_Others")),1)]),_:1})]),_:2},1032,["model-value","onUpdate:modelValue","style","placeholder","onOnChange"]),require$$0.withDirectives(require$$0.createVNode(c,{type:"text",size:"small","model-value":u.parseFilterData(l.data,D),"onUpdate:modelValue":E=>u.setFilterData(l.data,D,E),style:require$$0.normalizeStyle([{width:D.controlWidth==null?"40%":D.controlWidth+"px"},{"margin-left":"4px"}]),maxlength:D.maxLength,placeholder:D.description,onOnChange:E=>u.onDataChange(D)},null,8,["model-value","onUpdate:modelValue","style","maxlength","placeholder","onOnChange"]),[[require$$0.vShow,u.parseFilterDataWithOther(l.data,D)=="__Other"]])],64)):D.controlType==="ComboSelect"?(require$$0.openBlock(),require$$0.createBlock(f,{key:9,size:"small","model-value":u.parseFilterData(l.data,D),"onUpdate:modelValue":E=>u.setFilterData(l.data,D,E),clearable:"",filterable:"",style:require$$0.normalizeStyle({width:D.controlWidth==null?null:D.controlWidth+"px"}),placeholder:D.description,transfer:!0,onOnChange:E=>u.onSelectDataChange(D,E)},{default:require$$0.withCtx(()=>[(require$$0.openBlock(!0),require$$0.createElementBlock(require$$0.Fragment,null,require$$0.renderList(u.getDataSource(l.data,D),E=>(require$$0.openBlock(),require$$0.createBlock(d,{key:E.id,value:E.id},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(E.name),1)]),_:2},1032,["value"]))),128))]),_:2},1032,["model-value","onUpdate:modelValue","style","placeholder","onOnChange"])):D.controlType==="DialogSelect"?(require$$0.openBlock(),require$$0.createBlock(p,{key:10,size:"small","model-value":u.parseFilterData(l.data,D),"onUpdate:modelValue":E=>u.setFilterData(l.data,D,E),source:D.source,"source-data-code":D.sourceDataCode,"source-display-code":D.sourceDisplayCode,param:a.getParam(l.data,D),controlWidth:D.controlWidth,onOnChange:E=>u.onSelectDataChange(D,E)},null,8,["model-value","onUpdate:modelValue","source","source-data-code","source-display-code","param","controlWidth","onOnChange"])):D.controlType==="Date"||D.controlType==="DateTime"||D.controlType==="Year"||D.controlType==="Month"||D.controlType==="DateRange"?(require$$0.openBlock(),require$$0.createBlock(v,{key:11,size:"small",type:D.controlType.toLowerCase(),"model-value":u.parseFilterData(l.data,D),placeholder:D.description,transfer:!0,style:require$$0.normalizeStyle({width:D.controlWidth==null?null:D.controlWidth+"px"}),onOnChange:E=>{u.setFilterData(l.data,D,E),u.onDataChange(D)}},null,8,["type","model-value","placeholder","style","onOnChange"])):D.controlType==="Time"?(require$$0.openBlock(),require$$0.createBlock(g,{key:12,size:"small",type:"time","model-value":u.parseFilterData(l.data,D),"onUpdate:modelValue":E=>u.setFilterData(l.data,D,E),placeholder:D.description,transfer:!0,style:require$$0.normalizeStyle({width:D.controlWidth==null?null:D.controlWidth+"px"}),onOnChange:E=>u.onDataChange(D)},null,8,["model-value","onUpdate:modelValue","placeholder","style","onOnChange"])):D.controlType==="Check"?(require$$0.openBlock(),require$$0.createBlock(y,{key:13,size:"small",style:{"line-height":"26px"},"model-value":!!u.parseFilterData(l.data,D),"onUpdate:modelValue":E=>u.setFilterData(l.data,D,E),onOnChange:E=>u.onDataChange(D)},null,8,["model-value","onUpdate:modelValue","onOnChange"])):D.controlType==="Switch"?(require$$0.openBlock(),require$$0.createElementBlock("div",_hoisted_3$d,[require$$0.createVNode($,{size:"small","model-value":!!u.parseFilterData(l.data,D),"onUpdate:modelValue":E=>u.setFilterData(l.data,D,E),onOnChange:E=>u.onDataChange(D)},null,8,["model-value","onUpdate:modelValue","onOnChange"])])):D.controlType==="Radio"?(require$$0.openBlock(),require$$0.createBlock(C,{key:15,size:"small",style:{"line-height":"22px"},"model-value":u.parseFilterData(l.data,D),"onUpdate:modelValue":E=>u.setFilterData(l.data,D,E),onOnChange:E=>u.onSelectDataChange(D,E)},{default:require$$0.withCtx(()=>[(require$$0.openBlock(!0),require$$0.createElementBlock(require$$0.Fragment,null,require$$0.renderList(u.getDataSource(l.data,D),E=>(require$$0.openBlock(),require$$0.createBlock(_,{key:E.id,label:E.id},{default:require$$0.withCtx(()=>[require$$0.createElementVNode("span",null,require$$0.toDisplayString(E.name),1)]),_:2},1032,["label"]))),128))]),_:2},1032,["model-value","onUpdate:modelValue","onOnChange"])):(require$$0.openBlock(),require$$0.createElementBlock(require$$0.Fragment,{key:16},[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Label_Control_Type_Not_Supported"))+" "+require$$0.toDisplayString(D.controlType),1)],64))]),_:2},1032,["label"])):require$$0.createCommentVNode("v-if",!0)],64)):require$$0.createCommentVNode("v-if",!0)]),_:2},1040))),128)),o.tableView.keywordEnable?(require$$0.openBlock(),require$$0.createBlock(w,require$$0.normalizeProps(require$$0.mergeProps({key:0},a.grid6)),{default:require$$0.withCtx(()=>[require$$0.createVNode(b,{label:a.$t("Front_Label_Keyword")},{default:require$$0.withCtx(()=>[require$$0.withDirectives(require$$0.createVNode(c,{modelValue:l.data.keyword,"onUpdate:modelValue":r[2]||(r[2]=D=>l.data.keyword=D),onOnKeyup:r[3]||(r[3]=D=>u.onKeyup(D)),size:"small"},null,8,["modelValue"]),[[x]])]),_:1},8,["label"])]),_:1},16)):require$$0.createCommentVNode("v-if",!0)])}var tableFilter=_export_sfc(_sfc_main$r,[["render",_sfc_render$r],["__file","D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/table-filter.vue"]]),viewTable_vue_vue_type_style_index_0_scoped_true_lang="",getColumns=(a,r)=>{let o=a.viewColumns.filter(s=>s.parentCode==r.code);if(o.length>0)return{...r,title:r.name,renderHeader:(s,l)=>s("span",{innerHTML:l.column.name.replace("|","<br/>")}),key:r.code,align:r.align?r.align.toLowerCase():"center",children:o.length>0?o.map(s=>getColumns(a,s)):null};{let s={},l=localStorage.getItem("columnWidth_"+a.dataView.code);return l&&(s=JSON.parse(l)),{...r,title:r.name,renderHeader:(u,c)=>u("span",{innerHTML:c.column.name.replace("|","<br/>")}),key:r.code,dataType:r.dataType,format:r.displayFormat,width:s[r.code]?s[r.code]:r.controlWidth,minWidth:100,align:r.align?r.align.toLowerCase():"center",sortable:!a.dataView.sortDisable&&!r.sortDisable?"custom":!1,resizable:!0,slot:"normal"}}};const _sfc_main$q={mixins:[mixin$1,mixinPage],components:{tableFilter,tableSetting:TableSetting,filterSetting},data(){return{inited:!1,size:10,orderBy:null,tableView:{},columns:[],viewFilter:{},filterColumns:[],data:[],staticData:[],selectedData:[],current:1,total:0,setting:!1,dialogActive:!1,tableSettingActive:!1,filterSettingActive:!1,itemSelectActive:!1,commandButtons:[],preview:!1,imageUrl:null,isFullScreen:!1,commandButtonParams:null}},async created(){this.viewCode&&setTimeout(async()=>{await this.init(this.viewCode),this.$emit("after-init")}),this.viewCode&&this.autoLoad&&this.loadData()},activated(){},props:{title:{type:String},viewCode:{type:String},readonly:{type:Boolean,default:!1},embedded:{type:Boolean,default:!1},parentData:{type:Object,default(){return{}}},static:{type:Boolean,default:!1},filter:{type:Object,default(){return{}}},settingEnable:{type:Boolean,default:!0},autoLoad:{type:Boolean,default:!0},selectEnable:{type:Boolean,default:!1},checkCrossPage:{type:Boolean,default:!1},treeEnable:{type:Boolean,default:!1},treeLoad:{type:Function},hasChildren:{type:Function},height:{type:Number,default:null},createEnable:{type:Boolean,default:!0},editEnable:{type:Boolean,default:!0},removeEnable:{type:Boolean,default:!0},draggable:{type:Boolean,default:!1},filterEnable:{type:Boolean,default:!0},pageEnable:{type:Boolean,default:!0},filterDisable:{type:Boolean,default:!1},beforeLoadData:{type:Function},onSearch:{type:Function},summaryMethod:{type:Function},pageSizeOpts:{type:Array},spanMethod:{type:Function},loadDataEnable:{type:Boolean,default:!0},rowClassName:{type:Function}},computed:{maxHeight(){if(this.height==null){let a=1;return Setting.layout.autoFixRatio==!0&&window.screen.width<1920&&window.screen.width*window.devicePixelRatio<=1920&&!navigator.userAgent.match(/AppleWebKit.*Mobile.*/)&&!navigator.userAgent.match(/.*Android.*/)&&(a=1/window.devicePixelRatio),this.isFullScreen?document.body.offsetHeight/a-100-this.$refs.filterCommand.offsetHeight/a:document.body.offsetHeight/a-350}else return this.height},filterData(){return this.$refs.tableFilter?this.$refs.tableFilter.data:null}},watch:{},methods:{...mapActions("admin/dataView",{loadDataView:"load"}),async init(a,r,o){let s=await this.loadDataView(a);if(s&&!s.isExist&&a.indexOf("_")>=0&&(s=await this.loadDataView(a.split("_")[0])),s!=null){if(!s.isExist){typeof o=="function"?o():this.error("Front_Msg_View_Code_Not_Exist|"+a);return}if(this.tableView=s.dataView,this.tableView.columns=s.viewColumns,this.tableView.filterColumns=s.filterColumns,this.filterColumns=s.filterColumns,(this.tableView.commandButton||"").trim()?this.commandButtons=JSON.parse(this.tableView.commandButton):this.commandButtons=[],this.$emit("on-ready",this.tableView),this.columns=s.viewColumns.filter(l=>!(l.parentCode||"").trim()).map(l=>getColumns(s,l)),this.columns.forEach(l=>{l.name=this.getNameI18n(l),l.fixed=l.isFixed?"left":null}),this.tableView.snEnable&&this.columns.unshift({title:" ",slot:"sn",align:"center",width:60}),this.tableView.commandEnable){let l={title:" ",slot:"command",align:"center",width:this.embedded&&!this.tableView.commandWidth?60:this.tableView.commandWidth==null?90:(this.tableView.commandWidth+1)*28,fixed:"right"};this.embedded&&this.tableView.batchSelectEnable&&this.createEnable&&!this.readonly?(l.renderHeader=u=>u("div",{},[u(require$$0.resolveComponent("Button"),{type:"primary",shape:"circle",icon:"md-checkmark-circle-outline",size:"small",style:{height:"20px",width:"20px"},onClick:()=>{this.openSelectItem()}})]),this.itemSelectActive=!0,setTimeout(()=>{this.$refs.itemSelect.init(this.tableView.batchSelectDataModel+"Source",this.tableView.batchSelectDataModel+"Target")})):this.embedded&&this.tableView.createEnable&&this.createEnable&&!this.readonly&&(l.renderHeader=u=>u("div",{},[u(require$$0.resolveComponent("Button"),{type:"primary",shape:"circle",icon:"md-add",size:"small",style:{height:"20px",width:"20px"},onClick:()=>{this.addNew()}})])),this.columns.push(l)}if((this.selectEnable||this.tableView.checkEnable)&&this.columns.unshift({type:"selection",align:"center",width:60}),this.treeEnable&&this.columns.unshift({tree:!0,display:"inline",align:"left",width:100}),this.tableView.size?this.size=this.tableView.size:this.tableView.pageEnable&&this.pageEnable?this.size=Setting.layout.pageSize:this.size=1e3,this.tableView.sorting){let l=JSON.parse(this.tableView.sorting),u=[];for(let c in l)l[c]==="desc"?u.push("-"+c):u.push("+"+c);this.orderBy=u.join(",")}else this.orderBy=null;if(this.tableView.filtering){let l=JSON.parse(this.tableView.filtering);for(let u in l)this.viewFilter[u]=l[u]}else this.viewFilter={};this.tableView.keywordEnable&&!!(this.tableView.keywordColumn||"").trim()?this.viewFilter.keywordColumns=this.tableView.keywordColumn:this.viewFilter.keywordColumns=null,this.selectedData=[],this.inited=!0,this.initTrigger(),setTimeout(()=>{typeof r=="function"&&r()})}},async loadData(a){if(!this.loadDataEnable){this.total=0,this.data=[];return}if(!(!this.inited&&(await this.init(this.viewCode),!this.inited))){if(typeof this.beforeLoadData=="function"&&this.beforeLoadData(),a&&(this.staticData=this.copy(a)),this.static){let r=this.getFilterResult();this.total=r.length;let o=(this.current-1)*this.size;this.data=o+this.size>=r.length?r.slice(o,r.length):r.slice(o,o+this.size)}else{let r={...this.getAllFilter(),page:this.current,per:this.size,orderBy:this.orderBy};if(this.tableView.isGroupBy&&(r.isGroupBy=!0,r.groupColumn=JSON.parse(this.tableView.groupColumn),r.groupMethod=JSON.parse(this.tableView.groupMethod)),this.tableView.isCustom){let o=await customModelApi.query(this.tableView.model,r);this.total=o.totalCount,this.data=o.data}else if(this.tableView.isDataSource){let o=await dataSourceApi.query(this.tableView.dataSource,r);this.total=o.totalCount,this.data=o.table}else{let o=await modelApi.query(this.tableView.model,r,this.tableView.functionName,this.tableView.functionType);this.total=o.totalCount,this.data=o.data}if(this.tableView.isDynamicColumn&&(this.columns=this.columns.filter(o=>o.slot!="normal"),this.data.length>0)){let o=0;for(const s in this.data[0])this.columns.push({name:s,title:s,code:s,key:"column_"+o,dataType:"String",align:"center",slot:"normal",controlType:"Label",isShow:!0});o++}this.current>Math.ceil(this.total/this.size)&&(this.current=Math.ceil(this.total/this.size)),this.current<=0&&(this.current=1),this.checkCrossPage||this.tableView.checkCrossPage?this.data.forEach(o=>{o._checked=this.selectedData.some(s=>o.id===s.id)}):this.selectedData=[]}this.data.forEach(r=>{this.setShowStatus(r)}),this.treeEnable&&(this.data.forEach(r=>{(this.hasChildren==null||this.hasChildren(r))&&(r._loading=!1,r.children=[])}),this.data=this.copy(this.data)),this.initDataSource();for(let r=0;r<this.data.length;r++)this.calc(this.data[r]);this.$emit("on-load-data"),this.$refs.tableFilter}},create(){this.$emit("create")},edit(a,r){this.$emit("edit",{row:a,index:r})},remove(a,r){this.confirm("Front_Msg_Sure_To_Delete_Item",async()=>{this.embedded?(this.staticData.splice((this.current-1)*this.size+r,1),this.loadData(),this.$emit("on-change",a)):(this.tableView.isCustom?await customModelApi.remove(this.tableView.model,a.id):await modelApi.remove(this.tableView.model,a.id),this.success("Front_Msg_Success",()=>{this.loadData()}))})},getDefaultData(){let a={};return this.columns.forEach(r=>{if(r.defaultValue)if(r.defaultValue=="{today}"){let s=new Date().toISOString().replace(/T.*/,"");this.setData(a,r.code,new Date(s))}else if(r.defaultValue.startsWith("{today(")&&r.defaultValue.endsWith(")}")){let o=r.defaultValue.substr(7,r.defaultValue.length-9);this.setData(a,r.code,format$3(new Date,o))}else r.defaultValue=="{currentUserID}"?this.setData(a,r.code,this.info.id):r.defaultValue=="{currentUser}"?this.setData(a,r.code,this.info.name):r.dataType==="Integer"?this.setData(a,r.code,parseInt(r.defaultValue)):r.dataType==="Decimal"?this.setData(a,r.code,parseFloat(r.defaultValue)):r.dataType==="Boolean"&&r.defaultValue.toUpperCase=="TRUE"?this.setData(a,r.code,!0):r.dataType==="Boolean"&&r.defaultValue.toUpperCase=="FALSE"?this.setData(a,r.code,!1):this.setData(a,r.code,r.defaultValue);else r.dataType==="Boolean"?this.setData(a,r.code,!1):this.setData(a,r.code,null)}),a},addNew(){this.staticData.push(this.getDefaultData()),this.loadData()},getSelected(){return this.selectedData},setSelected(a){this.selectedData=[],a.forEach(r=>{this.selectedData.push(r)}),this.static?(this.staticData.forEach(r=>{r._checked=this.selectedData.some(o=>r.id===o.id)}),this.loadData()):this.data.forEach(r=>{r._checked=this.selectedData.some(o=>r.id===o.id)}),this.data=this.copy(this.data)},validate(){for(let a=0;a<this.staticData.length;a++){let r=this.staticData[a];for(let o=0;o<this.columns.length;o++){let s=this.columns[o];if(r._isShow&&r._isShow[s.code]==!1)continue;if(s.isShow==!1)continue;let l=s.isRequired;if((s.requiredJson||"").trim()){let u=JSON.parse(s.requiredJson);(u.type=="Condition"||u.type=="Expression")&&(l=this.judgeCondition(u,r))}if(l){let u=this.parseData(r,s.code);if(u==null||!(String(u)||"").trim())return this.error("Front_Msg_Row_Column_Required|"+(a+1)+"|"+s.name),!1}}}return!0},getData(){let a=null;return this.static?a=this.copy(this.staticData):a=this.copy(this.data),a.forEach(r=>{delete r._checked,delete r._dataSource,delete r._needRefresh,delete r._needClear,delete r._rawData}),a},resetFilter(){for(let a in this.filterData)delete this.filterData[a]},search(){typeof this.onSearch=="function"?this.onSearch():this.loadData()},async moreClick(a){!this.inited&&(await this.init(this.viewCode),!this.inited)||(this.static?a==="exportExcel"?dataViewApi.exportExcel(this.tableView,this.staticData,this.columns.filter(r=>r.slot=="normal")):a==="exportPdf"?dataViewApi.exportPdf(this.tableView,this.staticData,this.columns.filter(r=>r.slot=="normal")):a==="print"?dataViewApi.print(this.tableView,this.staticData,this.columns.filter(r=>r.slot=="normal")):a==="batchEdit"&&this.error("Front_Msg_Not_Supported"):a==="exportExcel"?this.exportExcel():a==="exportPdf"?this.exportPdf():a==="print"?this.print():a==="batchEdit"&&this.$refs.batchEditTable.init(this.tableView.batchEditView,async()=>{let r;this.tableView.isCustom?r=await customModelApi.query(this.tableView.model,{}):r=await modelApi.query(this.tableView.model,{}),this.$refs.batchEditTable.loadData(r.data),this.$refs.batchEditTable.open()}))},exportExcel(){let a={...this.getAllFilter(),orderBy:this.orderBy};this.tableView.isCustom?customModelApi.exportExcel(this.tableView,a):this.tableView.isDataSource?dataSourceApi.exportExcel(this.tableView,a):modelApi.exportExcel(this.tableView,a)},exportPdf(){let a={...this.getAllFilter(),orderBy:this.orderBy};this.tableView.isCustom?customModelApi.exportPdf(this.tableView,a):this.tableView.isDataSource?dataSourceApi.exportPdf(this.tableView,a):modelApi.exportPdf(this.tableView,a)},print(){let a={...this.getAllFilter(),orderBy:this.orderBy};this.tableView.isCustom?customModelApi.printList(this.tableView,a):this.tableView.isDataSource?dataSourceApi.printList(this.tableView,a):modelApi.printList(this.tableView,a)},initDataSource(){this.columns.forEach(a=>{(a.controlType=="Select"||a.controlType=="SelectWithOther"||a.controlType=="ComboSelect"||a.controlType=="MultiSelect"||a.controlType=="Radio"||a.controlType=="CheckGroup")&&(a.isStaticItem?this.data.forEach(r=>{if(!r._dataSource)r._dataSource={},r._rawData={},r._needRefresh={},r._needClear={};else if(r._dataSource[a.code])return;r._dataSource[a.code]=[],r._rawData[a.code]=[],(a.itemData||"").trim()&&a.itemData.split(/[\n]/).forEach(o=>{if((o||"").trim())if(o.split(":").length>1){let s=o.split(":")[0],l=o.split(":")[1];r._dataSource[a.code].push({id:s,name:l})}else r._dataSource[a.code].push({id:o,name:o})})}):!!(a.source||"").trim()&&!(a.dataType&&a.dataType.startsWith("Enum:"))&&this.data.forEach(r=>{if(r._dataSource&&r._dataSource[a.code])return;let o=this.getParam(r,a,this.parentData);o!=null&&this.fillDataSource(r,a,o)}))})},initTrigger(){this.columns.forEach(a=>{a.triggers=[]}),this.columns.filter(a=>!a.isStaticItem&&!!(a.source||"").trim()&&!!(a.param||"").trim()&&!(a.dataType&&a.dataType.startsWith("Enum:"))).forEach(a=>{let r=JSON.parse(a.param);for(let o in r)this.columns.filter(s=>r[o]==s.code||r[o].split(".")[0]+"ID"==s.code).forEach(s=>{s.triggers.push(this.copy(a))})})},async fillDataSource(a,r,o){a._dataSource||(a._dataSource={},a._rawData={},a._needRefresh={},a._needClear={});let s;if(r.isSourceCustom?s=await customModelApi.query(r.source,o):s=await modelApi.query(r.source,o),a._rawData[r.code]=s.data,a._dataSource[r.code]=s.data.map(l=>({id:(r.sourceDataCode||"").trim()?this.parseData(l,r.sourceDataCode):l.id,name:this.parseData(l,r.sourceDisplayCode)})),a&&this.parseData(a,r.code)==null&&r.isDefaultFirst&&s.data.length>0&&(this.setData(a,r.code,this.parseData(s.data[0],r.sourceDataCode)),r.sourceDataCode=="id"&&r.code.length>2)){let l=r.code.substr(0,r.code.length-2);if(a._rawData&&a._rawData[r.code]){let u=a._rawData[r.code].find(c=>c.id==this.parseData(a,r.code));this.setData(a,l,u)}}this.data=this.data.map(l=>l),this.onDataChange(a,r)},getDataSource(a,r){if(!r.isStaticItem&&r.dataType.indexOf("Enum:")===0)return this.getEnumList(r.dataType.split(":")[1]);if(a._dataSource!=null&&a._dataSource[r.code]!=null)return a._dataSource[r.code]},pageSizeChange(a){this.size=a,this.loadData()},sortChange({key:a,order:r}){let o=[];this.orderBy&&(o=this.orderBy.split(",")),o=o.filter(s=>s.substring(1)!==a),r==="asc"?o.unshift("+"+a):r==="desc"&&o.unshift("-"+a),this.orderBy=o.join(","),this.loadData()},columnWidthResize(a,r,o,s){let l={},u=localStorage.getItem("columnWidth_"+this.tableView.code);u&&(l=JSON.parse(u)),l[o.code]=a,localStorage.setItem("columnWidth_"+this.tableView.code,JSON.stringify(l))},onSelectDataChange(a,r,o){let s;r.code.endsWith("ID")&&(s=r.code.substr(0,r.code.length-2));let l=null;if(typeof o=="object")if(o instanceof Array){l=[];for(let u of o)typeof u=="object"?l.push(u):a._rawData&&a._rawData[r.code]?l.push(a._rawData[r.code].find(c=>this.parseData(c,r.sourceDataCode)==u)):l.push(u)}else l=o;else a._rawData&&a._rawData[r.code]?l=a._rawData[r.code].find(u=>this.parseData(u,r.sourceDataCode)==o):l=o;s&&this.setData(a,s,l),this.onDataChange(a,r,l)},onDataChange(a,r,o){for(this.setShowStatus(a),this.calc(a,r),this.$emit("on-change",a,r,o),(r==null||r.triggers!==[])&&this.columns.forEach(function(s){!s.isStaticItem&&!!(s.source||"").trim()&&!(s.dataType&&s.dataType.startsWith("Enum:"))&&(r==null||r.triggers.some(l=>l.code==s.code))&&a._needRefresh&&(a._needRefresh[s.code]=!0)});;){let s=this.columns.filter(l=>a._needRefresh&&a._needRefresh[l.code]==!0||a._needClear&&a._needClear[l.code]==!0)[0];if(s==null)break;if(a._needClear[s.code]&&this.parseData(a,s.code)!=null)this.setData(a,s.code,null),s.triggers.forEach(l=>{a._needClear[l.code]=!0});else if(a._needRefresh[s.code]&&!!(s.source||"").trim()&&!(s.dataType&&s.dataType.startsWith("Enum:"))){let l=this.getParam(a,s,this.parentData);s.controlType==="Select"||s.controlType==="SelectWithOther"||s.controlType==="ComboSelect"||s.controlType==="MulitSelect"||s.controlType==="Radio"||s.controlType==="CheckGroup"?l!=null?this.fillDataSource(a,s,l):(a._dataSource[s.code]=[],this.setData(a,s.code,null),s.triggers.forEach(u=>{a._needClear[u.code]=!0})):(s.controlType==="DialogSelect"||s.controlType==="MultiDialogSelect")&&l==null&&(this.setData(a,s.code,null),s.triggers.forEach(u=>{a._needClear[u.code]=!0}))}a._needClear[s.code]=!1,a._needRefresh[s.code]=!1}},calc(a,r){for(let o=0;o<this.columns.length;o++){let s=this.columns[o];if((s.calculate||"").trim()){let l=this.getTriggers(s.calculate);if(!r||l.some(u=>u==r.code)){let u=this.calculate(s.calculate,a);s.digit!=null&&(u=this.keepDecimal(u,s.digit,s.fixedDigit)),this.setData(a,s.code,u)}}}},onBlur(a,r){this.$emit("on-blur",a,r)},tableSettingOpen(){this.tableSettingActive=!0,setTimeout(()=>{this.$refs.tableSetting.open(this.tableView,this.copy(this.tableView.columns))})},filterSettingOpen(){this.filterSettingActive=!0,setTimeout(()=>{this.$refs.filterSetting.open(this.tableView,this.copy(this.tableView.filterColumns))})},onSelectionChange(a){this.getDataWithChildren(this.data).forEach(o=>{const s=this.selectedData.findIndex(l=>l.id==o.id);a.some(l=>l.id==o.id)?s==-1&&this.selectedData.push(o):s!=-1&&this.selectedData.splice(s,1)}),this.$emit("on-select-change")},onKeyup(a){if(a){var r=window.event?a.keyCode:a.which;if(!r||r!==0&&r!==1&&r!==13)return}this.search()},getAllFilter(){var r;let a={...this.viewFilter,...(r=this.filterData)!=null?r:{}};for(let o in a)typeof a[o]=="object"&&!(a[o]instanceof Date)&&delete a[o];return a},getFilterResult(){let a=this.staticData;if(!this.filterDisable){let r=this.filterData;for(let o in r){let s=o,l=r[o];l==null||l==""||this.filterColumns.some(u=>u.code==o&&u.operator=="Custom")||typeof l=="object"&&!(l instanceof Date)||s!="keywordColumns"&&(a=a.filter(u=>{if((s.startsWith("d_")||s.startsWith("m_")||s.startsWith("y_"))&&(s=s.substr(2)),s=="keyword"){let c=r.keywordColumns.split(",");for(let d=0;d<c.length;d++){let f=c[d];if(this.parseData(u,f)!=null&&this.parseData(u,f).indexOf(l)>=0)return!0}return!1}else if(s.endsWith("_g")){let c=s.substr(0,s.length-2);return l instanceof Date?new Date(this.parseData(u,c))>l:this.parseData(u,c)>l}else if(s.endsWith("_l")){let c=s.substr(0,s.length-2);return l instanceof Date?new Date(this.parseData(u,c))<l:this.parseData(u,c)<l}else if(s.endsWith("_ge")){let c=s.substr(0,s.length-3);return l instanceof Date?new Date(this.parseData(u,c))>=l:this.parseData(u,c)>=l}else if(s.endsWith("_le")){let c=s.substr(0,s.length-3);return l instanceof Date?new Date(this.parseData(u,c))<=l:this.parseData(u,c)<=l}else if(s.endsWith("_n")){let c=s.substr(0,s.length-2);if(typeof l=="string"){for(let d=0;d<l.split(",").length;d++)if(this.parseData(u,c)!=l.split(",")[d])return!0;return!1}else return l instanceof Date?new Date(this.parseData(u,c))!=l:this.parseData(u,c)!=l}else if(s.endsWith("_c")){let c=s.substr(0,s.length-2);return this.parseData(u,c)!=null&&this.parseData(u,c).indexOf(l)>=0}else{let c=s;if(typeof l=="string"){for(let d=0;d<l.split(",").length;d++)if(this.parseData(u,c)==l.split(",")[d])return!0;return!1}else return l instanceof Date?new Date(this.parseData(u,c))==l:this.parseData(u,c)==l}}))}}if((this.orderBy||"").trim()){let r=this.orderBy.split(",")[0],o=r.substr(0,1),s=r.substr(1);a.sort((l,u)=>{let c=this.parseData(l,s),d=this.parseData(u,s);return c==d?0:c>d||d==null?o=="+"?1:-1:o=="+"?-1:1})}return a},async onLoadData(a,r){if(this.treeLoad!=null){let o=await this.treeLoad(a);o.forEach(s=>{(this.hasChildren==null||this.hasChildren(s))&&(s._loading=!1,s.children=[])}),r(o)}},dragDrop(a,r){this.$emit("on-drag-drop",{index1:a,index2:r})},openSelectItem(){let a=[],r=this.tableView.batchSelectDataCode,o=r.substr(0,r.length-2);for(let s=0;s<this.staticData.length;s++)a.push(this.staticData[s][o]);this.$refs.itemSelect.setSelected(a),this.$refs.itemSelect.open()},saveItemSelect(){let a=this.$refs.itemSelect.getSelected(),r=this.tableView.batchSelectDataCode,o=r.substr(0,r.length-2);this.staticData=this.staticData.filter(s=>a.some(l=>l.id==s[r]));for(let s=0;s<a.length;s++)if(!this.staticData.some(l=>l[r]==a[s].id)){let l={};l[r]=a[s].id,l[o]=a[s],this.staticData.push(l)}this.loadData(this.staticData),this.$refs.itemSelect.close()},clickCommandButton(a,r){r.viewType=="TableView"?this.$refs.modalTable.init(r.viewCode,async()=>{if((r.formViewCode||"").trim()&&this.$refs.modalForm.init(r.formViewCode),this.commandButtonParams={},(r.params||"").trim()){let o=JSON.parse(r.params);for(let s=0;s<o.length;s++){let l=this.parseData(a,o[s].value);this.commandButtonParams[o[s].param]=l}}this.$refs.modalTable.open(this.commandButtonParams)}):this.$refs.modalForm.init(r.formViewCode,async()=>{this.$refs.modalForm.open(a)})},previewImage(a){this.imageUrl=a,this.preview=!0},handleSpan({row:a,column:r,rowIndex:o,columnIndex:s}){if(this.spanMethod!=null)return this.spanMethod(a,r,o,s);if(r.mergeSame){if(o!=0&&this.parseData(a,r.code)==this.parseData(this.data[o-1],r.code))return[0,0];let l=0;for(let u=o;u<this.data.length;u++)if(this.parseData(a,r.code)==this.parseData(this.data[u],r.code))l++;else return[l,1];return[l,1]}},judge(a,r,o){if((r||"").trim()){let s=JSON.parse(r);if(s.type=="Condition"||s.type=="Expression")return this.judgeCondition(s,o)}return a},isShow(a,r){return a._isShow!=null&&a._isShow[r.code]!=null?a._isShow[r.code]:r.isShow},isReadonly(a,r){return this.readonly==!0?!0:a._isReadonly!=null&&a._isReadonly[r.code]!=null?a._isReadonly[r.code]:r.isReadonly},batchSave(){!this.$refs.batchEditTable.validate()||this.confirm("Front_Msg_Sure_To_Save",async()=>{let a=this.$refs.batchEditTable.data;this.tableView.isCustom?await customModelApi.batchSave(this.tableView.model,a):await modelApi.batchSave(this.tableView.model,a),this.success("Front_Msg_Success",()=>{this.$refs.batchEditTable.close(),this.loadData()})})},rowData(a,r){return this.treeEnable?a:this.data[r]},getDataWithChildren(a){let r=[];return a.forEach(o=>{r.push(o),o.children&&(r=r.concat(this.getDataWithChildren(o.children)))}),r},setShowStatus(a){for(let r of this.columns){if((r.showJson||"").trim()){a._isShow==null&&(a._isShow={});let o=JSON.parse(r.showJson);(o.type=="Condition"||o.type=="Expression")&&(a._isShow[r.code]=this.judgeCondition(o,a))}if((r.readonlyJson||"").trim()){a._isReadonly==null&&(a._isReadonly={});let o=JSON.parse(r.readonlyJson);(o.type=="Condition"||o.type=="Expression")&&(a._isReadonly[r.code]=this.judgeCondition(o,a))}}},getNameI18n(a){if(a)if(this.layout.showI18n){if(a.code){let r="DataView_"+this.tableView.code+"_"+a.code,o=this.$t(r);return o==r?a.name:o}}else return a.name},up(a,r){let o=this.staticData;if(r>0){o.splice(r,1),o.splice(r-1,0,a);for(let s of o)delete s.id;this.loadData(o)}},down(a,r){let o=this.staticData;if(r<o.length-1){o.splice(r,1),o.splice(r+1,0,a);for(let s of o)delete s.id;this.loadData(o)}},clear(){this.staticData=[],this.data=[]},parseDataWithOther(a,r){let o=r.code,s=this.parseData(a,o+"_o"),l=this.parseData(a,o),u=this.getDataSource(a,r);return s!=null?s:l==null?null:u&&u.some(c=>c.id==l)?l:"__Other"},setDataWithOther(a,r,o){this.setData(a,r+"_o",o),o!="__Other"?this.setData(a,r,o):this.setData(a,r,null)},getJustify(a){return a=="Left"?"start":a=="Center"?"center":(a=="Right","end")}}},_hoisted_1$g={class:"title"},_hoisted_2$e={ref:"filterCommand"},_hoisted_3$c=["title","innerHTML"],_hoisted_4$6=["href","target"],_hoisted_5$4=["innerHTML"],_hoisted_6$3={key:11,style:{display:"flex"}},_hoisted_7$3=["href"],_hoisted_8$3={style:{margin:"auto 4px"}},_hoisted_9$2=["onClick","src"],_hoisted_10$2={class:"ivu-mt ivu-text-right"},_hoisted_11$1={style:{"text-align":"center"}},_hoisted_12$1=["download"],_hoisted_13$1=["src"];function _sfc_render$q(a,r,o,s,l,u){const c=require$$0.resolveComponent("Divider"),d=require$$0.resolveComponent("table-filter"),f=require$$0.resolveComponent("Button"),h=require$$0.resolveComponent("Icon"),p=require$$0.resolveComponent("DropdownItem"),v=require$$0.resolveComponent("DropdownMenu"),g=require$$0.resolveComponent("Dropdown"),y=require$$0.resolveComponent("FormItem"),$=require$$0.resolveComponent("Col"),_=require$$0.resolveComponent("Row"),C=require$$0.resolveComponent("Form"),b=require$$0.resolveComponent("Input"),w=require$$0.resolveComponent("Option"),x=require$$0.resolveComponent("Select"),D=require$$0.resolveComponent("dialog-select"),A=require$$0.resolveComponent("DatePicker"),E=require$$0.resolveComponent("TimePicker"),P=require$$0.resolveComponent("Checkbox"),O=require$$0.resolveComponent("Switch"),N=require$$0.resolveComponent("Radio"),M=require$$0.resolveComponent("RadioGroup"),R=require$$0.resolveComponent("CheckboxGroup"),L=require$$0.resolveComponent("Slider"),B=require$$0.resolveComponent("Table"),q=require$$0.resolveComponent("Page"),H=require$$0.resolveComponent("modal-table"),F=require$$0.resolveComponent("table-setting"),X=require$$0.resolveComponent("filter-setting"),J=require$$0.resolveComponent("item-select"),ie=require$$0.resolveComponent("modal-form"),de=require$$0.resolveComponent("Modal");return require$$0.openBlock(),require$$0.createElementBlock("div",{class:require$$0.normalizeClass({"full-screen":l.isFullScreen})},[o.title!=null?(require$$0.openBlock(),require$$0.createBlock(c,{key:0,plain:!0,dashed:"",orientation:"left",size:"small"},{default:require$$0.withCtx(()=>[require$$0.createElementVNode("span",_hoisted_1$g,require$$0.toDisplayString(o.title),1)]),_:1})):require$$0.createCommentVNode("v-if",!0),require$$0.createCommentVNode(`\r
         @slot \u9876\u90E8\r
-    `),require$$0.renderSlot(a.$slots,"top",{},void 0,!0),l.tableView.filterEnable&&o.filterEnable?(require$$0.openBlock(),require$$0.createBlock(C,{key:1,model:o.filter,"label-width":l.tableView.filterTitleWidth?l.tableView.filterTitleWidth:a.layout.filterWidth,"label-colon":"\uFF1A","label-position":"right",class:"filter",onSubmit:r[3]||(r[3]=require$$0.withModifiers(()=>{},["prevent"]))},{default:require$$0.withCtx(()=>[require$$0.createElementVNode("div",_hoisted_2$e,[require$$0.createVNode(_,{gutter:24,type:"flex",justify:u.getJustify(l.tableView.filterAlign)},{default:require$$0.withCtx(()=>[require$$0.createCommentVNode(`\r
+    `),require$$0.renderSlot(a.$slots,"top",{},void 0,!0),require$$0.withDirectives(require$$0.createVNode(C,{model:o.filter,"label-width":l.tableView.filterTitleWidth?l.tableView.filterTitleWidth:a.layout.filterWidth,"label-colon":"\uFF1A","label-position":"right",class:"filter",onSubmit:r[3]||(r[3]=require$$0.withModifiers(()=>{},["prevent"]))},{default:require$$0.withCtx(()=>[require$$0.createElementVNode("div",_hoisted_2$e,[require$$0.createVNode(_,{gutter:24,type:"flex",justify:u.getJustify(l.tableView.filterAlign)},{default:require$$0.withCtx(()=>[require$$0.createCommentVNode(`\r
             @slot \u7B5B\u9009\u680F\r
             @binding {object} table \u8868\u683C\u5BF9\u8C61\r
             @binding {object} filter \u7B5B\u9009\u5BF9\u8C61\r
@@ -262,7 +262,7 @@ ${f}`:d)}},onCacheKey:c=>shared$1.generateFormatCacheKey(r,o,c)}}function getMes
                   @binding {string} code \u5217\u4EE3\u7801\r
               `),require$$0.renderSlot(a.$slots,"filterColumn",{column:Z,code:Z.code},void 0,!0)]),_:3},8,["filter","columns","table-view","onOnKeyup"]),require$$0.createVNode($,require$$0.mergeProps(a.getGrid(l.tableView.filterWidth),{style:{"text-align":l.tableView.filterAlign==null?"left":l.tableView.filterAlign.toLowerCase()}}),{default:require$$0.withCtx(()=>[require$$0.createVNode(y,{"label-width":0},{default:require$$0.withCtx(()=>[l.tableView.keywordEnable||l.filterColumns.length>0?(require$$0.openBlock(),require$$0.createBlock(f,{key:0,type:"info","custom-icon":"fa fa-search",onClick:r[0]||(r[0]=Z=>u.search()),size:"small"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Search")),1)]),_:1})):require$$0.createCommentVNode("v-if",!0),l.tableView.createEnable&&o.createEnable?(require$$0.openBlock(),require$$0.createBlock(f,{key:1,type:"primary","custom-icon":"fa fa-plus",onClick:r[1]||(r[1]=Z=>u.create()),size:"small"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_New")),1)]),_:1})):require$$0.createCommentVNode("v-if",!0),require$$0.createCommentVNode(`\r
                   @slot \u7B5B\u9009\u680F\u6309\u94AE\r
-              `),require$$0.renderSlot(a.$slots,"filterCommand",{},void 0,!0),l.tableView.exportEnable||l.tableView.exportPdfEnable||l.tableView.printEnable||l.tableView.batchEditEnable?(require$$0.openBlock(),require$$0.createBlock(g,{key:2,onOnClick:u.moreClick},{list:require$$0.withCtx(()=>[require$$0.createVNode(v,null,{default:require$$0.withCtx(()=>[l.tableView.exportEnable?(require$$0.openBlock(),require$$0.createBlock(p,{key:0,name:"exportExcel"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Export_Excel")),1)]),_:1})):require$$0.createCommentVNode("v-if",!0),l.tableView.exportPdfEnable?(require$$0.openBlock(),require$$0.createBlock(p,{key:1,name:"exportPdf"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Export_PDF")),1)]),_:1})):require$$0.createCommentVNode("v-if",!0),l.tableView.printEnable?(require$$0.openBlock(),require$$0.createBlock(p,{key:2,name:"print"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Print")),1)]),_:1})):require$$0.createCommentVNode("v-if",!0),l.tableView.batchEditEnable?(require$$0.openBlock(),require$$0.createBlock(p,{key:3,name:"batchEdit"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Batch_Edit")),1)]),_:1})):require$$0.createCommentVNode("v-if",!0)]),_:1})]),default:require$$0.withCtx(()=>[require$$0.createVNode(f,{type:"info",size:"small"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_More"))+" ",1),require$$0.createVNode(h,{type:"ios-arrow-down"})]),_:1})]),_:1},8,["onOnClick"])):require$$0.createCommentVNode("v-if",!0),o.settingEnable&&a.allow("permission/tableView")?(require$$0.openBlock(),require$$0.createBlock(f,{key:3,type:"error",title:a.$t("Front_Btn_Filter_Setting"),"custom-icon":"fa fa-filter",size:"small",onClick:u.filterSettingOpen},null,8,["title","onClick"])):require$$0.createCommentVNode("v-if",!0),l.tableView.fullEnable?(require$$0.openBlock(),require$$0.createBlock(f,{key:4,type:"info",title:"\u5168\u5C4F","custom-icon":"fa fa-expand-arrows-alt",size:"small",onClick:r[2]||(r[2]=Z=>l.isFullScreen=!l.isFullScreen)})):require$$0.createCommentVNode("v-if",!0)]),_:3})]),_:3},16,["style"])],!0)]),_:3},8,["justify"])],512)]),_:3},8,["model","label-width"])):require$$0.createCommentVNode("v-if",!0),require$$0.createCommentVNode(`\r
+              `),require$$0.renderSlot(a.$slots,"filterCommand",{},void 0,!0),l.tableView.exportEnable||l.tableView.exportPdfEnable||l.tableView.printEnable||l.tableView.batchEditEnable?(require$$0.openBlock(),require$$0.createBlock(g,{key:2,onOnClick:u.moreClick},{list:require$$0.withCtx(()=>[require$$0.createVNode(v,null,{default:require$$0.withCtx(()=>[l.tableView.exportEnable?(require$$0.openBlock(),require$$0.createBlock(p,{key:0,name:"exportExcel"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Export_Excel")),1)]),_:1})):require$$0.createCommentVNode("v-if",!0),l.tableView.exportPdfEnable?(require$$0.openBlock(),require$$0.createBlock(p,{key:1,name:"exportPdf"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Export_PDF")),1)]),_:1})):require$$0.createCommentVNode("v-if",!0),l.tableView.printEnable?(require$$0.openBlock(),require$$0.createBlock(p,{key:2,name:"print"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Print")),1)]),_:1})):require$$0.createCommentVNode("v-if",!0),l.tableView.batchEditEnable?(require$$0.openBlock(),require$$0.createBlock(p,{key:3,name:"batchEdit"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_Batch_Edit")),1)]),_:1})):require$$0.createCommentVNode("v-if",!0)]),_:1})]),default:require$$0.withCtx(()=>[require$$0.createVNode(f,{type:"info",size:"small"},{default:require$$0.withCtx(()=>[require$$0.createTextVNode(require$$0.toDisplayString(a.$t("Front_Btn_More"))+" ",1),require$$0.createVNode(h,{type:"ios-arrow-down"})]),_:1})]),_:1},8,["onOnClick"])):require$$0.createCommentVNode("v-if",!0),o.settingEnable&&a.allow("permission/tableView")?(require$$0.openBlock(),require$$0.createBlock(f,{key:3,type:"error",title:a.$t("Front_Btn_Filter_Setting"),"custom-icon":"fa fa-filter",size:"small",onClick:u.filterSettingOpen},null,8,["title","onClick"])):require$$0.createCommentVNode("v-if",!0),l.tableView.fullEnable?(require$$0.openBlock(),require$$0.createBlock(f,{key:4,type:"info",title:"\u5168\u5C4F","custom-icon":"fa fa-expand-arrows-alt",size:"small",onClick:r[2]||(r[2]=Z=>l.isFullScreen=!l.isFullScreen)})):require$$0.createCommentVNode("v-if",!0)]),_:3})]),_:3},16,["style"])],!0)]),_:3},8,["justify"])],512)]),_:3},8,["model","label-width"]),[[require$$0.vShow,l.tableView.filterEnable&&o.filterEnable]]),require$$0.createCommentVNode(`\r
         @slot \u4E2D\u90E8\r
     `),require$$0.renderSlot(a.$slots,"middle",{},void 0,!0),require$$0.createElementVNode("div",{class:require$$0.normalizeClass({"i-table-no-border":!l.tableView.borderEnable})},[require$$0.createVNode(B,{class:"",ref:"table",size:"small",stripe:"","row-key":"id","indent-size":18,"update-show-children":o.treeEnable,columns:l.columns,data:l.data,"max-height":u.maxHeight,"load-data":u.onLoadData,draggable:o.draggable,sticky:!0,"span-method":u.handleSpan,border:l.tableView.borderEnable,"show-summary":l.tableView.showSummary,"summary-method":o.summaryMethod,"page-size-opts":o.pageSizeOpts,"row-class-name":o.rowClassName,onOnColumnWidthResize:u.columnWidthResize,onOnSortChange:u.sortChange,onOnSelectionChange:u.onSelectionChange,onOnDragDrop:u.dragDrop},{normal:require$$0.withCtx(({row:Z,column:W,index:ee})=>[u.isShow(u.rowData(Z,ee),W)?(require$$0.openBlock(),require$$0.createElementBlock(require$$0.Fragment,{key:0},[W.controlType==="Custom"?(require$$0.openBlock(),require$$0.createElementBlock(require$$0.Fragment,{key:0},[require$$0.createCommentVNode(`\r
                 @slot \u81EA\u5B9A\u4E49\u5217\r
@@ -340,7 +340,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
             `),require$$0.renderSlot(a.$slots,"tableCommand",{table:v.table,tableColumn:v.tableColumn,tableCode:v.tableCode,row:v.row,index:v.index})]),bottom:require$$0.withCtx(({form:v})=>[require$$0.createCommentVNode(`\r
                 @slot \u5E95\u90E8\r
                 @binding {object} form \u8868\u5355\u5BF9\u8C61\r
-            `),require$$0.renderSlot(a.$slots,"bottom",{form:v})]),_:3},8,["view-code","readonly","defaultData","setting-enable","onOnChange","onOnReady"])])]),_:3},8,["modelValue","mask-closable","draggable","width","before-close","onOnVisibleChange"]),l.settingActive?(require$$0.openBlock(),require$$0.createBlock(h,{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(p,{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,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(),setTimeout(()=>{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("view-table"),d=require$$0.resolveComponent("Modal");return require$$0.openBlock(),require$$0.createBlock(d,{ref:"modal",modelValue:l.opened,"onUpdate:modelValue":r[0]||(r[0]=f=>l.opened=f),scrollable:"","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:v})]),_:3},8,["view-code","readonly","defaultData","setting-enable","onOnChange","onOnReady"])])]),_:3},8,["modelValue","mask-closable","draggable","width","before-close","onOnVisibleChange"]),l.settingActive?(require$$0.openBlock(),require$$0.createBlock(h,{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(p,{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,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("view-table"),d=require$$0.resolveComponent("Modal");return require$$0.openBlock(),require$$0.createBlock(d,{ref:"modal",modelValue:l.opened,"onUpdate:modelValue":r[0]||(r[0]=f=>l.opened=f),scrollable:"","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)])])]),footer:require$$0.withCtx(()=>[require$$0.createElementVNode("div",null,[require$$0.createCommentVNode(`\r
           @slot \u9875\u811A\r

package/package.json

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

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

@@ -389,9 +389,7 @@
 
           this.$refs.table.loadData();
 
-          setTimeout(() => {
-            this.opened = true;
-          });
+          this.opened = true;
         });
       },
       /**

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

@@ -8,7 +8,7 @@
     -->
     <slot name="top"></slot>
     <Form
-      v-if="tableView.filterEnable && filterEnable"
+      v-show="tableView.filterEnable && filterEnable"
       :model="filter"
       :label-width="tableView.filterTitleWidth ? tableView.filterTitleWidth : layout.filterWidth"
       label-colon="："