hbte-saas-ui 1.2.0 → 1.2.2

package/lib/hbte-ui.common.js

@@ -20371,16 +20371,16 @@ defineIterator(String, 'String', function (iterated) {
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fragment/src/main.vue?vue&type=template&id=7bde9d48&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fragment/src/main.vue?vue&type=template&id=bb5d9898&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{ref:"hbFragment",staticClass:"hb-fragment hb-fragment__layout"},_vm._l((_vm.detailData),function(item,index){return _c('div',{key:index,staticClass:"hb-fragment__item",class:{
       'full-row': item.entireLine,
     },style:({
       paddingBottom: _vm.paddingBottom,
-    })},[_c('p',{staticClass:"hb-fragment__title"},[_vm._v(_vm._s(item.name))]),_c('div',{staticClass:"hb-fragment__value"},[(item.disabled)?_c('div',{staticClass:"hb-fragment__value--disabled",class:[item.active ? 'active' : ''],attrs:{"title":item.value}},[_vm._v(" "+_vm._s(item.value || "-")+" ")]):_c('hb-editarea',{attrs:{"type":item.type,"value":item.value,"validate":item.validate,"insert":item.insert,"change":item.change,"optList":item.optList,"multiple":item.multiple,"keepEdit":item.keepEdit,"format":_vm.format,"size":"mini"},on:{"update:value":function($event){return _vm.$set(item, "value", $event)}}})],1)])}),0)}
+    })},[_c('p',{staticClass:"hb-fragment__title"},[_vm._v(_vm._s(item.name))]),_c('div',{staticClass:"hb-fragment__value"},[(item.disabled)?_c('div',{staticClass:"hb-fragment__value--disabled",class:[item.active ? 'active' : ''],attrs:{"title":item.value}},[(item.link)?_c('a',{staticClass:"hb-fragment__value--link",attrs:{"target":"_blank","href":item.url || item.value}},[_vm._v(" "+_vm._s(item.value || "-")+" ")]):[_vm._v(" "+_vm._s(item.value || "-")+" ")]],2):_c('hb-editarea',{attrs:{"type":item.type,"value":item.value,"validate":item.validate,"insert":item.insert,"change":item.change,"optList":item.optList,"multiple":item.multiple,"keepEdit":item.keepEdit,"format":_vm.format,"size":"mini"},on:{"update:value":function($event){return _vm.$set(item, "value", $event)}}})],1)])}),0)}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/fragment/src/main.vue?vue&type=template&id=7bde9d48&
+// CONCATENATED MODULE: ./packages/fragment/src/main.vue?vue&type=template&id=bb5d9898&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fragment/src/main.vue?vue&type=script&lang=js&
 //
@@ -20426,6 +20426,15 @@ var staticRenderFns = []
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: "HbFragment",
   componentName: "HbFragment",
@@ -21890,18 +21899,18 @@ var component = Object(componentNormalizer["a" /* default */])(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/table/src/main.vue?vue&type=template&id=181be97a&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"hb-table"},[_c('el-table',_vm._g(_vm._b({directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"}],key:_vm.key,ref:"table",staticStyle:{"flex":"1"},attrs:{"data":_vm.tableData,"stripe":false,"border":true,"height":_vm.height},on:{"select":_vm.selectData,"select-all":_vm.selectData,"header-dragend":_vm.dragend}},'el-table',_vm.tableProp,false),_vm.$listeners),[_c('template',{slot:"empty"},[_c('div',{staticClass:"hb-table-nodata"}),_c('div',{staticClass:"hb-table-nodata-text"},[_vm._v("暂无数据")])]),(_vm.serial)?_c('el-table-column',{attrs:{"label":"序号","type":"index","align":"center","width":"50","fixed":"left","resizable":false,"class-name":"hb-table-index"}}):_vm._e(),(_vm.select)?_c('el-table-column',{attrs:{"type":"selection","align":"center","width":"44","selectable":_vm.selectable,"resizable":false,"reserve-selection":_vm.reserveSelect,"fixed":"left"}}):_vm._e(),_vm._l((_vm.columns),function(item,colIndex){return [(item.slot && item.currentSelect)?_vm._t(item.prop,null,{"column":item}):(item.edit && item.currentSelect)?_c('el-table-column',{key:("edit::" + (item.prop)),attrs:{"prop":item.prop,"label":item.label,"width":item.minWidth > 0 ? undefined : item.width,"min-width":item.minWidth,"formatter":item.formatter,"fixed":item.fixed,"align":item.align || 'left',"show-overflow-tooltip":!item.edit.keepEdit,"resizable":item.resizable === false ? false : !item.fixed},scopedSlots:_vm._u([{key:"default",fn:function(ref){
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/table/src/main.vue?vue&type=template&id=2252f8f0&
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"hb-table"},[_c('el-table',_vm._g(_vm._b({directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"}],key:_vm.key,ref:"table",staticStyle:{"flex":"1"},attrs:{"data":_vm.tableData,"stripe":false,"border":true,"height":_vm.height},on:{"select":_vm.selectData,"select-all":_vm.selectData,"header-dragend":_vm.dragend}},'el-table',_vm.$attrs,false),_vm.$listeners),[_c('template',{slot:"empty"},[_c('div',{staticClass:"hb-table-nodata"}),_c('div',{staticClass:"hb-table-nodata-text"},[_vm._v("暂无数据")])]),(_vm.serial)?_c('el-table-column',{attrs:{"label":"序号","type":"index","align":"center","width":"50","fixed":"left","resizable":false,"class-name":"hb-table-index"}}):_vm._e(),(_vm.select)?_c('el-table-column',{attrs:{"type":"selection","align":"center","width":"44","selectable":_vm.selectable,"resizable":false,"reserve-selection":_vm.reserveSelect,"fixed":"left"}}):_vm._e(),_vm._l((_vm.columns),function(item,colIndex){return [(item.slot && item.currentSelect)?_vm._t(item.prop,null,{"column":item}):(item.edit && item.currentSelect)?_c('el-table-column',{key:("edit::" + (item.prop)),attrs:{"prop":item.prop,"label":item.label,"width":item.minWidth > 0 ? undefined : item.width,"min-width":item.minWidth,"formatter":item.formatter,"fixed":item.fixed,"align":item.align || 'left',"show-overflow-tooltip":!item.edit.keepEdit,"resizable":item.resizable === false ? false : true},scopedSlots:_vm._u([{key:"default",fn:function(ref){
 var row = ref.row;
 var col = ref.col;
 var $index = ref.$index;
 return [(!item.editCondition || item.editCondition($index, row))?_c('hb-editarea',_vm._b({ref:item.edit.keepEdit
                 ? ("editarea_" + $index + "_" + colIndex + "_" + _vm.cmpKey)
-                : undefined,refInFor:true,class:item.edit.keepEdit ? "hb-table__keep" : 'hb-table__edit',attrs:{"keepEdit":item.edit.keepEdit,"value":row[item.prop],"border":true,"insert":_vm.handleInsertCell(row, item),"change":_vm.handleChangeCell(row, item)},on:{"update:value":function($event){return _vm.$set(row, item.prop, $event)}}},'hb-editarea',item.edit,false)):_c('font',[_vm._v(_vm._s(row[item.prop]))])]}}],null,true)}):(item.currentSelect)?_c('el-table-column',{key:("default::" + (item.prop)),attrs:{"prop":item.prop,"label":item.label,"width":item.minWidth > 0 ? undefined : item.width,"min-width":item.minWidth,"formatter":item.formatter,"fixed":item.fixed,"align":item.align || 'left',"show-overflow-tooltip":true,"resizable":item.resizable === false ? false : !item.fixed}}):_vm._e()]}),(_vm.showBlankColumn)?_c('el-table-column',{key:"layoutColumn",attrs:{"min-width":"1px","resizable":false}}):_vm._e()],2)],1)}
+                : undefined,refInFor:true,class:item.edit.keepEdit ? "hb-table__keep" : 'hb-table__edit',attrs:{"keepEdit":item.edit.keepEdit,"value":row[item.prop],"border":true,"insert":_vm.handleInsertCell(row, item),"change":_vm.handleChangeCell(row, item)},on:{"update:value":function($event){return _vm.$set(row, item.prop, $event)}}},'hb-editarea',item.edit,false)):_c('font',[_vm._v(_vm._s(row[item.prop]))])]}}],null,true)}):(item.currentSelect)?_c('el-table-column',{key:("default::" + (item.prop)),attrs:{"prop":item.prop,"label":item.label,"width":item.minWidth > 0 ? undefined : item.width,"min-width":item.minWidth,"formatter":item.formatter,"fixed":item.fixed,"align":item.align || 'left',"show-overflow-tooltip":true,"resizable":item.resizable === false ? false : true}}):_vm._e()]}),(_vm.showBlankColumn)?_c('el-table-column',{key:"layoutColumn",attrs:{"min-width":"1px","resizable":false}}):_vm._e()],2)],1)}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/table/src/main.vue?vue&type=template&id=181be97a&
+// CONCATENATED MODULE: ./packages/table/src/main.vue?vue&type=template&id=2252f8f0&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
 var es_object_to_string = __webpack_require__("d3b7");
@@ -21912,10 +21921,14 @@ var web_dom_collections_for_each = __webpack_require__("159b");
 // 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");
+
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/table/src/main.vue?vue&type=script&lang=js&
 
 
 
+
 //
 //
 //
@@ -22198,24 +22211,23 @@ var es_array_concat = __webpack_require__("99af");
 
       return null;
     },
-    dragend: function dragend() {
+    dragend: function dragend(newWidth, oldWidth, column) {
       var _this2 = this;
 
-      //暂时不开启这个功能
-      // console.log(column);
-      // this.columns.find((item) => item.prop === column.property).width =
-      //   newWidth;
+      //用户配置不需要记录列宽变化的值
+      if (!this.$attrs.showColumnsWidth) {
+        return;
+      }
+
+      this.columns.find(function (item) {
+        return item.prop === column.property;
+      }).width = newWidth;
       this.$nextTick(function () {
         _this2.$refs.table.doLayout();
       });
     }
   },
   computed: {
-    // 传入el-table的prop:将自带的一些prop和传入的prop(权重更高)合并
-    tableProp: function tableProp() {
-      var props = this.$lodash.assign({}, this.tableStyles, this.$attrs);
-      return props;
-    },
     // 当列表中没有自适应列时需要开启默认自适应列
     showBlankColumn: function showBlankColumn() {
       return !this.columns.some(function (item) {
@@ -23575,12 +23587,12 @@ module.exports = {
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/pagination/src/main.vue?vue&type=template&id=737ad066&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"hb-pagination"},[(_vm.pageData)?_c('el-pagination',{attrs:{"background":"","current-page":_vm.pageData.pageNum,"page-sizes":_vm.pageSizes,"page-size":_vm.pageData.pageSize,"layout":"total, sizes, prev, slot,next","total":_vm.total},on:{"size-change":_vm.handleSizeChange,"current-change":_vm.handleCurrentChange}},[_c('div',{staticClass:"hb-pagination-slot"},[_c('div',{attrs:{"slot":"input"},slot:"input"},[_c('span',{staticClass:"hb-pagination-slot_text"},[_vm._v("第")]),_c('el-input',{staticClass:"hb-pagination-slot_input",attrs:{"clearable":false},on:{"input":_vm.handleCurrentInput,"blur":_vm.handleCurrentBlur},model:{value:(_vm.pageData.pageNum),callback:function ($$v) {_vm.$set(_vm.pageData, "pageNum", $$v)},expression:"pageData.pageNum"}}),_c('span',{staticClass:"hb-pagination-slot_text"},[_vm._v("共"+_vm._s(_vm.pageNumber)+"页")])],1)])]):_vm._e(),(_vm.showFilter)?_c('hb-filterdrop',_vm._b({attrs:{"columns":_vm.columns,"placement":_vm.placement,"disabledFilter":_vm.disabledFilter},on:{"columnsChange":_vm.columnsChange}},'hb-filterdrop',_vm.$attrs,false),[_c('i',{staticClass:"hb-pagination__dropdown-icon icon-hb-peizhi",attrs:{"slot":"dropdown"},slot:"dropdown"})]):_vm._e()],1)}
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/pagination/src/main.vue?vue&type=template&id=355b6cb3&
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"hb-pagination"},[(_vm.pageData)?_c('el-pagination',{attrs:{"background":"","current-page":_vm.pageData.pageNum,"page-sizes":_vm.pageSizes,"page-size":_vm.pageData.pageSize,"layout":"total, sizes, prev, slot,next","total":_vm.total},on:{"size-change":_vm.handleSizeChange,"current-change":_vm.handleCurrentChange}},[_c('div',{staticClass:"hb-pagination-slot"},[_c('div',{attrs:{"slot":"input"},slot:"input"},[_c('span',{staticClass:"hb-pagination-slot_text"},[_vm._v("第")]),_c('el-input',{staticClass:"hb-pagination-slot_input",attrs:{"clearable":false},on:{"input":_vm.handleCurrentInput,"blur":_vm.handleCurrentBlur},model:{value:(_vm.pageData.pageNum),callback:function ($$v) {_vm.$set(_vm.pageData, "pageNum", $$v)},expression:"pageData.pageNum"}}),_c('span',{staticClass:"hb-pagination-slot_text"},[_vm._v("共"+_vm._s(_vm.pageNumber)+"页")])],1)])]):_vm._e(),(_vm.showFilter)?_c('hb-filterdrop',_vm._g(_vm._b({attrs:{"columns":_vm.columns,"placement":_vm.placement,"disabledFilter":_vm.disabledFilter}},'hb-filterdrop',_vm.$attrs,false),_vm.$listeners),[_c('i',{staticClass:"hb-pagination__dropdown-icon icon-hb-peizhi",attrs:{"slot":"dropdown"},slot:"dropdown"})]):_vm._e()],1)}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/pagination/src/main.vue?vue&type=template&id=737ad066&
+// CONCATENATED MODULE: ./packages/pagination/src/main.vue?vue&type=template&id=355b6cb3&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
 var es_number_constructor = __webpack_require__("a9e3");
@@ -23748,9 +23760,6 @@ var es_number_constructor = __webpack_require__("a9e3");
       }
 
       this.handleCurrentChange(currentPage);
-    },
-    columnsChange: function columnsChange(newColumns) {
-      this.$emit("columnsChange", newColumns);
     }
   }
 });
@@ -26190,12 +26199,12 @@ _src_main_vue__WEBPACK_IMPORTED_MODULE_1__["default"].install = function (Vue) {
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/tool-group/src/main.vue?vue&type=template&id=042a6e08&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/tool-group/src/main.vue?vue&type=template&id=751abba2&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"hb-toolgroup"},[_c('div',{staticClass:"hb-toolgroup__prefix"},_vm._l((_vm.validIcons),function(item){return _c('el-button',{key:item.event,attrs:{"type":"primary","size":"mini","icon":item.icon},on:{"click":function($event){return _vm.handleClickIcon(item)}}},[_vm._v(_vm._s(item.text))])}),1),_c('div',{staticClass:"hb-toolgroup__inner"},[_vm._t("default")],2),(_vm.useKw)?_c('div',{staticClass:"hb-toolgroup__suffix"},[_c('el-input',{attrs:{"placeholder":_vm.placeholder,"prefix-icon":"el-icon-search","size":"mini","clearable":""},nativeOn:{"keypress":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.handleSearch.apply(null, arguments)}},model:{value:(_vm.params[_vm.kwkey]),callback:function ($$v) {_vm.$set(_vm.params, _vm.kwkey, $$v)},expression:"params[kwkey]"}},[_c('template',{slot:"append"},[_c('span',{staticClass:"append-text",on:{"click":_vm.handleSearch}},[_vm._v("搜索")])])],2)],1):_vm._e()])}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/tool-group/src/main.vue?vue&type=template&id=042a6e08&
+// CONCATENATED MODULE: ./packages/tool-group/src/main.vue?vue&type=template&id=751abba2&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 5 modules
 var toConsumableArray = __webpack_require__("2909");
@@ -26311,7 +26320,6 @@ var config = __webpack_require__("9d9b");
         _loop(i);
       }
 
-      console.log(targets, 12345);
       return targets;
     }
   },
@@ -26880,7 +26888,7 @@ module.exports = patchedExec;
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav-menu/src/main.vue?vue&type=template&id=73f71f99&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/nav-menu/src/main.vue?vue&type=template&id=cef5a0d8&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"hb-navmenu",class:[
     _vm.isAbsolute ? (_vm.isCollapse ? 'hb-navmenu--open' : '') : '',
     _vm.isTransition ? 'hb-navmenu--transition' : '' ]},[_c('nav',{staticClass:"hb-navmenu-main"},[_vm._t("logo"),_vm._l((_vm.data),function(item,index){return _c('div',{key:index,class:_vm.isActive(index)
@@ -26895,7 +26903,7 @@ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._sel
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/nav-menu/src/main.vue?vue&type=template&id=73f71f99&
+// CONCATENATED MODULE: ./packages/nav-menu/src/main.vue?vue&type=template&id=cef5a0d8&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
 var defineProperty = __webpack_require__("ade3");
@@ -27204,7 +27212,6 @@ var es_array_concat = __webpack_require__("99af");
         } else {
           this.isPlatform = item.isPlatform;
           var index = item.isPlatform ? 1 : 0;
-          console.log(item.isPlatform, this.subNnavMenuList);
           this.$router.push(Object(defineProperty["a" /* default */])({}, this.pushWay, "".concat(addBase ? this.baseUrl : "").concat(this.subNnavMenuList[index][this.routerKey])));
         }
 
@@ -27668,12 +27675,12 @@ $({ target: 'Array', proto: true, forced: ES3_STRINGS || !STRICT_METHOD }, {
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/adv-query/src/main.vue?vue&type=template&id=135b73cc&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/adv-query/src/main.vue?vue&type=template&id=3521d38c&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"hb-advquery"},[_c('div',{staticClass:"hb-advquery-handles"},[_c('div',{staticClass:"hb-advquery__tools"},[_vm._t("tools")],2),_c('div',{staticClass:"hb-advquery-query-btn"},[(_vm.showAdvQuery)?_c('el-button',{staticClass:"hb-advquery-query-btn__item",class:_vm.extend ? 'hb-advquery-btn-extend' : 'hb-advquery-btn-unextend',attrs:{"size":"mini","icon":"icon-hb-gaojichaxun"},on:{"click":function($event){_vm.extend ? _vm.unextend() : _vm.extendFrom()}}},[_vm._v(" 高级查询 ")]):_vm._e(),_vm._t("cusBtn"),(_vm.showCusQuery)?_c('el-dropdown',{attrs:{"trigger":"click","size":"small"}},[(_vm.customQueryLabel.length > 10)?_c('div',{staticClass:"hb-advquery-query-btn__custom"},[_c('el-tooltip',{attrs:{"content":_vm.customQueryLabel}},[_c('span',[_vm._v(_vm._s(_vm.customQueryLabel.slice(0, 10) + "..."))])])],1):_c('div',{staticClass:"hb-advquery-query-btn__custom"},[_vm._v(" "+_vm._s(_vm.customQueryLabel)+" ")]),_c('el-dropdown-menu',{attrs:{"slot":"dropdown"},slot:"dropdown"},[_c('el-dropdown-item',[_c('span',{on:{"click":function($event){return _vm.customQuery({ label: '全部', value: 'all' })}}},[_vm._v("全部")])]),_c('el-dropdown-item',[_vm._t("dropdownSlotItem")],2),_vm._l((_vm.customQueryData),function(i,index){return _c('el-dropdown-item',{key:index,attrs:{"command":i.value}},[(i.label.length > 10)?_c('span',[_c('el-tooltip',{attrs:{"content":_vm.customQueryLabel}},[_c('span',{staticClass:"hb-advquery-query-btn__custom__dropdown-item",on:{"click":function($event){return _vm.customQuery(i)}}},[_vm._v(_vm._s(i.label.slice(0, 10) + "..."))])])],1):_c('span',{staticClass:"hb-advquery-query-btn__custom__dropdown-item",on:{"click":function($event){return _vm.customQuery(i)}}},[_vm._v(_vm._s(i.label))]),_c('i',{staticClass:"\n                icon-hb-shanchu\n                hb-advquery-query-btn__custom__handle-btn\n              ",attrs:{"size":"mini"},on:{"click":function($event){return _vm.deleteCus(i)}}}),_c('i',{staticClass:"icon-hb-bianji hb-advquery-query-btn__custom__handle-btn",attrs:{"size":"mini"},on:{"click":function($event){return _vm.editCus(i)}}})])}),_c('span',{on:{"click":_vm.addCus}},[_c('el-dropdown-item',{attrs:{"divided":"","icon":"el-icon-plus"}},[_vm._v(" 新建筛选")])],1)],2)],1):_vm._e(),(_vm.showRefresh)?_c('el-button',{staticClass:"hb-advquery-query-btn__item",attrs:{"size":"mini","icon":"icon-hb-shuaxin"},on:{"click":_vm.refresh}},[_vm._v(" 刷新 ")]):_vm._e()],2)]),_c('div',{staticClass:"hb-advquery-form",class:_vm.extend ? 'hb-advquery-form-extend' : 'hb-advquery-form-unextend',attrs:{"id":"qry-form"}},[_c('el-form',{directives:[{name:"layout-flex",rawName:"v-layout-flex.end",value:({ gutter: 50 }),expression:"{ gutter: 50 }",modifiers:{"end":true}}],ref:"queryForm",staticClass:"hb-advquery-form__content",attrs:{"model":_vm.qryFormData,"label-position":"top","rules":_vm.rules}},[_vm._l((_vm.qryFormProps),function(i,index){return _c('el-form-item',{key:i.prop + index,staticClass:"hb-advquery-form__item",attrs:{"label":i.label,"prop":i.prop ? i.prop : ''}},[_c('hb-query-form',_vm._b({attrs:{"formProp":i,"qryFormData":_vm.qryFormData},on:{"search":_vm.advQuery}},'hb-query-form',i.bind,false),[_c('template',{attrs:{"index":index},slot:i.prop},[_vm._t(i.prop)],2)],2)],1)}),_c('div',{staticClass:"hb-advquery-search-button"},[_c('el-button',{staticClass:"hb-advquery-search-button__btn",attrs:{"size":"small","type":"primary"},on:{"click":_vm.advQuery}},[_vm._v("查询")]),_c('el-button',{staticClass:"hb-advquery-search-button__btn",attrs:{"size":"small"},on:{"click":_vm.reset}},[_vm._v("重置")]),_c('el-button',{staticClass:"el-icon-arrow-up hb-advquery-search-button__extend",attrs:{"size":"small"},on:{"click":_vm.unextend}})],1)],2)],1),_c('hb-custom-query',{ref:"dialog",attrs:{"qryFormProps":_vm.qryFormProps,"qryFormData":_vm.qryFormData},on:{"customQuerySave":_vm.customQuerySave}})],1)}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/adv-query/src/main.vue?vue&type=template&id=135b73cc&
+// CONCATENATED MODULE: ./packages/adv-query/src/main.vue?vue&type=template&id=3521d38c&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.json.stringify.js
 var es_json_stringify = __webpack_require__("e9c4");
@@ -27944,7 +27951,6 @@ var es_string_iterator = __webpack_require__("3ca3");
      * 自定义筛选点击查询
      */
     customQuery: function customQuery(val) {
-      console.log(val);
       this.customQueryLabel = val.label;
       this.$emit("customQuery", val);
     },
@@ -27989,7 +27995,6 @@ var es_string_iterator = __webpack_require__("3ca3");
      * 查询回调
      */
     advQuery: function advQuery() {
-      console.log(this.qryFormData);
       this.$emit("advQuery", this.qryFormData);
     },
 
@@ -28058,7 +28063,6 @@ var es_string_iterator = __webpack_require__("3ca3");
           //计算子元素的宽度和插入工具节点的个数
           var clientWidth = el.clientWidth - 8; //总宽度
 
-          console.log("clientWidth", clientWidth);
           var minWidth = ((_binding$value = binding.value) === null || _binding$value === void 0 ? void 0 : _binding$value.minWidth) || 280; //子元素最小宽度
 
           var gutter = ((_binding$value2 = binding.value) === null || _binding$value2 === void 0 ? void 0 : _binding$value2.gutter) || 20; //子元素之间的间距
@@ -35771,12 +35775,12 @@ $({ target: 'Object', stat: true, forced: Object.assign !== assign }, {
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/full-table/src/main.vue?vue&type=template&id=f8f835ee&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"hb-fulltable",style:(("height: " + _vm.height))},[_c('div',{staticClass:"hb-fulltable__body"},[_c('hb-table',_vm._g(_vm._b({ref:"table",staticClass:"hb-fulltable__body--inner",attrs:{"tableData":_vm.tableData,"columns":_vm.columns}},'hb-table',_vm.$attrs,false),_vm.$listeners),[_vm._l((_vm.columns),function(item,index){return [_c('template',{attrs:{"index":index},slot:item.prop},[_vm._t(item.prop,null,{"column":item})],2)]})],2)],1),(_vm.paging)?_c('div',{staticClass:"hb-fulltable__footer"},[_c('hb-pagination',_vm._b({attrs:{"columns":_vm.columns,"pageData":_vm.pageData,"pageSizes":_vm.pageSizes,"showFilter":_vm.showFilter,"placement":_vm.placement,"disabledFilter":_vm.disabledFilter},on:{"pageSizeChange":_vm.handlePageSizeChange,"pageNumChange":_vm.handlePageNumChange,"columnsChange":_vm.handleColumnsChange}},'hb-pagination',_vm.$attrs,false))],1):_vm._e()])}
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/full-table/src/main.vue?vue&type=template&id=56f89e36&
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"hb-fulltable",style:(("height: " + _vm.height))},[_c('div',{staticClass:"hb-fulltable__body"},[_c('hb-table',_vm._g(_vm._b({ref:"table",staticClass:"hb-fulltable__body--inner",attrs:{"tableData":_vm.tableData,"columns":_vm.columns}},'hb-table',_vm.$attrs,false),_vm.$listeners),[_vm._l((_vm.columns),function(item,index){return [_c('template',{attrs:{"index":index},slot:item.prop},[_vm._t(item.prop,null,{"column":item})],2)]})],2)],1),(_vm.paging)?_c('div',{staticClass:"hb-fulltable__footer"},[_c('hb-pagination',_vm._g(_vm._b({attrs:{"columns":_vm.columns,"pageData":_vm.pageData,"pageSizes":_vm.pageSizes,"showFilter":_vm.showFilter,"placement":_vm.placement,"disabledFilter":_vm.disabledFilter},on:{"pageSizeChange":_vm.handlePageSizeChange,"pageNumChange":_vm.handlePageNumChange}},'hb-pagination',_vm.$attrs,false),_vm.$listeners))],1):_vm._e()])}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/full-table/src/main.vue?vue&type=template&id=f8f835ee&
+// CONCATENATED MODULE: ./packages/full-table/src/main.vue?vue&type=template&id=56f89e36&
 
 // CONCATENATED MODULE: ./packages/full-table/src/config.js
 /* harmony default export */ var config = ({
@@ -35956,13 +35960,6 @@ var staticRenderFns = []
      */
     handlePageNumChange: function handlePageNumChange(num) {
       this.$emit("pageNumChange", num);
-    },
-
-    /**
-     * @event handleColumnsChange 切换列顺序、显示
-     */
-    handleColumnsChange: function handleColumnsChange(newColumns) {
-      this.$emit("columnsChange", newColumns);
     }
   }
 });
@@ -36208,12 +36205,12 @@ if (!TO_STRING_TAG_SUPPORT) {
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/filter-drop/src/main.vue?vue&type=template&id=10f9d07e&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"hb-filterdrop",class:_vm.disabledFilter ? 'hb-filterdrop--disabled' : ''},[_c('el-dropdown',{ref:"dropdown",attrs:{"trigger":"click","placement":_vm.placement,"indeterminate":true,"hide-on-click":false},on:{"visible-change":_vm.visibleEvent}},[_c('span',{staticClass:"changeData"},[_vm._t("dropdown")],2),_c('el-dropdown-menu',{staticClass:"hb-filterdrop__dropdown-selectMenu",attrs:{"slot":"dropdown"},slot:"dropdown"},[_c('DragAble',{staticClass:"hb-filterdrop__main-darggable",attrs:{"infinite-scroll-immediate":"false","infinite-scroll-disabled":"false"},model:{value:(_vm.checkList),callback:function ($$v) {_vm.checkList=$$v},expression:"checkList"}},[_vm._l((_vm.checkList),function(item,index){return [(item.currentSelect !== undefined && !item.fixed)?_c('div',{key:index,staticClass:"hb-filterdrop__darggable-selectItem"},[_c('el-checkbox',{staticClass:"hb-filterdrop__custom-drop-checkbox",attrs:{"disabled":item.disabled},model:{value:(item.currentSelect),callback:function ($$v) {_vm.$set(item, "currentSelect", $$v)},expression:"item.currentSelect"}}),_c('span',[_vm._v(_vm._s(item.label))])],1):_vm._e()]})],2),_c('div',{staticClass:"hb-filterdrop__custom-dropdown-btn"},[_c('el-button',{attrs:{"loading":_vm.loading,"type":"primary"},on:{"click":_vm.save}},[_vm._v("保存")]),_c('el-button',{on:{"click":_vm.close}},[_vm._v("取消")])],1)],1)],1),(false)?undefined:_vm._e(),(_vm.disabledFilter)?_c('div',{staticClass:"hb-filterdrop__cover"}):_vm._e()],1)}
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5b671419-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/filter-drop/src/main.vue?vue&type=template&id=b943d1b0&
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"hb-filterdrop",class:_vm.disabledFilter ? 'hb-filterdrop--disabled' : ''},[_c('el-dropdown',{ref:"dropdown",attrs:{"trigger":"click","placement":_vm.placement,"indeterminate":true,"hide-on-click":false},on:{"visible-change":_vm.visibleEvent}},[_c('span',{staticClass:"changeData"},[_vm._t("dropdown")],2),_c('el-dropdown-menu',{staticClass:"hb-filterdrop__dropdown-selectMenu",attrs:{"slot":"dropdown"},slot:"dropdown"},[_c('DragAble',{staticClass:"hb-filterdrop__main-darggable",attrs:{"infinite-scroll-immediate":"false","infinite-scroll-disabled":"false"},model:{value:(_vm.checkList),callback:function ($$v) {_vm.checkList=$$v},expression:"checkList"}},[_vm._l((_vm.checkList),function(item,index){return [(item.currentSelect !== undefined && !item.fixed)?_c('div',{key:index,staticClass:"hb-filterdrop__darggable-selectItem"},[_c('el-checkbox',{staticClass:"hb-filterdrop__custom-drop-checkbox",attrs:{"disabled":item.disabled},model:{value:(item.currentSelect),callback:function ($$v) {_vm.$set(item, "currentSelect", $$v)},expression:"item.currentSelect"}}),_c('span',[_vm._v(_vm._s(item.label))])],1):_vm._e()]})],2),_c('div',{staticClass:"hb-filterdrop__custom-dropdown-btn"},[_c('el-button',{attrs:{"loading":_vm.loading,"type":"primary"},on:{"click":_vm.save}},[_vm._v("保存")]),_c('el-button',{on:{"click":_vm.close}},[_vm._v("取消")])],1)],1)],1),(_vm.showColumnsWidth)?_c('div',{staticClass:"hb-filterdrop__save-width icon-hb-liekuanbaocun",on:{"click":_vm.saveWidth}},[_c('span',[_vm._v("保存列宽")])]):_vm._e(),(_vm.disabledFilter)?_c('div',{staticClass:"hb-filterdrop__cover"}):_vm._e()],1)}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/filter-drop/src/main.vue?vue&type=template&id=10f9d07e&
+// CONCATENATED MODULE: ./packages/filter-drop/src/main.vue?vue&type=template&id=b943d1b0&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
 var es_array_map = __webpack_require__("d81d");
@@ -36299,6 +36296,10 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
   },
   props: {
     // 列配置
+    showColumnsWidth: {
+      type: Boolean,
+      default: false
+    },
     columns: {
       type: Array,
       default: function _default() {
@@ -36318,26 +36319,43 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
   },
   methods: {
     save: function save() {
-      var _this = this;
-
       this.loading = true;
-
-      if (this.$attrs.saveColumnsInfo) {
-        this.$attrs.saveColumnsInfo(this.filterColumns(this.checkList)).then(function () {
-          _this.loading = false;
-
-          _this.$emit("columnsChange", _this.checkList);
-
-          _this.$refs.dropdown.hide();
-        });
-      } else {
-        this.loading = false;
-        this.$emit("columnsChange", this.checkList);
-        this.$refs.dropdown.hide();
-      }
-    },
-    saveColumnsWidth: function saveColumnsWidth() {
-      this.$attrs.saveColumnsWidth();
+      this.$emit("columnsChange", this.checkList, this); // if (this.$attrs.saveColumnsInfo) {
+      //   this.$attrs
+      //     .saveColumnsInfo(this.filterColumns(this.checkList))
+      //     .then(() => {
+      //       this.loading = false;
+      //       this.$emit("columnsChange", this.checkList);
+      //       this.$refs.dropdown.hide();
+      //     });
+      // } else {
+      //   this.loading = false;
+      //   this.$emit("columnsChange", this.checkList);
+      //   this.$refs.dropdown.hide();
+      // }
+      // this.$refs.dropdown.hide();
+      // this.loading = true
+      // this.$attrs.saveColumnsOrder(this.checkList).then((columns)=>{
+      //   // columns是表格初始化列配置数据
+      //   this.$refs.dropdown.hide();
+      //   columns.forEach((item,index,arr)=>{
+      //   let targetIndex = this.checkList.findIndex(i=>i.prop === item.prop)
+      //   //将originColumns的disabled属性和顺序合并到localCloumns上
+      //   if (targetIndex != -1) {
+      //     arr[index] = Object.assign(item, {
+      //       index: targetIndex,//先记录顺序，后面排序
+      //       disabled:this.checkList[targetIndex].disabled
+      //     });
+      //   }
+      // })
+      // }).catch(()=>{
+      //   this.onClose()
+      // }).finally(()=>{
+      //   this.loading = false
+      // })
+    },
+    saveWidth: function saveWidth() {
+      this.$emit("columnsWidthChange");
     },
     filterColumns: function filterColumns(colums) {
       return colums.map(function (item) {
@@ -36348,13 +36366,11 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
       });
     },
     close: function close() {
-      this.$refs.dropdown.hide();
-    },
-    onOpen: function onOpen() {
+      this.$refs.dropdown.hide(); //还原list
+
       this.checkList = this.$lodash.cloneDeep(this.columns);
     },
-    onClose: function onClose() {
-      //还原list
+    onOpen: function onOpen() {
       this.checkList = this.$lodash.cloneDeep(this.columns);
     },
     visibleEvent: function visibleEvent(e) {