@indfnd/common 0.1.38 → 0.1.40

package/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.40](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.39...v0.1.40) (2024-04-15)
+
+
+### Features
+
+* 列筛选问题修复 ([d4d4c85](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/d4d4c852c17cbf7b2e9e09f4dcd1088bc995cd75))
+
+### [0.1.39](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.38...v0.1.39) (2024-04-15)
+
+
+### Features
+
+* 表格表头样式问题修复 ([868b1a4](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/868b1a4fd12f9782536c3b6086cc1ad1ed4716c9))
+* 表格表头永久换行，不支持不换行 ([f735b7b](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/f735b7b0dc382d33c9e1ad689e581c5e807e74be))
+* 表格列筛选bug修复 ([9fdbfb1](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/9fdbfb15546ea16459d91b1b4ef08bea0ee8ee49))
+* 表头自动换行支持单元格合并 ([cee1680](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/cee1680f1f37fce440d8d12815f4c3a04f4d40b8))
+* 样式 ([f7fc6c1](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/f7fc6c1378c7d7e52991afb7d52d64a5af753611))
+
+
+### Bug Fixes
+
+* 更新依赖 ([4428331](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/4428331e55c11071813c8a344ef6fcf3437bbe74))
+* 修改行合计设置和卷烟框点击遮罩层条件清空的问题 ([07bca20](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/07bca2093d4d184e958d40244461abcb9d17655e))
+
 ### [0.1.38](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.37...v0.1.38) (2024-04-12)
 
 

package/dist/ind-common.es.js

@@ -2,7 +2,7 @@ import { Button as Button$1, ButtonGroup as ButtonGroup$1, Input, Drawer as Draw
 import { isNil, formatDate as formatDate$1, useConfig, getLocalStorage, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, isFunction, isString, uuid, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, putOssFileApi, isEqual, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionCache, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
 import Vue$1 from "vue";
 const name$1 = "@indfnd/common";
-const version = "0.1.37";
+const version = "0.1.39";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -62,7 +62,7 @@ const dependencies = {
   "xlsx-populate": "^1.11.0"
 };
 const devDependencies = {
-  "@indfnd/utils": "^0.1.0",
+  "@indfnd/utils": "^0.1.3",
   "ag-grid-community": "^30.1.0",
   "ag-grid-enterprise": "^30.1.0",
   "ag-grid-vue": "^30.1.0",
@@ -49074,13 +49074,17 @@ var render$10 = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return !_vm.lazyRender || _vm.isInit ? _c("div", [_c("Modal", _vm._b({ staticClass: "ind-modal", style: _vm.transfer ? _vm.style : null, attrs: { "value": _vm.isShow, "transfer": _vm.transfer, "footerHide": _vm.footerHide }, on: { "on-visible-change": _vm.visibleChange, "on-ok": _vm.ok, "on-cancel": _vm.cancel }, scopedSlots: _vm._u([{ key: "header", fn: function() {
+  return !_vm.lazyRender || _vm.isInit ? _c("div", [_c("Modal", _vm._b({ staticClass: "ind-modal", style: _vm.transfer ? _vm.style : null, attrs: { "value": _vm.isShow, "transfer": _vm.transfer, "footerHide": _vm.footerHide }, on: { "on-visible-change": _vm.visibleChange, "on-ok": _vm.ok, "on-cancel": function($event) {
+    return _vm.cancel("modal");
+  } }, scopedSlots: _vm._u([{ key: "header", fn: function() {
     return void 0;
   }, proxy: true }, { key: "close", fn: function() {
     return void 0;
   }, proxy: true }, { key: "footer", fn: function() {
     return [_vm._t("footer", function() {
-      return [_c("ButtonGroup", { attrs: { "right": "" } }, [_vm.showCancel ? _c("Button", { attrs: { "bizType": "cancel", "loading": _vm.saving }, on: { "click": _vm.cancel } }, [_vm._v(_vm._s(_vm.cancelText))]) : _vm._e(), _c("Button", { attrs: { "bizType": "confirm", "loading": _vm.saving }, on: { "click": _vm.ok } }, [_vm._v(_vm._s(_vm.okText))])], 1)];
+      return [_c("ButtonGroup", { attrs: { "right": "" } }, [_vm.showCancel ? _c("Button", { attrs: { "bizType": "cancel", "loading": _vm.saving }, on: { "click": function($event) {
+        return _vm.cancel("footer-btn");
+      } } }, [_vm._v(_vm._s(_vm.cancelText))]) : _vm._e(), _c("Button", { attrs: { "bizType": "confirm", "loading": _vm.saving }, on: { "click": _vm.ok } }, [_vm._v(_vm._s(_vm.okText))])], 1)];
     })];
   }, proxy: true }], null, true) }, "Modal", _vm.$attrs, false), [_vm._t("default")], 2)], 1) : _vm._e();
 };
@@ -49148,8 +49152,8 @@ const __vue2_script$1a = {
     ok() {
       this.$emit("on-ok");
     },
-    cancel() {
-      this.$emit("on-cancel");
+    cancel(type) {
+      this.$emit("on-cancel", type);
       if (!this.cancelNotClose) {
         this.close();
       }
@@ -52508,9 +52512,10 @@ const __vue2_script$W = {
         let srcColumn = columnDataMap[d.field || d.key || d.type || d.headerName || d.title];
         srcColumn.hide = !d.checked;
         if (d.pinned && d.pinned != "none" || (p == null ? void 0 : p.pinned) && (p == null ? void 0 : p.pinned) != "none") {
-          srcColumn.pinned = d.pinned == "none" ? (p == null ? void 0 : p.pinned) == "none" ? void 0 : p == null ? void 0 : p.pinned : d.pinned;
+          srcColumn.pinned.fixed = srcColumn.pinned = d.pinned == "none" ? (p == null ? void 0 : p.pinned) == "none" ? void 0 : p == null ? void 0 : p.pinned : d.pinned;
         } else {
           delete srcColumn.pinned;
+          delete srcColumn.fixed;
         }
         if (d.width) {
           srcColumn.width = d.width;
@@ -53139,8 +53144,8 @@ const __vue2_script$W = {
         var _a, _b;
         return ((_a = d.children) == null ? void 0 : _a.length) || ((_b = d.treeLevelFlag) == null ? void 0 : _b.length);
       });
+      this.renderTreeFlag(val);
       if (this.treeData) {
-        this.renderTreeFlag(val);
         let rlt = [];
         deepEach$3(null, val, (d, p, idx) => {
           d.seq = idx;
@@ -53153,13 +53158,13 @@ const __vue2_script$W = {
     },
     renderTreeFlag(datas) {
       let treeColDef = _.find(this.columns, { tree: true });
+      deepEach$3(null, datas, (d, parentNode, idx) => {
+        d.uuid = d.uuid || uuid();
+      });
       if (_.isEmpty(treeColDef)) {
         return;
       }
       let treeCol = (treeColDef == null ? void 0 : treeColDef.field) || (treeColDef == null ? void 0 : treeColDef.key);
-      deepEach$3(null, datas, (d, parentNode, idx) => {
-        d.uuid = d.uuid || uuid();
-      });
       deepEach$3(null, datas, (d, parentNode, idx) => {
         d.treeLevelFlag = parentNode ? [...parentNode.treeLevelFlag, d[treeCol]] : [d[treeCol]];
         if (parentNode) {
@@ -62537,7 +62542,7 @@ var render$7 = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("div", [_c("Input", { staticClass: "selected-input", class: { readonly: _vm.readonly }, attrs: { "value": _vm.selectedTitles, "title": _vm.selectedTitles, "readonly": "", "clearable": !_vm.readonly, "placeholder": "\u8BF7\u9009\u62E9" }, on: { "on-focus": _vm.openModal, "on-clear": _vm.doClear } }), _c("Modal", { attrs: { "title": "\u9009\u62E9\u5377\u70DF", "width": 900, "cancelText": "\u6E05\u9664", "cancelNotClose": "" }, on: { "on-ok": _vm.ok, "on-cancel": _vm.clear }, model: { value: _vm.showPanel, callback: function($$v) {
+  return _c("div", [_c("Input", { staticClass: "selected-input", class: { readonly: _vm.readonly }, attrs: { "value": _vm.selectedTitles, "title": _vm.selectedTitles, "readonly": "", "clearable": !_vm.readonly, "placeholder": "\u8BF7\u9009\u62E9" }, on: { "on-focus": _vm.openModal, "on-clear": _vm.doClear } }), _c("Modal", { attrs: { "title": "\u9009\u62E9\u5377\u70DF", "width": 900, "mask-closable": false, "cancelText": "\u6E05\u9664", "cancelNotClose": "" }, on: { "on-ok": _vm.ok, "on-cancel": _vm.cancel }, model: { value: _vm.showPanel, callback: function($$v) {
     _vm.showPanel = $$v;
   }, expression: "showPanel" } }, [_c("ConditionPanel", { attrs: { "conditionDefs": _vm.conditionDefs }, model: { value: _vm.params, callback: function($$v) {
     _vm.params = $$v;
@@ -62610,6 +62615,13 @@ const __vue2_script$7 = {
       this.clear();
       this.emitChange();
     },
+    cancel(type) {
+      if (type === "footer-btn") {
+        this.clear();
+      } else {
+        this.close();
+      }
+    },
     clear() {
       this.params = {};
     },
@@ -62649,7 +62661,7 @@ var render$6 = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("div", [_c("Input", { staticClass: "selected-input", class: { readonly: _vm.readonly }, attrs: { "value": _vm.selectedTitles, "title": _vm.selectedTitles, "readonly": "", "clearable": !_vm.readonly, "placeholder": "\u8BF7\u9009\u62E9" }, on: { "on-focus": _vm.openModal, "on-clear": _vm.doClear } }), _c("Modal", { attrs: { "title": "\u9009\u62E9\u884C\u5C55\u793A", "width": 900, "cancelText": "\u6E05\u9664", "cancelNotClose": "" }, on: { "on-ok": _vm.ok, "on-cancel": _vm.clear }, model: { value: _vm.showPanel, callback: function($$v) {
+  return _c("div", [_c("Input", { staticClass: "selected-input", class: { readonly: _vm.readonly }, attrs: { "value": _vm.selectedTitles, "title": _vm.selectedTitles, "readonly": "", "clearable": !_vm.readonly, "placeholder": "\u8BF7\u9009\u62E9" }, on: { "on-focus": _vm.openModal, "on-clear": _vm.doClear } }), _c("Modal", { attrs: { "title": "\u9009\u62E9\u884C\u5C55\u793A", "width": 900, "mask-closable": false, "cancelText": "\u6E05\u9664", "cancelNotClose": "" }, on: { "on-ok": _vm.ok, "on-cancel": _vm.cancel }, model: { value: _vm.showPanel, callback: function($$v) {
     _vm.showPanel = $$v;
   }, expression: "showPanel" } }, [_c("ConditionPanel", { attrs: { "conditionDefs": _vm.conditionDefs, "isLabelCheckAll": "" }, model: { value: _vm.params, callback: function($$v) {
     _vm.params = $$v;
@@ -62721,6 +62733,13 @@ const __vue2_script$6 = {
       this.clear();
       this.emitChange();
     },
+    cancel(type) {
+      if (type === "footer-btn") {
+        this.clear();
+      } else {
+        this.close();
+      }
+    },
     clear() {
       this.params = {};
     },