sone-ui-component-3.2.4 2.1.35 → 2.1.37

package/lib/sone-ui.common.js

@@ -27878,12 +27878,12 @@ mainNoDrag.install = function(Vue) {
 };
 
 /* harmony default export */ var packages_form = (mainNoDrag);
-// 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/dialog/src/main.vue?vue&type=template&id=8bc26af4&
-var mainvue_type_template_id_8bc26af4_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"sone-dialog",staticStyle:{"position":"relative"}},[_c('el-dialog',{directives:[{name:"dialogDrag",rawName:"v-dialogDrag"}],class:[_vm.dialogFullScreenState ? 'dialog-full-screen' : ''],attrs:{"before-close":_vm.handleClose,"modal":_vm.modal,"title":_vm.title,"close-on-click-modal":_vm.closeOnClickModal,"append-to-body":_vm.appendToBody,"top":'0',"visible":_vm.dialogVisible,"width":_vm.dialogSize,"custom-class":_vm.customClass},on:{"update:visible":function($event){_vm.dialogVisible=$event}},scopedSlots:_vm._u([{key:"title",fn:function(){return [_vm._t("title")]},proxy:true},{key:"default",fn:function(){return [_vm._t("default"),_vm._t("container"),(_vm.showDialogFullScreen)?_c('div',{staticClass:"dialog-full-screen-btn"},[(_vm.dialogFullScreenState)?[_c('el-tooltip',{attrs:{"effect":"light","content":"退出全屏","placement":"top"}},[_c('el-button',{attrs:{"type":"text","icon":"iconfont icon-fullscreen-exit"},on:{"click":function($event){$event.stopPropagation();return _vm.exitFullScreen.apply(null, arguments)}}})],1)]:[_c('el-tooltip',{attrs:{"effect":"light","content":"全屏","placement":"top"}},[_c('el-button',{attrs:{"type":"text","icon":"iconfont icon-fullscreen"},on:{"click":function($event){$event.stopPropagation();return _vm.fullScreen.apply(null, arguments)}}})],1)]],2):_vm._e()]},proxy:true},{key:"footer",fn:function(){return [(_vm.$slots.footer)?_c('div',{staticClass:"sone-dialog-custom-footer-wrapper"},[_vm._t("footer")],2):[(_vm.showFooter)?[_c('icon-button',{attrs:{"tooltipDisabled":_vm.tooltipDisabled,"content":_vm.cancel,"placement":"top","loading":_vm.loading,"icon":"el-icon-close","iconfont":false},on:{"click":_vm.handleClose}}),_c('icon-button',{attrs:{"tooltipDisabled":_vm.tooltipDisabled,"content":_vm.confirm,"placement":"top","loading":_vm.loading,"icon":"el-icon-check","type":"primary","iconfont":false},on:{"click":_vm.handleConfirm}})]:_vm._e()]]},proxy:true}],null,true)})],1)}
-var mainvue_type_template_id_8bc26af4_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/dialog/src/main.vue?vue&type=template&id=427cc793&
+var mainvue_type_template_id_427cc793_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"sone-dialog",staticStyle:{"position":"relative"}},[_c('el-dialog',{directives:[{name:"dialogDrag",rawName:"v-dialogDrag"}],class:[_vm.dialogFullScreenState ? 'dialog-full-screen' : ''],attrs:{"before-close":_vm.handleClose,"modal":_vm.modal,"title":_vm.title,"close-on-click-modal":_vm.closeOnClickModal,"append-to-body":_vm.appendToBody,"top":'0',"visible":_vm.dialogVisible,"width":_vm.dialogSize,"custom-class":_vm.customClass},on:{"update:visible":function($event){_vm.dialogVisible=$event}},scopedSlots:_vm._u([{key:"title",fn:function(){return [_vm._t("title")]},proxy:true},{key:"default",fn:function(){return [_vm._t("default"),_vm._t("container"),(_vm.showDialogFullScreen)?_c('div',{staticClass:"dialog-full-screen-btn"},[(_vm.dialogFullScreenState)?[_c('el-tooltip',{attrs:{"effect":"light","content":"退出全屏","placement":"top"}},[_c('el-button',{attrs:{"type":"text","icon":"iconfont icon-fullscreen-exit"},on:{"click":function($event){$event.stopPropagation();return _vm.exitFullScreen.apply(null, arguments)}}})],1)]:[_c('el-tooltip',{attrs:{"effect":"light","content":"全屏","placement":"top"}},[_c('el-button',{attrs:{"type":"text","icon":"iconfont icon-fullscreen"},on:{"click":function($event){$event.stopPropagation();return _vm.fullScreen.apply(null, arguments)}}})],1)]],2):_vm._e()]},proxy:true},{key:"footer",fn:function(){return [(_vm.$slots.footer)?_c('div',{staticClass:"sone-dialog-custom-footer-wrapper"},[_vm._t("footer")],2):[(_vm.showFooter)?[_c('icon-button',{attrs:{"tooltipDisabled":_vm.tooltipDisabled,"content":_vm.cancel,"placement":"top","loading":_vm.loading,"icon":"el-icon-close","iconfont":false},on:{"click":_vm.handleClose}}),_c('icon-button',{attrs:{"tooltipDisabled":_vm.tooltipDisabled,"content":_vm.confirm,"placement":"top","loading":_vm.loading,"icon":"el-icon-check","type":"primary","iconfont":false},on:{"click":_vm.handleConfirm}})]:_vm._e()]]},proxy:true}],null,true)})],1)}
+var mainvue_type_template_id_427cc793_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=8bc26af4&
+// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=427cc793&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=script&lang=js&
 //
@@ -28012,10 +28012,16 @@ var mainvue_type_template_id_8bc26af4_staticRenderFns = []
     showDialogFullScreen: {
       type: Boolean,
       default: true,
+    },
+    width: {
+      type: String,
+      default: '',
     }
   },
   computed: {
     dialogSize() {
+      if(this.width) return this.width;
+
       if (this.size == "mini") {
         return "400px";
       }
@@ -28074,8 +28080,8 @@ var mainvue_type_template_id_8bc26af4_staticRenderFns = []
 
 var dialog_src_main_component = normalizeComponent(
   packages_dialog_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_8bc26af4_render,
-  mainvue_type_template_id_8bc26af4_staticRenderFns,
+  mainvue_type_template_id_427cc793_render,
+  mainvue_type_template_id_427cc793_staticRenderFns,
   false,
   null,
   null,
@@ -33640,12 +33646,12 @@ mainNew.install = function(Vue) {
 
 /* harmony default export */ var table = (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/normalTable/src/mainNew.vue?vue&type=template&id=ecf192ce&
-var mainNewvue_type_template_id_ecf192ce_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',[_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_ecf192ce_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=70f1f37e&
+var mainNewvue_type_template_id_70f1f37e_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',[_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,"sort-change":_vm.sortChange}},[(_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","sortable":column.sortable,"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_70f1f37e_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/normalTable/src/mainNew.vue?vue&type=template&id=ecf192ce&
+// CONCATENATED MODULE: ./packages/normalTable/src/mainNew.vue?vue&type=template&id=70f1f37e&
 
 // 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/columnTransferNew.vue?vue&type=template&id=26eb7b8c&
 var columnTransferNewvue_type_template_id_26eb7b8c_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _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.checkAll},model:{value:(_vm.columnsCheckAll),callback:function ($$v) {_vm.columnsCheckAll=$$v},expression:"columnsCheckAll"}},[_vm._v("列展示")]),_c('div',[_c('el-button',{staticClass:"rigth_button",attrs:{"type":"text"},on:{"click":_vm.save}},[_vm._v("保存")]),_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('leftColumns', index, item)}}})]),_c('el-tooltip',{attrs:{"placement":"top","content":"固定在右侧","effect":"light"}},[_c('i',{staticClass:"iconfont iconfont-action icon-down1",on:{"click":function($event){return _vm.selectFixed('leftColumns', index, 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('rightColumns', index, item)}}})]),_c('el-tooltip',{attrs:{"placement":"top","content":"固定在左侧","effect":"light"}},[_c('i',{staticClass:"iconfont iconfont-action icon-up1",on:{"click":function($event){return _vm.selectFixed('rightColumns', index, 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('noColumns', index, 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('noColumns', index, item,'right')}}})])],1)])}),0)],1)])])])}
@@ -34162,6 +34168,8 @@ var src_columnTransferNew_component = normalizeComponent(
 //
 //
 //
+//
+//
 
 	
 	
@@ -34206,6 +34214,11 @@ var src_columnTransferNew_component = normalizeComponent(
 				type: Boolean,
 				default: true,
 			},
+			sortable: {
+				type: [Boolean, String],
+				default: false,
+
+			},
 			option: {
 				type: Object,
 				default: () => {
@@ -34418,6 +34431,9 @@ var src_columnTransferNew_component = normalizeComponent(
 				this.$refs[this.tabelRef] && this.$refs[this.tabelRef].setCurrentRow(row);
 				this.$emit('setCurrentRow', row);
 			},
+			sortChange(val){
+				if(val.column.sortable === 'custom') this.$emit('sortChange', val);
+			},
 		},
 	});
 
@@ -34433,8 +34449,8 @@ var src_columnTransferNew_component = normalizeComponent(
 
 var src_mainNew_component = normalizeComponent(
   packages_normalTable_src_mainNewvue_type_script_lang_js_,
-  mainNewvue_type_template_id_ecf192ce_render,
-  mainNewvue_type_template_id_ecf192ce_staticRenderFns,
+  mainNewvue_type_template_id_70f1f37e_render,
+  mainNewvue_type_template_id_70f1f37e_staticRenderFns,
   false,
   null,
   null,
@@ -37897,7 +37913,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = ({
-  version: '2.1.35',
+  version: '2.1.37',
   locale: locale.use,
   i18n: locale.i18n,
   install,