sone-ui-component-3.2.4 2.1.28 → 2.1.30

package/lib/sone-ui.common.js

@@ -33618,12 +33618,12 @@ table_src_main.install = function(Vue) {
 
 /* harmony default export */ var table = (table_src_main);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"de981356-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/normalTable/src/main.vue?vue&type=template&id=fc334838&
-var mainvue_type_template_id_fc334838_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"sone_table_box"},[(_vm.showMenuLeft)?_c('div',{staticClass:"table-menu-left"},[_vm._t("menuLeft")],2):_vm._e(),(_vm.showMenuRight)?_c('div',{staticClass:"table-menu-right"},[_vm._t("menuRight"),(_vm.showColumnHandleBtn)?_c('el-dropdown',{attrs:{"hide-on-click":false},on:{"visible-change":_vm.onColumnVisibleMenu}},[_c('IconButton',{staticClass:"sort-btn",attrs:{"iconfont":false,"tooltipDisabled":_vm.tooltipDisabled,"content":"列展示","icon":"el-icon-s-operation"}}),_c('ColumnTransfer',{ref:"column-transfer",attrs:{"columns":_vm.internalColumns},on:{"update:columns":function($event){_vm.internalColumns=$event},"dropdownList":_vm.dropdownList,"handleCheckedColumnChange":_vm.handleCheckedColumnChange,"selectFixed":_vm.selectFixed,"resetColumnTransfer":function($event){return _vm.$emit('resetColumnTransfer')}}})],1):_vm._e(),_vm._t("transferRight")],2):_vm._e(),(_vm.isTable)?_c('el-table',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"}],ref:_vm.tabelRef,class:'sone-table ' + _vm.className,staticStyle:{"width":"100%"},attrs:{"cell-class-name":_vm.option.cellClassName,"cell-style":_vm.option.cellStyle,"data":_vm.tableData,"header-cell-class-name":_vm.option.headerCellClassName,"header-cell-style":_vm.option.headerCellStyle,"header-row-class-name":_vm.option.headerRowClassName,"header-row-style":_vm.option.headerRowStyle,"height":_vm.option.height,"highlight-current-row":_vm.option.highlightRow,"max-height":_vm.option.maxHeight,"row-class-name":_vm.tableRowClassName,"row-key":_vm.option.rowKey,"row-style":_vm.option.rowStyle,"show-summary":_vm.option.showSummary,"render-header":_vm.option.renderHeader,"span-method":_vm.spanMethod,"show-header":_vm.showHeader,"stripe":_vm.stripe,"border":_vm.border,"sum-text":_vm.option.sumText,"summary-method":_vm.summaryMethod},on:{"filter-change":_vm.filterChange,"row-click":_vm.rowClick,"header-dragend":_vm.onHeaderDragend,"select":_vm.selectChange,"select-all":_vm.selectAll}},[(_vm.operation)?_c('el-table-column',{attrs:{"fixed":"","type":"index","width":_vm.operation.width,"label":_vm.operation.label ? _vm.operation.label : '操作',"resizable":_vm.operation.hasOwnProperty('resizable') ? _vm.operation.resizable : true},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [(scope.row.buttonShow)?_c('el-dropdown',{staticClass:"dropdown_box_button sone-table-buttonList"},[_c('span',{directives:[{name:"show",rawName:"v-show",value:(scope.row.buttonShow.filter(function (d){ return d.isShow; }).length > 0),expression:"scope.row.buttonShow.filter(d=>d.isShow).length > 0"}],staticClass:"el-dropdown-link color-span menu-more"},[_c('el-button',{attrs:{"type":"text"}},[_c('i',{staticClass:"el-icon-more more-handel",style:({color:_vm.operation.moreIconColor})})])],1),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},_vm._l((scope.row.buttonShow.filter(function (d){ return d.isShow; })),function(item,i){return _c('el-dropdown-item',{key:i,staticClass:"sone-table-dropdown",attrs:{"command":"copy"}},[_c('el-button',{style:({color:_vm.operation.buttonList.find(function (d){ return d.id===item.id; }).color}),attrs:{"icon":_vm.operation.buttonList.find(function (d){ return d.id===item.id; }).icon,"disabled":item.hasOwnProperty('isDisabled') ? item.isDisabled : false,"type":"text","title":_vm.operation.buttonList.find(function (d){ return d.id === item.id; }).label},nativeOn:{"click":function($event){$event.stopPropagation();_vm.handButton(_vm.operation.buttonList.find(function (d){ return d.id===item.id; }).function, scope, item.id)}}},[_vm._v(_vm._s(_vm.operation.buttonList.find(function (d){ return d.id===item.id; }).label))])],1)}),1)],1):_c('el-dropdown',{staticClass:"dropdown_box_button sone-table-buttonList",on:{"command":function($event){$event.stopPropagation();return (function (command){_vm.handleCommand(command,_vm.row)}).apply(null, arguments)}}},[_c('span',{directives:[{name:"show",rawName:"v-show",value:(_vm.operation.buttonList.length > 0),expression:"operation.buttonList.length > 0"}],staticClass:"el-dropdown-link color-span menu-more"},[_c('el-button',{attrs:{"type":"text"}},[_c('i',{staticClass:"el-icon-more more-handel",style:({color:_vm.operation.moreIconColor})})])],1),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},_vm._l((_vm.operation.buttonList),function(item,i){return _c('el-dropdown-item',{key:i,staticClass:"sone-table-dropdown",attrs:{"command":"copy"}},[_c('el-button',{style:({color:item.color}),attrs:{"icon":item.icon,"title":item.label,"type":"text"},nativeOn:{"click":function($event){$event.stopPropagation();return _vm.handButton(item.function, scope, item.id)}}},[_vm._v(_vm._s(item.label))])],1)}),1)],1)]}}],null,false,1578741255)}):_vm._e(),(_vm.option.index)?_c('el-table-column',{attrs:{"fixed":"","type":"index","width":_vm.option.indexWidth||50,"label":_vm.option.indexLabel ? _vm.option.indexLabel : '序号',"index":_vm.indexMethod}}):_vm._e(),(_vm.option.selection)?_c('el-table-column',{attrs:{"fixed":"","type":"selection","show-overflow-tooltip":false,"width":_vm.option.selectionWidth || 45}}):_vm._e(),_vm._l((_vm.internalColumns),function(column,index){return [(column.slot && column.istrue)?_vm._t(column.slot):(column.hasOwnProperty('istrue')?column.istrue:true)?_c('el-table-column',{key:("col_" + (column.prop) + "_" + (column.label)),attrs:{"filter-method":column.filters ? _vm.filterHandler : null,"filters":column.filters,"fixed":column.fixed,"label":column.label,"min-width":column.minWidth,"prop":column.prop,"width":column.width,"align":column.hasOwnProperty('align') ? column.align : 'left',"show-overflow-tooltip":column.hasOwnProperty('showOverflowTooltip') ? column.showOverflowTooltip : false,"filter-placement":"bottom-end","header-align":column.hasOwnProperty('headerAlign') ? column.headerAlign : 'left',"column-key":column.hasOwnProperty('elementId')? column.elementId:column.prop,"resizable":column.hasOwnProperty('resizable') ? column.resizable : true},scopedSlots:_vm._u([{key:"header",fn:function(scope){return [(column.slotColumnHeader && _vm.isShow)?_vm._t(column.slotColumnHeader,null,{"header":{column: scope.column, $index:scope.$index }}):_vm._e(),(!column.slotColumnHeader && _vm.isShow)?[_c('div',{staticClass:"slot_header_class"},[(column.isRequire)?_c('span',{staticClass:"table-header-isRequire"},[_vm._v("*")]):_vm._e(),_c('span',[_vm._v(_vm._s(column.label))]),_c('span',{staticClass:"hide"},[(column.headerDescribe)?_c('i',{staticClass:"iconfont icon-help icon_describe",attrs:{"title":column.headerDescribe}}):_vm._e(),(column.headerFilterSort)?_c('span',{staticClass:"caret-wrapper",class:{ 'ascending': _vm.sortVal === column.prop + 'ascending', 'descending': _vm.sortVal === column.prop + 'descending' }},[_c('i',{staticClass:"sort-caret ascending",attrs:{"title":"升序"},on:{"click":function($event){return _vm.handleCommand(column.prop, index, { command: 'ascending' })}}}),_c('i',{staticClass:"sort-caret descending",attrs:{"title":"降序"},on:{"click":function($event){return _vm.handleCommand(column.prop, index, { command: 'descending' })}}})]):_vm._e()])])]:_vm._e()]}},{key:"default",fn:function(scope){return [(column.slotCell)?_vm._t(column.slotCell,null,{"index":scope.$index,"row":scope.row}):[_vm._v(_vm._s(scope.row[column.prop]))]]}}],null,true)}):_vm._e()]})],2):_vm._e(),(_vm.page && _vm.page.total > 0)?_c('div',{staticClass:"pagination-box"},[_c('el-pagination',{attrs:{"current-page":_vm.page.current,"layout":_vm.page.layout ? _vm.page.layout : 'total, sizes, prev, pager, next, jumper',"page-size":_vm.page.size,"page-sizes":_vm.page.pageSizes,"total":_vm.page.total,"page-count":_vm.page.pageCount,"pager-count":_vm.page.pagerCount,"background":""},on:{"current-change":_vm.currentChange,"size-change":_vm.sizeChange}})],1):_vm._e()],1)}
-var mainvue_type_template_id_fc334838_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"de981356-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/normalTable/src/mainNew.vue?vue&type=template&id=de639d46&
+var mainNewvue_type_template_id_de639d46_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"sone_table_box"},[(_vm.showMenuLeft)?_c('div',{staticClass:"table-menu-left"},[_vm._t("menuLeft")],2):_vm._e(),(_vm.showMenuRight)?_c('div',{staticClass:"table-menu-right"},[_vm._t("menuRight"),(_vm.showColumnHandleBtn)?_c('el-dropdown',{attrs:{"trigger":"click","hide-on-click":false}},[_c('IconButton',{staticClass:"sort-btn",attrs:{"iconfont":false,"tooltipDisabled":_vm.tooltipDisabled,"content":"列展示","icon":"el-icon-s-operation"}}),_c('ColumnTransfer',{ref:"column-transfer",attrs:{"columns":_vm.internalColumns},on:{"update:columns":function($event){_vm.internalColumns=$event},"save":_vm.save,"resetColumnTransfer":function($event){return _vm.$emit('resetColumnTransfer')}}})],1):_vm._e(),_vm._t("transferRight")],2):_vm._e(),(_vm.isTable)?_c('el-table',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"}],ref:_vm.tabelRef,class:'sone-table ' + _vm.className,staticStyle:{"width":"100%"},attrs:{"cell-class-name":_vm.option.cellClassName,"cell-style":_vm.option.cellStyle,"data":_vm.tableData,"header-cell-class-name":_vm.option.headerCellClassName,"header-cell-style":_vm.option.headerCellStyle,"header-row-class-name":_vm.option.headerRowClassName,"header-row-style":_vm.option.headerRowStyle,"height":_vm.option.height,"highlight-current-row":_vm.option.highlightRow,"max-height":_vm.option.maxHeight,"row-class-name":_vm.tableRowClassName,"row-key":_vm.option.rowKey,"row-style":_vm.option.rowStyle,"show-summary":_vm.option.showSummary,"render-header":_vm.option.renderHeader,"span-method":_vm.spanMethod,"show-header":_vm.showHeader,"stripe":_vm.stripe,"border":_vm.border,"sum-text":_vm.option.sumText,"summary-method":_vm.summaryMethod},on:{"filter-change":_vm.filterChange,"row-click":_vm.rowClick,"header-dragend":_vm.onHeaderDragend,"select":_vm.selectChange,"select-all":_vm.selectAll}},[(_vm.operation)?_c('el-table-column',{attrs:{"fixed":"","type":"index","width":_vm.operation.width,"label":_vm.operation.label ? _vm.operation.label : '操作',"resizable":_vm.operation.hasOwnProperty('resizable') ? _vm.operation.resizable : true},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [(!_vm.hideButtonMode)?[(scope.row.buttonShow&&scope.row.buttonShow.filter(function (d){ return d.isShow; }).length<=3)?_c('div',{staticClass:"sone-table-buttonList"},[_vm._l((_vm.operation.buttonList),function(item,index){return [_c('el-tooltip',{directives:[{name:"show",rawName:"v-show",value:(scope.row.buttonShow.find(function (i){ return i.id===item.id; }).isShow),expression:"scope.row.buttonShow.find(i=>i.id===item.id).isShow"}],key:index,attrs:{"content":item.label,"effect":"light","placement":"top"}},[_c('el-button',{style:({color:item.color}),attrs:{"icon":item.icon,"disabled":scope.row.buttonShow.find(function (i){ return i.id===item.id; }).isDisabled || false,"circle":"","type":"text"},nativeOn:{"click":function($event){$event.stopPropagation();return _vm.handButton(item.function, scope, item.id)}}})],1)]})],2):_vm._e(),(!scope.row.buttonShow&&_vm.operation.buttonList.length<=3)?_c('div',{staticClass:"sone-table-buttonList"},[_vm._l((_vm.operation.buttonList),function(item,index){return [_c('el-tooltip',{key:index,attrs:{"content":item.label,"effect":"light","placement":"top"}},[_c('el-button',{style:({color:item.color}),attrs:{"icon":item.icon,"circle":"","type":"text"},nativeOn:{"click":function($event){$event.stopPropagation();return _vm.handButton(item.function,scope, item.id)}}})],1)]})],2):_vm._e()]:[(scope.row.buttonShow)?_c('el-dropdown',{staticClass:"dropdown_box_button sone-table-buttonList"},[_c('span',{directives:[{name:"show",rawName:"v-show",value:(scope.row.buttonShow.filter(function (d){ return d.isShow; }).length > 0),expression:"scope.row.buttonShow.filter(d=>d.isShow).length > 0"}],staticClass:"el-dropdown-link color-span menu-more"},[_c('el-button',{attrs:{"type":"text"}},[_c('i',{staticClass:"el-icon-more more-handel",style:({color:_vm.operation.moreIconColor})})])],1),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},_vm._l((scope.row.buttonShow.filter(function (d){ return d.isShow; })),function(item,i){return _c('el-dropdown-item',{key:i,staticClass:"sone-table-dropdown",attrs:{"command":"copy"}},[_c('el-button',{style:({color:_vm.operation.buttonList.find(function (d){ return d.id===item.id; }).color}),attrs:{"icon":_vm.operation.buttonList.find(function (d){ return d.id===item.id; }).icon,"disabled":item.hasOwnProperty('isDisabled') ? item.isDisabled : false,"type":"text","title":_vm.operation.buttonList.find(function (d){ return d.id === item.id; }).label},nativeOn:{"click":function($event){$event.stopPropagation();_vm.handButton(_vm.operation.buttonList.find(function (d){ return d.id===item.id; }).function, scope, item.id)}}},[_vm._v(_vm._s(_vm.operation.buttonList.find(function (d){ return d.id===item.id; }).label))])],1)}),1)],1):_c('el-dropdown',{staticClass:"dropdown_box_button sone-table-buttonList",on:{"command":function($event){$event.stopPropagation();return (function (command){_vm.handleCommand(command,_vm.row)}).apply(null, arguments)}}},[_c('span',{directives:[{name:"show",rawName:"v-show",value:(_vm.operation.buttonList.length > 0),expression:"operation.buttonList.length > 0"}],staticClass:"el-dropdown-link color-span menu-more"},[_c('el-button',{attrs:{"type":"text"}},[_c('i',{staticClass:"el-icon-more more-handel",style:({color:_vm.operation.moreIconColor})})])],1),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},_vm._l((_vm.operation.buttonList),function(item,i){return _c('el-dropdown-item',{key:i,staticClass:"sone-table-dropdown",attrs:{"command":"copy"}},[_c('el-button',{style:({color:item.color}),attrs:{"icon":item.icon,"title":item.label,"type":"text"},nativeOn:{"click":function($event){$event.stopPropagation();return _vm.handButton(item.function, scope, item.id)}}},[_vm._v(_vm._s(item.label))])],1)}),1)],1)]]}}],null,false,2049157449)}):_vm._e(),(_vm.option.index)?_c('el-table-column',{attrs:{"fixed":"","type":"index","width":_vm.option.indexWidth||50,"label":_vm.option.indexLabel ? _vm.option.indexLabel : '序号',"index":_vm.indexMethod}}):_vm._e(),(_vm.option.selection)?_c('el-table-column',{attrs:{"fixed":"","type":"selection","show-overflow-tooltip":false,"width":_vm.option.selectionWidth || 45}}):_vm._e(),_vm._l((_vm.internalColumns),function(column,index){return [(column.slot && column.istrue)?_vm._t(column.slot):(column.hasOwnProperty('istrue')?column.istrue:true)?_c('el-table-column',{key:("col_" + (column.prop) + "_" + (column.label)),attrs:{"filter-method":column.filters ? _vm.filterHandler : null,"filters":column.filters,"fixed":column.fixed,"label":column.label,"min-width":column.minWidth,"prop":column.prop,"width":column.width,"align":column.hasOwnProperty('align') ? column.align : 'left',"show-overflow-tooltip":column.hasOwnProperty('showOverflowTooltip') ? column.showOverflowTooltip : false,"filter-placement":"bottom-end","header-align":column.hasOwnProperty('headerAlign') ? column.headerAlign : 'left',"column-key":column.hasOwnProperty('elementId')? column.elementId:column.prop,"resizable":column.hasOwnProperty('resizable') ? column.resizable : true},scopedSlots:_vm._u([{key:"header",fn:function(scope){return [(column.slotColumnHeader && _vm.isShow)?_vm._t(column.slotColumnHeader,null,{"header":{column: scope.column, $index:scope.$index }}):_vm._e(),(!column.slotColumnHeader && _vm.isShow)?[_c('div',{staticClass:"slot_header_class"},[(column.isRequire)?_c('span',{staticClass:"table-header-isRequire"},[_vm._v("*")]):_vm._e(),_c('span',[_vm._v(_vm._s(column.label))]),_c('span',{staticClass:"hide"},[(column.headerDescribe)?_c('i',{staticClass:"iconfont icon-help icon_describe",attrs:{"title":column.headerDescribe}}):_vm._e(),(column.headerFilterSort)?_c('span',{staticClass:"caret-wrapper",class:{ 'ascending': _vm.sortVal === column.prop + 'ascending', 'descending': _vm.sortVal === column.prop + 'descending' }},[_c('i',{staticClass:"sort-caret ascending",attrs:{"title":"升序"},on:{"click":function($event){return _vm.handleCommand(column.prop, index, { command: 'ascending' })}}}),_c('i',{staticClass:"sort-caret descending",attrs:{"title":"降序"},on:{"click":function($event){return _vm.handleCommand(column.prop, index, { command: 'descending' })}}})]):_vm._e()])])]:_vm._e()]}},{key:"default",fn:function(scope){return [(column.slotCell)?_vm._t(column.slotCell,null,{"index":scope.$index,"row":scope.row}):[_vm._v(_vm._s(scope.row[column.prop]))]]}}],null,true)}):_vm._e()]})],2):_vm._e(),(_vm.page && _vm.page.total > 0)?_c('div',{staticClass:"pagination-box"},[_c('el-pagination',{attrs:{"current-page":_vm.page.current,"layout":_vm.page.layout ? _vm.page.layout : 'total, sizes, prev, pager, next, jumper',"page-size":_vm.page.size,"page-sizes":_vm.page.pageSizes,"total":_vm.page.total,"page-count":_vm.page.pageCount,"pager-count":_vm.page.pagerCount,"background":""},on:{"current-change":_vm.currentChange,"size-change":_vm.sizeChange}})],1):_vm._e()],1)}
+var mainNewvue_type_template_id_de639d46_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/normalTable/src/main.vue?vue&type=template&id=fc334838&
+// CONCATENATED MODULE: ./packages/normalTable/src/mainNew.vue?vue&type=template&id=de639d46&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"de981356-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/normalTable/src/columnTransfer.vue?vue&type=template&id=1726edc2&
 var columnTransfervue_type_template_id_1726edc2_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},[_c('div',{staticClass:"dropdown_box"},[_c('div',{staticClass:"dropdown_title"},[_c('el-checkbox',{attrs:{"indeterminate":_vm.isIndeterminate},on:{"change":_vm.handleColumnsCheckListChange},model:{value:(_vm.columnsCheckAll),callback:function ($$v) {_vm.columnsCheckAll=$$v},expression:"columnsCheckAll"}},[_vm._v("列展示")]),_c('el-tooltip',{attrs:{"effect":"light","content":"重置","placement":"top"}},[_c('el-button',{staticClass:"rigth_button",attrs:{"type":"text"},on:{"click":_vm.resetList}},[_vm._v("重置")])],1)],1),_c('div',{staticClass:"dropdown_content",class:[_vm.dragTarClass]},[_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.leftColumns.length),expression:"leftColumns.length"}]},[_c('p',{staticClass:"title"},[_vm._v("固定在左侧")]),_c('el-checkbox-group',{staticClass:"item1",on:{"change":_vm.handleCheckedColumnChange},model:{value:(_vm.columnsCheckList),callback:function ($$v) {_vm.columnsCheckList=$$v},expression:"columnsCheckList"}},_vm._l((_vm.leftColumns),function(item,index){return _c('div',{key:item.prop+'#'+item.istrue + index,staticClass:"hover_label"},[_c('label',{staticClass:"el-checkbox is-checked"},[_c('el-checkbox',{attrs:{"label":item.label}})],1),_c('span',{staticClass:"icon_display"},[_c('el-tooltip',{attrs:{"placement":"top","content":"不固定","effect":"light"}},[_c('i',{staticClass:"iconfont iconfont-action icon-close",on:{"click":function($event){return _vm.selectFixed(item,false)}}})]),_c('el-tooltip',{attrs:{"placement":"top","content":"固定在右侧","effect":"light"}},[_c('i',{staticClass:"iconfont iconfont-action icon-down1",on:{"click":function($event){return _vm.selectFixed(item,'right')}}})])],1)])}),0)],1),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.rightColumns.length),expression:"rightColumns.length"}]},[_c('p',{staticClass:"title"},[_vm._v("固定在右侧")]),_c('el-checkbox-group',{staticClass:"item2",on:{"change":_vm.handleCheckedColumnChange},model:{value:(_vm.columnsCheckList),callback:function ($$v) {_vm.columnsCheckList=$$v},expression:"columnsCheckList"}},_vm._l((_vm.rightColumns),function(item,index){return _c('div',{key:item.prop+'#'+item.istrue + index,staticClass:"hover_label"},[_c('label',{staticClass:"el-checkbox is-checked"},[_c('el-checkbox',{attrs:{"label":item.label}})],1),_c('span',{staticClass:"icon_display"},[_c('el-tooltip',{attrs:{"placement":"top","content":"不固定","effect":"light"}},[_c('i',{staticClass:"iconfont iconfont-action icon-close",on:{"click":function($event){return _vm.selectFixed(item, false)}}})]),_c('el-tooltip',{attrs:{"placement":"top","content":"固定在左侧","effect":"light"}},[_c('i',{staticClass:"iconfont iconfont-action icon-up1",on:{"click":function($event){return _vm.selectFixed(item,'left')}}})])],1)])}),0)],1),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.noColumns.length),expression:"noColumns.length"}]},[_c('p',{staticClass:"title"},[_vm._v("不固定")]),_c('el-checkbox-group',{staticClass:"item",on:{"change":_vm.handleCheckedColumnChange},model:{value:(_vm.columnsCheckList),callback:function ($$v) {_vm.columnsCheckList=$$v},expression:"columnsCheckList"}},_vm._l((_vm.noColumns),function(item,index){return _c('div',{key:item.prop+'#'+item.istrue + index,staticClass:"hover_label"},[_c('label',{staticClass:"el-checkbox is-checked"},[_c('el-checkbox',{attrs:{"label":item.label}})],1),_c('span',{staticClass:"icon_display"},[_c('el-tooltip',{attrs:{"placement":"top","content":"固定在左侧","effect":"light"}},[_c('i',{staticClass:"iconfont iconfont-action icon-up1",on:{"click":function($event){return _vm.selectFixed(item,'left')}}})]),_c('el-tooltip',{attrs:{"placement":"top","content":"固定在右侧","effect":"light"}},[_c('i',{staticClass:"iconfont iconfont-action icon-down1",on:{"click":function($event){return _vm.selectFixed(item,'right')}}})])],1)])}),0)],1)])])])],1)}
@@ -33968,7 +33968,37 @@ var src_columnTransfer_component = normalizeComponent(
 )
 
 /* harmony default export */ var src_columnTransfer = (src_columnTransfer_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/normalTable/src/main.vue?vue&type=script&lang=js&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/normalTable/src/mainNew.vue?vue&type=script&lang=js&
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -34180,7 +34210,7 @@ var src_columnTransfer_component = normalizeComponent(
 	
 	
 	
-	/* harmony default export */ var normalTable_src_mainvue_type_script_lang_js_ = ({
+	/* harmony default export */ var mainNewvue_type_script_lang_js_ = ({
 		name: "SoneNormalTable",
 		components: { ColumnTransfer: src_columnTransfer, IconButton: IconButton },
 		props: {
@@ -34300,54 +34330,8 @@ var src_columnTransfer_component = normalizeComponent(
 					this.internalColumns = deepClone(this.columns).filter(d => d && !d.isHidden);
 				}
 			},
-			internalColumns: {
-				deep: true,
-				handler() {
-					this.isShow = false
-					this.$nextTick(() => {  //不放在这里面会导致视图不刷新
-						this.isShow = true;
-					})
-					this.$refs[this.tabelRef] && this.$refs[this.tabelRef].doLayout();
-				}
-			},
 		},
 		methods: {
-			columnsCheckList(valArr) {
-				this.internalColumns.forEach(i => {
-					if (valArr.includes(i.label)) {
-						this.$set(i, 'istrue', true)
-					} else {
-						this.$set(i, 'istrue', false)
-					}
-				});
-				this.$nextTick(() => {
-					this.$refs[this.tabelRef] && this.$refs[this.tabelRef].doLayout();
-				});
-			},
-			selectFixed(items) {
-				this.internalColumns = deepClone(items);
-				this.$nextTick(() => {
-					this.$refs[this.tabelRef] && this.$refs[this.tabelRef].doLayout();
-				});
-
-			},
-			handleCheckedColumnChange(data, internalColumns) {
-				if(data){
-					this.columnsCheckList(data)
-				}
-				if(internalColumns && internalColumns.length){
-					this.$nextTick(() => {
-						this.internalColumns = deepClone(internalColumns);
-					});
-				}
-			},
-			dropdownList(itemset) {
-				this.internalColumns = deepClone(itemset);
-				this.isTable = false
-				this.$nextTick(() => {
-					this.isTable = true
-				})
-			},
 			// 下拉button
 			handleCommand(columnName, columnIndex, data) {
 				let tableData = deepClone(this.tableData)
@@ -34444,7 +34428,6 @@ var src_columnTransfer_component = normalizeComponent(
 				const property = column['property'];
 				return row[property] === value;
 			},
-
 			// class
 			tableRowClassName({ row, rowIndex }) {
 				if (this.option.rowClassName) {
@@ -34457,16 +34440,6 @@ var src_columnTransfer_component = normalizeComponent(
 			doLayout() {
 				this.$refs[this.tabelRef].doLayout();
 			},
-			/* 表格-列显隐-下拉菜单 */
-			onColumnVisibleMenu(flag){
-        let arr = [
-          ...this.$refs['column-transfer'].leftColumns, 
-          ...this.$refs['column-transfer'].noColumns,
-          ...this.$refs['column-transfer'].rightColumns
-        ]
-				// this.$emit('columnsVisibleMenu', flag, this.internalColumns );
-				this.$emit('columnsVisibleMenu', flag, arr );
-			},
 			/* 当拖动表头改变了列的宽度的时候会触发该事件 */
 			onHeaderDragend(newWidth, oldWidth, column, event){
 				let arr = [
@@ -34476,6 +34449,14 @@ var src_columnTransfer_component = normalizeComponent(
         ]
 				this.$emit('headerDragend', newWidth, oldWidth, column, arr, event);
 			},
+			save(arr){
+				this.internalColumns = deepClone(arr);
+				this.isTable = false
+				this.$nextTick(() => {
+					this.isTable = true
+				})
+				this.$emit('save', arr);
+			},
 			/* 用于单选表格，设定某一行为选中行，如果调用时不加参数，则会取消目前高亮行的选中状态。 */
 			setCurrentRow(row){
 				this.$refs[this.tabelRef] && this.$refs[this.tabelRef].setCurrentRow(row);
@@ -34484,9 +34465,9 @@ var src_columnTransfer_component = normalizeComponent(
 		},
 	});
 
-// CONCATENATED MODULE: ./packages/normalTable/src/main.vue?vue&type=script&lang=js&
- /* harmony default export */ var packages_normalTable_src_mainvue_type_script_lang_js_ = (normalTable_src_mainvue_type_script_lang_js_); 
-// CONCATENATED MODULE: ./packages/normalTable/src/main.vue
+// CONCATENATED MODULE: ./packages/normalTable/src/mainNew.vue?vue&type=script&lang=js&
+ /* harmony default export */ var src_mainNewvue_type_script_lang_js_ = (mainNewvue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./packages/normalTable/src/mainNew.vue
 
 
 
@@ -34494,10 +34475,10 @@ var src_columnTransfer_component = normalizeComponent(
 
 /* normalize component */
 
-var normalTable_src_main_component = normalizeComponent(
-  packages_normalTable_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_fc334838_render,
-  mainvue_type_template_id_fc334838_staticRenderFns,
+var mainNew_component = normalizeComponent(
+  src_mainNewvue_type_script_lang_js_,
+  mainNewvue_type_template_id_de639d46_render,
+  mainNewvue_type_template_id_de639d46_staticRenderFns,
   false,
   null,
   null,
@@ -34505,23 +34486,26 @@ var normalTable_src_main_component = normalizeComponent(
   
 )
 
-/* harmony default export */ var normalTable_src_main = (normalTable_src_main_component.exports);
+/* harmony default export */ var mainNew = (mainNew_component.exports);
 // CONCATENATED MODULE: ./packages/normalTable/index.js
 /*
- * @Description: 
+ * @Description:  
  * @Author: songlin
  * @Date: 2021-08-26 16:39:21
  * @LastEditTime: 2021-08-27 16:11:37
  * @LastEditors: songlin
  */
 
+//优化分支发版时packages\normalTable\index.js中请使用mainNew，非优化分支使用main
+// import Table from './src/main';  //原来的表格
+  //带保存的列显隐
 
-normalTable_src_main.install = function(Vue) {
-  Vue.component(normalTable_src_main.name, normalTable_src_main);
+mainNew.install = function(Vue) {
+  Vue.component(mainNew.name, mainNew);
 };
 
 
-/* harmony default export */ var normalTable = (normalTable_src_main);
+/* harmony default export */ var normalTable = (mainNew);
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"de981356-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/select/src/main.vue?vue&type=template&id=67f667d2&
 var mainvue_type_template_id_67f667d2_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-select',{staticClass:"sone-select",attrs:{"value":_vm.model,"placeholder":_vm.placeholder,"clearable":_vm.clearable,"multiple":_vm.multiple,"disabled":_vm.disabled,"collapse-tags":"","filterable":"","popper-class":_vm.popperClass,"popper-append-to-body":_vm.popperAppendToBody,"filter-method":_vm.onFilterOption},on:{"visible-change":_vm.handleVisible,"change":_vm.onChange,"clear":_vm.onClear,"remove-tag":_vm.onRemoveTag,"blur":function (e) { return _vm.$emit('blur', e); },"focus":function (e) { return _vm.$emit('focus', e); }}},[(_vm.type === 'normal')?[_vm._t("default",function(){return _vm._l((_vm.internalOptions),function(item){return _c('el-option',{key:item[_vm.props.value],attrs:{"label":item[_vm.props.label],"disabled":item[_vm.props.disabled],"value":item[_vm.props.value]}})})})]:(_vm.type === 'tree')?[_c('el-tree',{ref:"treeRef",staticClass:"sone-select-tree",attrs:{"data":_vm.internalOptions,"props":_vm.props,"node-key":_vm.props.value,"default-expand-all":"","default-checked-keys":_vm.checkedNodes,"show-checkbox":_vm.multiple,"check-strictly":_vm.checkStrictly,"expand-on-click-node":false,"highlight-current":false,"filter-node-method":_vm.onFilterNode},on:{"check":_vm.onCheckNode},scopedSlots:_vm._u([{key:"default",fn:function(ref){
@@ -37957,7 +37941,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = ({
-  version: '2.1.28',
+  version: '2.1.30',
   locale: locale.use,
   i18n: locale.i18n,
   install,