@indfnd/common 0.1.10 → 0.1.12

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 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.12](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.11...v0.1.12) (2024-03-29)
+
+### [0.1.11](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.10...v0.1.11) (2024-03-29)
+
+
+### Features
+
+* 报表选择指标组件优化 ([aea5c94](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/aea5c94b29eeda13c8e42c8e8ce58ea17297101f))
+* 优化报表选择组件 ([b2b8535](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/b2b8535aab2e4770f93c09e9b429ce37456fe66a))
+
 ### [0.1.10](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.9...v0.1.10) (2024-03-29)
 
 ### [0.1.9](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.8...v0.1.9) (2024-03-29)

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, 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.9";
+const version = "0.1.11";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -48976,112 +48976,6 @@ var FormImpl = {
                 },
                 "\u91CD\u7F6E"
               ),
-              h(
-                "IndDropdown",
-                {
-                  on: {
-                    "on-click": (val) => {
-                      console.log("on-click", val);
-                      this.$emit("setCondition", val);
-                    }
-                  }
-                },
-                [
-                  h(
-                    "IndButton",
-                    {
-                      props: { bizType: "reset" }
-                    },
-                    "\u9884\u7F6E"
-                  ),
-                  h(
-                    "DropdownMenu",
-                    {
-                      slot: "list"
-                    },
-                    [
-                      ...this.formCacheList.map((d) => {
-                        return h(
-                          "DropdownItem",
-                          {
-                            props: {
-                              name: d.id,
-                              selected: d.id == this.curCacheId
-                            }
-                          },
-                          d.titleName
-                        );
-                      }),
-                      h(
-                        "DropdownItem",
-                        {
-                          props: {
-                            divided: true,
-                            name: "manager"
-                          }
-                        },
-                        [
-                          h(
-                            "IndButtonGroup",
-                            {
-                              style: {
-                                margin: "0"
-                              }
-                            },
-                            [
-                              h(
-                                "IndButton",
-                                {
-                                  props: {
-                                    bizType: "reset"
-                                  },
-                                  on: {
-                                    click: (event) => {
-                                      this.$emit("setCondition", "save");
-                                      event.preventDefault();
-                                    }
-                                  }
-                                },
-                                "\u4FDD\u5B58"
-                              ),
-                              h(
-                                "IndButton",
-                                {
-                                  props: {
-                                    bizType: "reset"
-                                  },
-                                  on: {
-                                    click: (event) => {
-                                      this.$emit("setCondition", "saveAs");
-                                      event.preventDefault();
-                                    }
-                                  }
-                                },
-                                "\u53E6\u5B58\u4E3A"
-                              ),
-                              h(
-                                "IndButton",
-                                {
-                                  props: {
-                                    bizType: "reset"
-                                  },
-                                  on: {
-                                    click: (event) => {
-                                      this.$emit("setCondition", "edit");
-                                      event.preventDefault();
-                                    }
-                                  }
-                                },
-                                "\u8BBE\u7F6E"
-                              )
-                            ]
-                          )
-                        ]
-                      )
-                    ]
-                  )
-                ]
-              ),
               h(
                 "Button",
                 {
@@ -50306,19 +50200,13 @@ var render$W = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("div", { staticClass: "index-manager" }, [_c("IndDropdown", { on: { "on-click": _vm.triggerToogle } }, [_c("IndButton", { attrs: { "bizType": "reset" } }, [_vm._v(" \u5217\u8BBE\u7F6E ")]), _c("DropdownMenu", { attrs: { "slot": "list" }, slot: "list" }, [_vm._l(_vm.indexCacheList, function(indexCache, idx) {
-    return _c("DropdownItem", { key: "index" + idx, attrs: { "name": indexCache.id, "selected": indexCache.id == _vm.curIndex.id } }, [_vm._v(" " + _vm._s(indexCache.titleName) + " ")]);
-  }), _c("DropdownItem", { attrs: { "name": "manage", "divided": "" } }, [_c("IndButtonGroup", [_c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": _vm.saveTableIndex } }, [_vm._v("\u4FDD\u5B58")]), _c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": _vm.saveAsIndex } }, [_vm._v("\u53E6\u5B58\u4E3A")]), _c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": _vm.manageIndex } }, [_vm._v("\u8BBE\u7F6E")])], 1)], 1)], 2)], 1), _c("IndDrawer", { staticClass: "index-manager", attrs: { "width": "800", "title": "\u9884\u7F6E\u5217\u7BA1\u7406", "lazyRender": false }, model: { value: _vm.showManager, callback: function($$v) {
+  return _c("div", { staticClass: "index-manager" }, [_c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": _vm.manageIndex } }, [_vm._v(" \u5217\u7B5B\u9009 ")]), _c("IndDrawer", { staticClass: "index-manager", attrs: { "width": "800", "title": "\u9884\u7F6E\u5217\u7BA1\u7406", "lazyRender": false }, model: { value: _vm.showManager, callback: function($$v) {
     _vm.showManager = $$v;
-  }, expression: "showManager" } }, [_c("div", { staticClass: "ind-flex-column height100" }, [_c("Card", { staticClass: "ind-flex-no-shrink" }, [_c("div", { attrs: { "slot": "title" }, slot: "title" }, [_vm._v("\u9884\u7F6E\u65B9\u6848")]), _c("div", { staticClass: "ind-flex" }, _vm._l(_vm.indexCacheList, function(indexCache, idx) {
-    return _c("Tag", { key: "index-tag" + idx, attrs: { "name": indexCache.id, "closable": "", "color": indexCache.id == _vm.curIndex.id ? "primary" : "default" }, on: { "on-close": _vm.removeIndex } }, [_c("span", { staticStyle: { "cursor": "pointer" }, on: { "click": function($event) {
-      return _vm.editIndex(indexCache);
-    } } }, [_vm._v(_vm._s(indexCache.titleName))])]);
-  }), 1)]), _c("Card", { staticClass: "ind-mt ivu-biz-form-row ind-flex-grow index-manager-height100-card" }, [_c("div", { attrs: { "slot": "title" }, slot: "title" }, [_vm._v("\u8BBE\u7F6E\u65B9\u6848")]), _c("div", { staticClass: "ind-flex-column height100 no-border-left-top" }, [_c("IndFormWrap", { ref: "editForm", staticClass: "ind-flex-no-shrink", attrs: { "gridColumns": 1, "fieldList": _vm.fieldList }, model: { value: _vm.titleForm, callback: function($$v) {
-    _vm.titleForm = $$v;
-  }, expression: "titleForm" } }), _c("IndTable", { ref: "mangeTable", staticStyle: { "padding": "0" }, attrs: { "columns": _vm.manageColumns, "disablePage": "", "showTableOption": false, "isIndexManageTable": "", "rowKey": "headerName" }, model: { value: _vm.curIndex.columnList, callback: function($$v) {
+  }, expression: "showManager" } }, [_c("div", { staticClass: "ind-flex-column height100" }, [_c("IndTable", { ref: "mangeTable", staticStyle: { "padding": "0" }, attrs: { "columns": _vm.manageColumns, "disablePage": "", "showTableOption": false, "isIndexManageTable": "", "rowKey": "headerName" }, model: { value: _vm.curIndex.columnList, callback: function($$v) {
     _vm.$set(_vm.curIndex, "columnList", $$v);
-  }, expression: "curIndex.columnList" } })], 1)])], 1), _c("IndButtonGroup", { attrs: { "slot": "footer", "split": "", "center": "" }, slot: "footer" }, [_c("IndButton", { attrs: { "bizType": "table", "loading": _vm.saving }, on: { "click": _vm.apply } }, [_vm._v(" \u5E94\u7528 ")]), _c("IndButton", { attrs: { "bizType": "primary", "loading": _vm.saving }, on: { "click": _vm.saveIndex } }, [_vm._v(" \u4FDD\u5B58 ")]), _c("IndButton", { attrs: { "bizType": "primary", "loading": _vm.saving }, on: { "click": _vm.saveIndexAsDefault } }, [_vm._v(" \u4FDD\u5B58\u5E76\u8BBE\u4E3A\u9ED8\u8BA4 ")])], 1)], 1)], 1);
+  }, expression: "curIndex.columnList" } })], 1), _c("IndButtonGroup", { attrs: { "slot": "footer", "split": "", "right": "" }, slot: "footer" }, [_c("IndButton", { attrs: { "bizType": "save", "loading": _vm.saving }, on: { "click": _vm.apply } }, [_vm._v(" \u786E\u8BA4 ")]), _c("IndButton", { attrs: { "bizType": "save", "ghost": "", "loading": _vm.saving }, on: { "click": function($event) {
+    _vm.showManager = false;
+  } } }, [_vm._v(" \u53D6\u6D88 ")])], 1)], 1)], 1);
 };
 var staticRenderFns$W = [];
 function deepEach$4(parentNode, list, callback) {
@@ -50512,6 +50400,7 @@ const __vue2_script$14 = {
         dd.checked = _.some(checkRows, { field: dd.field });
       });
       this.$emit("resetColumns", _.cloneDeep(curIndexClone.columnList));
+      this.showManager = false;
     },
     async saveIndex(isDefault) {
       if (await this.$refs.editForm.validate()) {
@@ -60379,12 +60268,21 @@ function addNodeToTree(tree, node) {
     let midPathNode = path2.shift();
     let midNode = _.find(subTree, { id: midPathNode == null ? void 0 : midPathNode.id });
     if (!midNode) {
-      midNode = {
-        pathStr: path2.length == 0 ? node.pathStr : "",
-        id: path2.length == 0 ? node.pathStr : midPathNode == null ? void 0 : midPathNode.id,
-        title: midPathNode == null ? void 0 : midPathNode.title,
-        children: []
-      };
+      if (path2.length == 0) {
+        midNode = {
+          ...node,
+          pathStr: node.pathStr,
+          id: node.pathStr,
+          title: midPathNode == null ? void 0 : midPathNode.title
+        };
+      } else {
+        midNode = {
+          pathStr: path2.length == 0 ? node.pathStr : "",
+          id: path2.length == 0 ? node.pathStr : midPathNode == null ? void 0 : midPathNode.id,
+          title: midPathNode == null ? void 0 : midPathNode.title,
+          children: []
+        };
+      }
       subTree.push(midNode);
     }
     addNodeToTreeInner(midNode.children, path2);
@@ -60460,7 +60358,7 @@ var render$d = function() {
     return _c("div", { key: "dimension1" + idx, staticClass: "report-index-dimension1", class: [dimensionItem1.id == _vm.dimension1.id ? "selected" : ""], on: { "click": function($event) {
       return _vm.chooseDimension1(dimensionItem1);
     } } }, [_vm._v(" " + _vm._s(dimensionItem1.title) + " ")]);
-  }), 0), _c("div", { staticClass: "report-index-index-panel ind-flex-column ind-flex-grow" }, [_c("div", { staticClass: "report-index-options" }, [_vm.dimension1.options.length == 1 ? [_vm._v(" " + _vm._s(_vm.options[0].title || "") + " ")] : [_c("Select", { attrs: { "multiple": "" }, on: { "on-change": _vm.setDisabled1 }, model: { value: _vm.optionsData, callback: function($$v) {
+  }), 0), _c("div", { staticClass: "report-index-index-panel ind-flex-column ind-flex-grow" }, [_c("div", { staticClass: "report-index-options" }, [_vm.dimension1.options.length == 1 ? [_vm._v(" " + _vm._s(_vm.dimension1.options[0].title || "") + " ")] : [_c("Select", { attrs: { "multiple": "" }, on: { "on-change": _vm.setDisabled1 }, model: { value: _vm.optionsData, callback: function($$v) {
     _vm.optionsData = $$v;
   }, expression: "optionsData" } }, _vm._l(_vm.dimension1.options, function(item2) {
     return _c("Option", { key: item2.id, attrs: { "value": item2.id } }, [_vm._v(_vm._s(item2.title))]);
@@ -60490,7 +60388,7 @@ const __vue2_script$d = {
       indexesSouce: [],
       indexes: [],
       dimension1: {
-        options: [],
+        options: [{ id: "", title: "" }],
         indexList: []
       },
       optionsData: [],
@@ -60524,24 +60422,27 @@ const __vue2_script$d = {
       this.removeDisabled = !(indexList2 == null ? void 0 : indexList2.length);
     },
     async initSrc() {
+      var _a, _b;
       if (this.dataApi) {
         const { data } = await this.dataApi(this.searchParams);
         this.indexesSouce = data;
       } else {
         this.indexesSouce = this.options;
       }
-      this.indexesSouce = JSON.parse(JSON.stringify(this.indexesSouce));
-      this.dimension1 = this.indexesSouce[0] || {};
-      this.optionsData = this.dimension1.options.length == 1 ? this.dimension1.options.map((d) => d.id) : [];
-      this.indexListSrc = generateNodeWithPath(this.dimension1, [
-        {
-          id: "ALL",
-          title: "\u5168\u9009",
-          children: this.dimension1.indexList
-        }
-      ]);
-      this.indexList = [];
-      this.initIndexByDefault();
+      if (this.indexesSouce && this.indexesSouce.length) {
+        this.indexesSouce = JSON.parse(JSON.stringify(this.indexesSouce));
+        this.dimension1 = this.indexesSouce[0] || {};
+        this.optionsData = ((_a = this.dimension1.options) == null ? void 0 : _a.length) == 1 ? (_b = this.dimension1.options) == null ? void 0 : _b.map((d) => d.id) : [];
+        this.indexListSrc = generateNodeWithPath(this.dimension1, [
+          {
+            id: "ALL",
+            title: "\u5168\u9009",
+            children: this.dimension1.indexList
+          }
+        ]);
+        this.indexList = [];
+        this.initIndexByDefault();
+      }
     },
     initIndexByDefault() {
       this.choosedIndexList = generateChoosedNodesByInit(this.indexesSouce) || [];