htui-yllkbz 1.3.19 → 1.3.22

package/lib/htui.umd.js

@@ -3800,6 +3800,17 @@ module.exports = function (bitmap, value) {
 };
 
 
+/***/ }),
+
+/***/ "5c7d":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_0d7fa11e_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("71c2");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_0d7fa11e_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_0d7fa11e_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "5fb2":
@@ -4327,13 +4338,6 @@ module.exports = function (originalArray, length) {
 };
 
 
-/***/ }),
-
-/***/ "68be":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "69f3":
@@ -4583,6 +4587,13 @@ module.exports = function ($this, dummy, Wrapper) {
 };
 
 
+/***/ }),
+
+/***/ "71c2":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "7418":
@@ -9165,17 +9176,6 @@ module.exports = function (it, TAG, STATIC) {
 };
 
 
-/***/ }),
-
-/***/ "d55d":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_3e20df09_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("68be");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_3e20df09_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_8_oneOf_1_2_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_index_vue_vue_type_style_index_0_id_3e20df09_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "d58f":
@@ -12903,8 +12903,8 @@ PageInfo.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_PageInfo = (PageInfo);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"48d53131-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!./src/packages/HtTable/index.vue?vue&type=template&id=01634691&scoped=true&
-var HtTablevue_type_template_id_01634691_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.state.loading),expression:"state.loading"}],staticStyle:{"background":"#fff"}},[_c('article',[_c('el-table',{ref:"comTable",attrs:{"height":_vm.height,"max-height":_vm.maxHeight,"border":_vm.border,"stripe":_vm.stripe!==undefined?_vm.stripe:true,"size":_vm.size||'small',"fit":_vm.fit,"header-row-style":_vm.headerRowStyle||{'background':'var(--primary-92)'},"header-row-class-name":_vm.headerRowClassName,"header-cell-class-name":_vm.headerCellClassName,"header-cell-style":_vm.headerCellStyle,"show-header":_vm.showHeader,"empty-text":_vm.emptyText||'暂无数据',"row-style":_vm.rowStyle,"row-class-name":_vm.rowClassName,"current-row-key":_vm.currentRowKey,"highlight-current-row":_vm.highlightCurrentRow,"row-key":_vm.rowKey||'id',"data":_vm.data,"tooltip-effect":"dark"},on:{"row-click":function (row, column, event){ return _vm.$emit('row-click',row, column, event); },"row-contextmenu":function (row, column, event){ return _vm.$emit('row-contextmenu',row, column, event); },"row-dblclick":function (row, column, event){ return _vm.$emit('row-dblclick',row, column, event); },"header-click":function ( column, event){ return _vm.$emit('header-click', column, event); },"header-contextmenu":function ( column, event){ return _vm.$emit('header-contextmenu', column, event); },"sort-change":function (ref){
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"48d53131-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!./src/packages/HtTable/index.vue?vue&type=template&id=16fc57ea&scoped=true&
+var HtTablevue_type_template_id_16fc57ea_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.state.loading),expression:"state.loading"}],staticStyle:{"background":"#fff"}},[_c('article',[_c('el-table',{ref:"comTable",attrs:{"height":_vm.height,"max-height":_vm.maxHeight,"border":_vm.border,"stripe":_vm.stripe!==undefined?_vm.stripe:true,"size":_vm.size||'small',"fit":_vm.fit,"header-row-style":_vm.headerRowStyle||{'background':'var(--primary-92)'},"header-row-class-name":_vm.headerRowClassName,"header-cell-class-name":_vm.headerCellClassName,"header-cell-style":_vm.headerCellStyle,"show-header":_vm.showHeader,"empty-text":_vm.emptyText||'暂无数据',"row-style":_vm.rowStyle,"row-class-name":_vm.rowClassName,"current-row-key":_vm.currentRowKey,"highlight-current-row":_vm.highlightCurrentRow,"row-key":_vm.rowKey||'id',"data":_vm.data,"tooltip-effect":"dark"},on:{"row-click":function (row, column, event){ return _vm.$emit('row-click',row, column, event); },"row-contextmenu":function (row, column, event){ return _vm.$emit('row-contextmenu',row, column, event); },"row-dblclick":function (row, column, event){ return _vm.$emit('row-dblclick',row, column, event); },"header-click":function ( column, event){ return _vm.$emit('header-click', column, event); },"header-contextmenu":function ( column, event){ return _vm.$emit('header-contextmenu', column, event); },"sort-change":function (ref){
 	var column = ref.column;
 	var prop = ref.prop;
 	var order = ref.order;
@@ -12921,17 +12921,14 @@ var rowIndex = ref.rowIndex;
 return [_vm._t(item.key,[(item.type==='org')?[(_vm.getPropByPath(row,item.key))?_c('HtOrgInfo',{attrs:{"org-id":_vm.getPropByPath(row,item.key),"type":"tag"}}):_c('span',[_vm._v("--")])]:(item.type==='common')?[(_vm.getPropByPath(row,item.key))?_c('HtShowBaseData',{attrs:{"hide-code":item.hideCode,"user-id":item.commonType==='userId'?JSON.stringify([_vm.getPropByPath(row,item.key)]):'[]',"department-id":item.commonType==='departmentId'?JSON.stringify([_vm.getPropByPath(row,item.key)]):'[]',"role-id":item.commonType==='roleId'?JSON.stringify([_vm.getPropByPath(row,item.key)]):'[]',"base-data-id":item.commonType==='baseDataId'?_vm.getPropByPath(row,item.key):'',"base-data-value":item.commonType==='baseDataValue'?_vm.getPropByPath(row,item.key):'',"base-data-name":item.commonType==='baseDataName'?_vm.getPropByPath(row,item.key):'',"base-data-info":true}}):_c('span',[_vm._v("--")])]:(item.type==='userId')?[(_vm.getPropByPath(row,item.key))?_c('HtShowBaseData',{attrs:{"user-id":JSON.stringify(_vm.getPropByPath(row,item.key)),"base-data-info":true}}):_c('span',[_vm._v("--")])]:(item.type==='time')?[(_vm.getPropByPath(row,item.key))?_c('div',{staticClass:"ht-column-cell"},[(!item.spread)?_c('span',[_vm._v(" "+_vm._s(_vm.getPropByPath(row,item.key).replace('T', ' ').slice(0,19)))]):[_c('p',{staticStyle:{"color":"var(--primary)","margin":"0","padding":"0"}},[_vm._v(_vm._s(_vm.getPropByPath(row,item.key).slice(11,19)))]),_c('p',{staticStyle:{"margin":"0","padding":"0"}},[_vm._v(_vm._s(_vm.getPropByPath(row,item.key).replace('T', ' ').slice(0,10)))])]],2):_c('span',[_vm._v("--")])]:(item.type==='boolean')?[(_vm.getPropByPath(row,item.key))?_c('el-tag',{attrs:{"type":'success',"size":'small'}},[_vm._v("是")]):_c('el-tag',{attrs:{"type":"danger","size":'small'}},[_vm._v("否")])]:(item.type==='img')?[(_vm.getPropByPath(row,item.key))?_c('span',_vm._l((_vm.getPropByPath(row,item.key).split(',')),function(fileToken){return _c('el-image',{key:fileToken,staticStyle:{"width":"38px","height":"38px","margin-right":"5px"},attrs:{"src":'/files/api/filing/file/download/'+fileToken,"preview-src-list":['/files/api/filing/file/download/'+fileToken]}})}),1):_vm._e()]:(item.type==='file')?[(_vm.getPropByPath(row,item.key))?_c('span',[_c('i',{staticClass:"el-icon-paperclip",staticStyle:{"color":"var(--primary)","cursor":"pointer"},on:{"click":function($event){_vm.showFiles(_vm.getPropByPath(row,item.key))}}},[_vm._v(_vm._s(_vm.getPropByPath(row,item.key).split(',').length))])]):_c('span',[_vm._v("--")])]:_c('span',[_vm._v(_vm._s(_vm.getPropByPath(row,item.key)))])],{"row":row,"column":column,"rowIndex":rowIndex})]}},{key:"header",fn:function(ref){
 var column = ref.column;
 var $index = ref.$index;
-return [_vm._t('header_'+item.key,[_vm._v(_vm._s(item.title))],{"column":column,"$index":$index})]}}],null,true)}):_vm._e()]})],2)],1),(!_vm.hidePage)?_c('footer',[_c('el-row',{attrs:{"name":"footer"}},[_vm._t("footerLeft"),_c('el-col',{attrs:{"span":12}},[_c('PageInfo',{attrs:{"hide-on-single-page":_vm.pagination&&_vm.pagination.hideOnSinglePage,"small":_vm.pagination&&_vm.pagination.small,"page-sizes":_vm.pagination&&_vm.pagination.pageSizes,"page-info":_vm.state.pageInfo},on:{"onchange":function (e){ return _vm.$emit('onchange',e); }}})],1)],2)],1):_vm._e(),_c('el-dialog',{attrs:{"visible":_vm.state.visibleFilter,"title":"属性设置","append-to-body":true,"close-on-click-modal":true,"width":"400px"},on:{"update:visible":function($event){return _vm.$set(_vm.state, "visibleFilter", $event)}}},[_c('p',{staticStyle:{"font-weight":"700","font-size":"18px","float":"left","margin":"0"},attrs:{"slot":"title"},slot:"title"},[_vm._v("自定义列展示")]),_c('div',{staticStyle:{"overflow":"hidden","height":"35vh","margin-top":"12px"}},[_c('el-scrollbar',{staticStyle:{"height":"calc(35vh + 17px)"}},[_c('el-tree',{ref:"tree",attrs:{"data":_vm.getAllColumns,"show-checkbox":"","expand-on-click-node":false,"node-key":"key","check-on-click-node":false,"default-checked-keys":_vm.state.checkedColumnKeys,"allow-drag":_vm.allowDrag,"draggable":"","allow-drop":_vm.allowDrop},on:{"node-drag-start":_vm.handleDragStart,"node-drag-enter":_vm.handleDragEnter,"node-drag-leave":_vm.handleDragLeave,"node-drag-over":_vm.handleDragOver,"node-drag-end":_vm.handleDragEnd,"node-drop":_vm.handleDrop,"check-change":_vm.changeColumns},scopedSlots:_vm._u([{key:"default",fn:function(ref){
+return [_vm._t('header_'+item.key,[_vm._v(_vm._s(item.title))],{"column":column,"$index":$index})]}}],null,true)}):_vm._e()]})],2)],1),(!_vm.hidePage)?_c('footer',[_c('el-row',{attrs:{"name":"footer"}},[_vm._t("footerLeft"),_c('el-col',{attrs:{"span":12}},[_c('PageInfo',{attrs:{"hide-on-single-page":_vm.pagination&&_vm.pagination.hideOnSinglePage,"small":_vm.pagination&&_vm.pagination.small,"page-sizes":_vm.pagination&&_vm.pagination.pageSizes,"page-info":_vm.state.pageInfo},on:{"onchange":function (e){ return _vm.$emit('onchange',e); }}})],1)],2)],1):_vm._e(),(_vm.state.visibleFilter)?_c('el-dialog',{attrs:{"visible":_vm.state.visibleFilter,"title":"属性设置","append-to-body":true,"close-on-click-modal":true,"width":"400px"},on:{"update:visible":function($event){return _vm.$set(_vm.state, "visibleFilter", $event)}}},[_c('p',{staticStyle:{"font-weight":"700","font-size":"18px","float":"left","margin":"0"},attrs:{"slot":"title"},slot:"title"},[_vm._v("自定义列展示")]),_c('div',{staticStyle:{"overflow":"hidden","height":"35vh","margin-top":"12px"}},[_c('el-scrollbar',{staticStyle:{"height":"calc(35vh + 17px)"}},[_c('el-tree',{ref:"tree",attrs:{"data":_vm.getAllColumns,"show-checkbox":"","expand-on-click-node":false,"node-key":"key","check-on-click-node":false,"default-checked-keys":_vm.state.checkedColumnKeys,"allow-drag":_vm.allowDrag,"draggable":"","allow-drop":_vm.allowDrop},on:{"node-drag-start":_vm.handleDragStart,"node-drag-enter":_vm.handleDragEnter,"node-drag-leave":_vm.handleDragLeave,"node-drag-over":_vm.handleDragOver,"node-drag-end":_vm.handleDragEnd,"node-drop":_vm.handleDrop,"check-change":_vm.changeColumns},scopedSlots:_vm._u([{key:"default",fn:function(ref){
 var node = ref.node;
 var data = ref.data;
-return _c('span',{staticClass:"custom-tree-node"},[_vm._t('header_'+data.key,[_vm._v(_vm._s(data.title)),_c('span',{staticStyle:{"color":"#C0C4CC"}},[_vm._v(_vm._s(data.property?("(" + (data.property) + ")"):''))])],{"column":data})],2)}}],null,true)})],1)],1),_c('span',{attrs:{"slot":"footer"},slot:"footer"},[_c('el-button',{attrs:{"type":"primary"},on:{"click":_vm.confirmSortAndshow}},[_vm._v("确定")]),_c('el-button',{on:{"click":function($event){_vm.state.visibleFilter=false}}},[_vm._v("取消")]),_c('el-button',{on:{"click":_vm.resetColumn}},[_vm._v("重置")])],1)]),_c('el-dialog',{attrs:{"visible":_vm.state.visibleFile,"title":"附件查看","append-to-body":true,"close-on-click-modal":true,"width":"400px","center":true},on:{"update:visible":function($event){return _vm.$set(_vm.state, "visibleFile", $event)}}},[_c('p',{staticStyle:{"font-weight":"700","font-size":"18px","float":"left","margin":"0"},attrs:{"slot":"title"},slot:"title"},[_vm._v("附件查看")]),_c('div',{staticStyle:{"overflow":"hidden","height":"calc(30vh)"}},[_c('el-scrollbar',{staticStyle:{"height":"calc(100% + 17px)"}},[_c('HtUploadFiles',{attrs:{"disabled":true},model:{value:(_vm.state.files),callback:function ($$v) {_vm.$set(_vm.state, "files", $$v)},expression:"state.files"}})],1)],1)])],1)}
-var HtTablevue_type_template_id_01634691_scoped_true_staticRenderFns = []
+return _c('span',{staticClass:"custom-tree-node"},[_vm._t('header_'+data.key,[_vm._v(_vm._s(data.title)),_c('span',{staticStyle:{"color":"#C0C4CC"}},[_vm._v(_vm._s(data.property?("(" + (data.property) + ")"):''))])],{"column":data})],2)}}],null,true)})],1)],1),_c('span',{attrs:{"slot":"footer"},slot:"footer"},[_c('el-button',{attrs:{"type":"primary"},on:{"click":_vm.confirmSortAndshow}},[_vm._v("确定")]),_c('el-button',{on:{"click":function($event){_vm.state.visibleFilter=false}}},[_vm._v("取消")]),_c('el-button',{on:{"click":_vm.resetColumn}},[_vm._v("重置")])],1)]):_vm._e(),(_vm.state.visibleFile)?_c('el-dialog',{attrs:{"visible":_vm.state.visibleFile,"title":"附件查看","append-to-body":true,"close-on-click-modal":true,"width":"400px","center":true},on:{"update:visible":function($event){return _vm.$set(_vm.state, "visibleFile", $event)}}},[_c('p',{staticStyle:{"font-weight":"700","font-size":"18px","float":"left","margin":"0"},attrs:{"slot":"title"},slot:"title"},[_vm._v("附件查看")]),_c('div',{staticStyle:{"overflow":"hidden","height":"calc(30vh)"}},[_c('el-scrollbar',{staticStyle:{"height":"calc(100% + 17px)"}},[_c('HtUploadFiles',{attrs:{"disabled":true},model:{value:(_vm.state.files),callback:function ($$v) {_vm.$set(_vm.state, "files", $$v)},expression:"state.files"}})],1)],1)]):_vm._e()],1)}
+var HtTablevue_type_template_id_16fc57ea_scoped_true_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/HtTable/index.vue?vue&type=template&id=01634691&scoped=true&
-
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
-var es_array_concat = __webpack_require__("99af");
+// CONCATENATED MODULE: ./src/packages/HtTable/index.vue?vue&type=template&id=16fc57ea&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__("5319");
@@ -13286,12 +13283,15 @@ var HtUploadFiles_component = normalizeComponent(
 )
 
 /* harmony default export */ var packages_HtUploadFiles = (HtUploadFiles_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"48d53131-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!./src/packages/HtShowBaseData/index.vue?vue&type=template&id=3e20df09&scoped=true&
-var HtShowBaseDatavue_type_template_id_3e20df09_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"show-common-item"},[(_vm.timeStr)?[_c('span',[_vm._v(" "+_vm._s(_vm.timeFormat)+" ")])]:_vm._e(),(_vm.departmentId)?_vm._l((_vm.departmentData),function(item){return _c('span',{key:item,staticClass:"item"},[_vm._v(" "+_vm._s(_vm.getorgById(item).displayName || _vm.empty)+" ")])}):_vm._e(),(_vm.userId)?_vm._l((_vm.userData),function(item){return _c('span',{key:item.id,staticClass:"item"},[_vm._v(" "+_vm._s(item.value || _vm.empty)+" ")])}):_vm._e(),(_vm.roleId)?_vm._l((_vm.roleData),function(item){return _c('span',{key:item.id,staticClass:"item"},[_vm._v(" "+_vm._s(item.name || _vm.empty)+" ")])}):_vm._e(),(_vm.baseDataId)?[(_vm.baseDataItem[_vm.baseDataId])?_c('span',{staticClass:"item"},[_vm._v(" "+_vm._s(_vm.state.text)+" ")]):_c('span',[_vm._v(" "+_vm._s(_vm.empty))])]:_vm._e(),(_vm.baseDataValue)?[(_vm.baseDataItem[_vm.baseDataValue])?_c('span',{staticClass:"item"},[_vm._v(" "+_vm._s(_vm.baseDataItem[_vm.baseDataValue].name || _vm.empty)+" "),(_vm.baseDataInfo&&!_vm.hideCode)?_c('span',[_vm._v(" ("+_vm._s(_vm.baseDataItem[_vm.baseDataValue].value || _vm.empty)+") ")]):_vm._e()]):_c('span',[_vm._v(" "+_vm._s(_vm.empty))])]:_vm._e(),(_vm.baseDataName)?[(_vm.baseDataItem[_vm.baseDataName])?_c('span',{staticClass:"item"},[_vm._v(" "+_vm._s(_vm.baseDataItem[_vm.baseDataName].name || _vm.empty)+" "),(_vm.baseDataInfo&&!_vm.hideCode)?_c('span',[_vm._v(" ("+_vm._s(_vm.baseDataItem[_vm.baseDataName].value || _vm.empty)+") ")]):_vm._e()]):_c('span',[_vm._v(" "+_vm._s(_vm.empty))])]:_vm._e()],2)}
-var HtShowBaseDatavue_type_template_id_3e20df09_scoped_true_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"48d53131-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!./src/packages/HtShowBaseData/index.vue?vue&type=template&id=0d7fa11e&scoped=true&
+var HtShowBaseDatavue_type_template_id_0d7fa11e_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"show-common-item"},[(_vm.timeStr)?[_c('span',[_vm._v(" "+_vm._s(_vm.timeFormat)+" ")])]:_vm._e(),(_vm.departmentId)?_vm._l((_vm.departmentData),function(item){return _c('span',{key:item,staticClass:"item"},[_vm._v(" "+_vm._s(_vm.getorgById(item).displayName || _vm.empty)+" ")])}):_vm._e(),(_vm.userId)?_vm._l((_vm.userData),function(item){return _c('span',{key:item.id,staticClass:"item"},[_vm._v(" "+_vm._s(item.value || _vm.empty)+" ")])}):_vm._e(),(_vm.roleId)?_vm._l((_vm.roleData),function(item){return _c('span',{key:item.id,staticClass:"item"},[_vm._v(" "+_vm._s(item.name || _vm.empty)+" ")])}):_vm._e(),(_vm.baseDataId)?[(_vm.baseDataItem[_vm.baseDataId])?_c('span',{staticClass:"item"},[_vm._v(" "+_vm._s(_vm.state.text)+" ")]):_c('span',[_vm._v(" "+_vm._s(_vm.empty))])]:_vm._e(),(_vm.baseDataValue)?[(_vm.baseDataItem[_vm.baseDataValue])?_c('span',{staticClass:"item"},[_vm._v(" "+_vm._s(_vm.baseDataItem[_vm.baseDataValue].name || _vm.empty)+" "),(_vm.baseDataInfo&&!_vm.hideCode)?_c('span',[_vm._v(" ("+_vm._s(_vm.baseDataItem[_vm.baseDataValue].value || _vm.empty)+") ")]):_vm._e()]):_c('span',[_vm._v(" "+_vm._s(_vm.empty))])]:_vm._e(),(_vm.baseDataName)?[(_vm.baseDataItem[_vm.baseDataName])?_c('span',{staticClass:"item"},[_vm._v(" "+_vm._s(_vm.baseDataItem[_vm.baseDataName].name || _vm.empty)+" "),(_vm.baseDataInfo&&!_vm.hideCode)?_c('span',[_vm._v(" ("+_vm._s(_vm.baseDataItem[_vm.baseDataName].value || _vm.empty)+") ")]):_vm._e()]):_c('span',[_vm._v(" "+_vm._s(_vm.empty))])]:_vm._e()],2)}
+var HtShowBaseDatavue_type_template_id_0d7fa11e_scoped_true_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/HtShowBaseData/index.vue?vue&type=template&id=3e20df09&scoped=true&
+// CONCATENATED MODULE: ./src/packages/HtShowBaseData/index.vue?vue&type=template&id=0d7fa11e&scoped=true&
+
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.concat.js
+var es_array_concat = __webpack_require__("99af");
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.find.js
 var es_array_find = __webpack_require__("7db0");
@@ -13444,6 +13444,18 @@ var HtShowBaseDatavue_type_script_lang_ts_CommonDatas = /*#__PURE__*/function (_
       if (this.baseDataId) {
         var tempText = this.setAllLevel(this.baseDataId);
         this.state.text = tempText;
+      } else {
+        this.state.text = "";
+      }
+    }
+  }, {
+    key: "getText",
+    value: function getText(val) {
+      if (val && this.baseDataItem) {
+        var tempText = this.setAllLevel(val);
+        this.state.text = tempText;
+      } else {
+        this.state.text = "";
       }
     }
     /** 计算属性 */
@@ -13567,14 +13579,16 @@ __decorate([Prop({
 
 __decorate([Watch("baseDataItem")], HtShowBaseDatavue_type_script_lang_ts_CommonDatas.prototype, "setText", null);
 
+__decorate([Watch("baseDataId")], HtShowBaseDatavue_type_script_lang_ts_CommonDatas.prototype, "getText", null);
+
 HtShowBaseDatavue_type_script_lang_ts_CommonDatas = __decorate([vue_class_component_esm({
   name: "HtShowBaseData"
 })], HtShowBaseDatavue_type_script_lang_ts_CommonDatas);
 /* harmony default export */ var HtShowBaseDatavue_type_script_lang_ts_ = (HtShowBaseDatavue_type_script_lang_ts_CommonDatas);
 // CONCATENATED MODULE: ./src/packages/HtShowBaseData/index.vue?vue&type=script&lang=ts&
  /* harmony default export */ var packages_HtShowBaseDatavue_type_script_lang_ts_ = (HtShowBaseDatavue_type_script_lang_ts_); 
-// EXTERNAL MODULE: ./src/packages/HtShowBaseData/index.vue?vue&type=style&index=0&id=3e20df09&lang=scss&scoped=true&
-var HtShowBaseDatavue_type_style_index_0_id_3e20df09_lang_scss_scoped_true_ = __webpack_require__("d55d");
+// EXTERNAL MODULE: ./src/packages/HtShowBaseData/index.vue?vue&type=style&index=0&id=0d7fa11e&lang=scss&scoped=true&
+var HtShowBaseDatavue_type_style_index_0_id_0d7fa11e_lang_scss_scoped_true_ = __webpack_require__("5c7d");
 
 // CONCATENATED MODULE: ./src/packages/HtShowBaseData/index.vue
 
@@ -13587,11 +13601,11 @@ var HtShowBaseDatavue_type_style_index_0_id_3e20df09_lang_scss_scoped_true_ = __
 
 var HtShowBaseData_component = normalizeComponent(
   packages_HtShowBaseDatavue_type_script_lang_ts_,
-  HtShowBaseDatavue_type_template_id_3e20df09_scoped_true_render,
-  HtShowBaseDatavue_type_template_id_3e20df09_scoped_true_staticRenderFns,
+  HtShowBaseDatavue_type_template_id_0d7fa11e_scoped_true_render,
+  HtShowBaseDatavue_type_template_id_0d7fa11e_scoped_true_staticRenderFns,
   false,
   null,
-  "3e20df09",
+  "0d7fa11e",
   null
   
 )
@@ -13765,7 +13779,6 @@ HtOrgInfo.install = function (Vue) {
 
 
 
-
 
 
 var HtTablevue_type_script_lang_ts_HtTable = /*#__PURE__*/function (_Vue) {
@@ -13803,40 +13816,7 @@ var HtTablevue_type_script_lang_ts_HtTable = /*#__PURE__*/function (_Vue) {
     key: "created",
     value: function created() {
       this.setPageInfo(this.pageInfo); //this.setColumns(this.columns);
-
-      if (this.uuId) {
-        //通过uuid获取缓存起来的header显示信息
-        //-todo
-        //---columns 要改变
-        //---showColumnKeys 要改变
-        //---排列顺序要改变 todo
-        var allColumns = window.localStorage.getItem("table_" + this.uuId);
-
-        if (allColumns) {
-          this.state.allColumns = JSON.parse(allColumns);
-          this.state.showColumns = JSON.parse(allColumns);
-          this.getShowKeys(this.state.allColumns);
-        } else {
-          if (this.configShow) {
-            this.columns.forEach(function (item) {
-              return item.checked = !!item.deafaultShow;
-            });
-            this.creatInitColumnKey(this.columns);
-          } else {
-            this.creatInitColumnKey(this.columns || []);
-          }
-        }
-      } else {
-        if (this.configShow) {
-          this.columns.forEach(function (item) {
-            return item.checked = !!item.deafaultShow;
-          });
-          this.creatInitColumnKey(this.columns);
-        } else {
-          this.creatInitColumnKey(this.columns || []);
-        }
-      } // console.log("this.columns", this.columns);
-
+      // console.log("this.columns", this.columns);
     }
   }, {
     key: "resetColumn",
@@ -14069,50 +14049,42 @@ var HtTablevue_type_script_lang_ts_HtTable = /*#__PURE__*/function (_Vue) {
   }, {
     key: "setColumns",
     value: function setColumns(columns) {
-      var showColumns = this.state.showColumns;
-      /** 当前所有key */
-
-      var allKeys = {};
-      /** 新来的所有key */
-
-      var newKeys = {};
-      showColumns.forEach(function (item) {
-        allKeys = _objectSpread2(_objectSpread2({}, allKeys), {}, defineProperty_defineProperty({}, item.key, true));
-      });
-      columns === null || columns === void 0 ? void 0 : columns.forEach(function (item) {
-        newKeys = _objectSpread2(_objectSpread2({}, newKeys), {}, defineProperty_defineProperty({}, item.key, true));
-      });
-      /** 查找出所有的当前不存在的key */
+      if (!columns) {
+        return;
+      }
 
-      var newColumns = columns === null || columns === void 0 ? void 0 : columns.filter(function (item) {
-        return !allKeys[item.key];
-      });
-      /** 查找出当前已有的key */
+      if (this.uuId) {
+        //通过uuid获取缓存起来的header显示信息
+        //-todo
+        //---columns 要改变
+        //---showColumnKeys 要改变
+        //---排列顺序要改变 todo
+        var allColumns = window.localStorage.getItem("table_" + this.uuId);
 
-      var successColumns = showColumns === null || showColumns === void 0 ? void 0 : showColumns.filter(function (item) {
-        return newKeys[item.key];
-      });
-      var tempColumns = [];
-      var lastColumn = [];
-      successColumns.forEach(function (item, index) {
-        /** 去除操作列 */
-        if (item.key !== "handel") {
-          tempColumns.push(item);
+        if (allColumns) {
+          this.state.allColumns = JSON.parse(allColumns);
+          this.state.showColumns = JSON.parse(allColumns);
+          this.getShowKeys(this.state.allColumns);
         } else {
-          lastColumn.push(item);
+          if (this.configShow) {
+            columns.forEach(function (item) {
+              return item.checked = !!item.deafaultShow;
+            });
+            this.creatInitColumnKey(columns);
+          } else {
+            this.creatInitColumnKey(columns || []);
+          }
         }
-      });
-      newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item, index) {
-        /** 去除操作列 */
-        if (item.key !== "handel") {
-          tempColumns.push(item);
+      } else {
+        if (this.configShow) {
+          columns.forEach(function (item) {
+            return item.checked = !!item.deafaultShow;
+          });
+          this.creatInitColumnKey(columns);
         } else {
-          lastColumn.push(item);
+          this.creatInitColumnKey(columns || []);
         }
-      });
-      /** 去除多余并且添加新增的 */
-
-      this.creatInitColumnKey([].concat(tempColumns, lastColumn));
+      }
     }
   }, {
     key: "showColumns",
@@ -14218,7 +14190,9 @@ __decorate([Prop()], HtTablevue_type_script_lang_ts_HtTable.prototype, "paginati
 
 __decorate([Watch("pageInfo")], HtTablevue_type_script_lang_ts_HtTable.prototype, "setPageInfo", null);
 
-__decorate([Watch("columns")], HtTablevue_type_script_lang_ts_HtTable.prototype, "setColumns", null);
+__decorate([Watch("columns", {
+  immediate: true
+})], HtTablevue_type_script_lang_ts_HtTable.prototype, "setColumns", null);
 
 HtTablevue_type_script_lang_ts_HtTable = __decorate([vue_class_component_esm({
   name: "HtTable",
@@ -14242,11 +14216,11 @@ HtTablevue_type_script_lang_ts_HtTable = __decorate([vue_class_component_esm({
 
 var HtTable_component = normalizeComponent(
   packages_HtTablevue_type_script_lang_ts_,
-  HtTablevue_type_template_id_01634691_scoped_true_render,
-  HtTablevue_type_template_id_01634691_scoped_true_staticRenderFns,
+  HtTablevue_type_template_id_16fc57ea_scoped_true_render,
+  HtTablevue_type_template_id_16fc57ea_scoped_true_staticRenderFns,
   false,
   null,
-  "01634691",
+  "16fc57ea",
   null
   
 )
@@ -15254,12 +15228,12 @@ packages_HtUploadFiles.install = function (Vue) {
 };
 
 /* harmony default export */ var src_packages_HtUploadFiles = (packages_HtUploadFiles);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"48d53131-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!./src/packages/HtSelectBaseData/index.vue?vue&type=template&id=939476ae&scoped=true&
-var HtSelectBaseDatavue_type_template_id_939476ae_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(!_vm.readonly)?[(!_vm.dataTypeId)?_c('el-select',{staticStyle:{"width":"100%"},attrs:{"value":"","disabled":_vm.disabled,"placeholder":"请选择"}}):_c('HtBaseData',{attrs:{"disabled":_vm.disabled,"com-style":"background:#fff","config-json":_vm.configJson},on:{"change":_vm.getCommonData}})]:_c('div',[(this.value)?_c('HtShowBaseData',{staticStyle:{"font-size":"12px"},attrs:{"hide-code":_vm.hideCode,"show-all-level":_vm.showAllLevels,"base-data-id":this.value,"base-data-info":true,"com-style":"font-size:12px"}}):_vm._e()],1)],2)}
-var HtSelectBaseDatavue_type_template_id_939476ae_scoped_true_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"48d53131-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!./src/packages/HtSelectBaseData/index.vue?vue&type=template&id=5db7b547&scoped=true&
+var HtSelectBaseDatavue_type_template_id_5db7b547_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(!_vm.readonly)?[(!_vm.dataTypeId)?_c('el-select',{staticStyle:{"width":"100%"},attrs:{"value":"","disabled":_vm.disabled,"placeholder":"请选择"}}):_c('HtBaseData',{attrs:{"disabled":_vm.disabled,"com-style":"background:#fff","config-json":_vm.configJson},on:{"change":_vm.getCommonData}})]:_c('div',[(this.value)?_c('HtShowBaseData',{staticStyle:{"font-size":"12px"},attrs:{"hide-code":_vm.hideCode,"show-all-level":_vm.showAllLevels,"base-data-id":this.value,"base-data-info":true,"com-style":"font-size:12px"}}):_vm._e()],1)],2)}
+var HtSelectBaseDatavue_type_template_id_5db7b547_scoped_true_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/HtSelectBaseData/index.vue?vue&type=template&id=939476ae&scoped=true&
+// CONCATENATED MODULE: ./src/packages/HtSelectBaseData/index.vue?vue&type=template&id=5db7b547&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"48d53131-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!./src/packages/HtBaseData/index.vue?vue&type=template&id=6fffc724&scoped=true&
 var HtBaseDatavue_type_template_id_6fffc724_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[(
@@ -17204,7 +17178,7 @@ var HtSelectBaseDatavue_type_script_lang_ts_HtSelectBaseData = /*#__PURE__*/func
       }
 
       this.$emit("input", data);
-      this.$emit("change", data); // this.$emit("input", id);
+      this.$emit("change", data, dep); // this.$emit("input", id);
       // this.$emit("change", id, data[this.dataTypeId][0]);
     }
     /** 监听 */
@@ -17300,11 +17274,11 @@ HtSelectBaseDatavue_type_script_lang_ts_HtSelectBaseData = __decorate([vue_class
 
 var HtSelectBaseData_component = normalizeComponent(
   packages_HtSelectBaseDatavue_type_script_lang_ts_,
-  HtSelectBaseDatavue_type_template_id_939476ae_scoped_true_render,
-  HtSelectBaseDatavue_type_template_id_939476ae_scoped_true_staticRenderFns,
+  HtSelectBaseDatavue_type_template_id_5db7b547_scoped_true_render,
+  HtSelectBaseDatavue_type_template_id_5db7b547_scoped_true_staticRenderFns,
   false,
   null,
-  "939476ae",
+  "5db7b547",
   null
   
 )