@indfnd/common 1.0.71 → 1.0.74

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 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.
 
+### [1.0.74](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.73...v1.0.74) (2024-12-20)
+
+
+### Features
+
+* 树选择点清除bug修复 ([4800c52](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/4800c522090209b23666448a369e1a65860dc974))
+
+### [1.0.73](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.72...v1.0.73) (2024-12-20)
+
+### [1.0.72](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.71...v1.0.72) (2024-12-20)
+
+
+### Features
+
+* 顶部导航样式优化 ([57e9fb6](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/57e9fb6255067fdc2abac998e479455d321729ca))
+* 顶部导航样式优化 ([be875f5](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/be875f5e73b1cff2f6a5469425c1af539e641e09))
+
 ### [1.0.71](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.70...v1.0.71) (2024-12-14)
 
 

package/dist/ind-common.es.js

@@ -1,4 +1,4 @@
-import { Button as Button$1, ButtonGroup as ButtonGroup$1, Input, Drawer as Drawer$1, Dropdown as Dropdown$1, Modal as Modal$1, Form, FormItem, Select as Select$1, Option, Row, Col, Menu, MenuItem, Badge, DropdownMenu, DropdownItem, Submenu, Tag, Header, Layout, Content, Spin, Poptip as Poptip$1, CheckboxGroup, Checkbox, RadioGroup, Radio, Card, Message, LoadingBar } from "view-design";
+import { Button as Button$1, ButtonGroup as ButtonGroup$1, Input, Drawer as Drawer$1, Dropdown as Dropdown$1, Modal as Modal$1, Form, FormItem, Select as Select$1, Option, Row, Col, Menu, MenuItem, Submenu, Badge, DropdownMenu, DropdownItem, Tag, Header, Layout, Content, Spin, Poptip as Poptip$1, CheckboxGroup, Checkbox, RadioGroup, Radio, Card, Message, LoadingBar } from "view-design";
 import { isNil, putOssFileApi, formatDate as formatDate$1, useConfig, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, getPreviewUrlApi, isFunction, isString, uuid, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, getPermissionCache, getLocalStorage, getSessionStorage, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, isEqual, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, listComTreeApi, listUserTreeApi, UC_ENUM, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, setSessionStorage, getAppListApi, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
 import Vue$1 from "vue";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
@@ -5460,7 +5460,7 @@ var lodash = { exports: {} };
 })(lodash, lodash.exports);
 var _ = lodash.exports;
 const name$1 = "@indfnd/common";
-const version = "1.0.70";
+const version = "1.0.73";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -57573,26 +57573,138 @@ var render$U = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("div", { staticClass: "custom-bread-crumb" }, [_c("Menu", { attrs: { "mode": "horizontal", "active-name": _vm.appInfo.appId }, on: { "on-select": _vm.handleAppMenu } }, _vm._l(_vm.appList, function(item2) {
-    return _c("MenuItem", { key: item2.appId, attrs: { "name": item2.appId } }, [_c("Icons", { attrs: { "type": item2.icon } }), _vm._v(" " + _vm._s(item2.name) + " ")], 1);
-  }), 1)], 1);
+  return _c("div", { staticClass: "pro-layout-nav-wrapper custom-bread-crumb" }, [_c("Menu", { ref: "topNav", attrs: { "mode": "horizontal", "theme": "dark", "active-name": _vm.appInfo.appId }, on: { "on-select": _vm.handleAppMenu } }, [_vm._l(_vm.topMenList, function(item2) {
+    return [!item2.children ? _c("MenuItem", { key: item2.appId, attrs: { "name": item2.appId } }, [_c("Icon", { directives: [{ name: "show", rawName: "v-show", value: _vm.systemInfo.navLogo === "1", expression: "systemInfo.navLogo === '1'" }], attrs: { "type": item2.icon, "size": 20 } }), _vm._v(_vm._s(item2.name) + " "), _c("div", { staticClass: "line" })], 1) : _c("Submenu", { key: item2.name, staticClass: "ibp-nav-sub-menu", attrs: { "name": item2.name } }, [_c("template", { slot: "title" }, [_vm._v(" " + _vm._s(item2.name) + " ")]), _vm._l(item2.children, function(itemL2) {
+      return _c("MenuItem", { key: itemL2.appId, attrs: { "name": itemL2.appId } }, [_c("Icon", { directives: [{ name: "show", rawName: "v-show", value: _vm.systemInfo.navLogo === "1", expression: "systemInfo.navLogo === '1'" }], attrs: { "type": itemL2.icon, "size": 20 } }), _vm._v(_vm._s(itemL2.name))], 1);
+    })], 2)];
+  }), _vm.otherList.length > 0 ? _c("Submenu", { attrs: { "name": "other" } }, [_c("template", { slot: "title" }, [_vm._v(" ... ")]), _vm._l(_vm.otherList, function(item2) {
+    return _c("MenuItem", { key: item2.appId, attrs: { "name": item2.appId } }, [_c("Icon", { directives: [{ name: "show", rawName: "v-show", value: _vm.systemInfo.navLogo === "1", expression: "systemInfo.navLogo === '1'" }], attrs: { "type": item2.icon, "size": 20 } }), _vm._v(_vm._s(item2.name) + " ")], 1);
+  })], 2) : _vm._e()], 2)], 1);
 };
 var staticRenderFns$U = [];
-var appMenu_vue_vue_type_style_index_0_scoped_true_lang = "";
+var appMenu_vue_vue_type_style_index_0_lang = "";
 const __vue2_script$V = {
   name: "IndAppMenu",
-  components: { Menu, MenuItem, Icons },
+  components: { Menu, MenuItem, Icons, Submenu },
   props: {
     appList: { type: Array, default: () => [] }
   },
+  data() {
+    return {
+      systemInfo: {},
+      navList: [],
+      topMenList: [],
+      otherList: [],
+      topMenuNum: 99,
+      lastTopMenuNum: -1,
+      acceptAppId: ""
+    };
+  },
   computed: {
     appInfo() {
       return this.$store.getters.getAppInfo;
     }
   },
+  created() {
+    this.getAppMenu();
+  },
+  mounted() {
+    setTimeout(() => {
+      this.calcTopMenus();
+    }, 1e3);
+  },
+  watch: {
+    appList: {
+      handler() {
+        this.getAppMenu();
+      },
+      deep: true
+    }
+  },
   methods: {
+    getAppMenu() {
+      let data = _.cloneDeep(this.appList);
+      console.log("appList changed", data);
+      _.forEach(data, (app2) => {
+        var _a;
+        let extendProps = app2.extendProps;
+        let extendPropsL2 = extendProps == null ? void 0 : extendProps.extendProps;
+        app2.parentName = extendPropsL2 ? (_a = JSON.parse(extendPropsL2)) == null ? void 0 : _a.parentName : "";
+      });
+      console.log("data", data);
+      if (_.some(data, (app2) => app2.parentName)) {
+        console.log("render group");
+        let rlt = _.reduce(
+          data,
+          (acc, cur) => {
+            if (cur.parentName) {
+              let curApp = _.find(acc, { name: cur.parentName });
+              if (curApp) {
+                curApp.children.push(cur);
+              } else {
+                acc.push({
+                  name: cur.parentName,
+                  children: [cur]
+                });
+              }
+            } else {
+              acc.push(cur);
+            }
+            return acc;
+          },
+          []
+        );
+        this.navList = rlt;
+      } else {
+        this.navList = data;
+      }
+      this.lastTopMenuNum = this.topMenuNum;
+      if (this.navList.length > this.topMenuNum) {
+        let navList = _.cloneDeep(this.navList);
+        this.topMenList = navList.splice(0, this.topMenuNum);
+        this.otherList = navList;
+      } else {
+        this.topMenList = this.navList;
+        this.otherList = [];
+      }
+      if (this.navList.length > 0) {
+        let appId = this.navList[0].appId;
+        for (let i = 0; i < this.navList.length; i++) {
+          if (this.navList[i].selected == true) {
+            appId = this.navList[i].appId;
+          }
+        }
+        if (this.activeName) {
+          appId = this.activeName;
+        }
+        this.handleAppMenu(appId);
+      }
+    },
     handleAppMenu(appId) {
       this.$store.commit("setAppInfo", appId);
+    },
+    calcTopMenus() {
+      var _a;
+      let docWidth = document.getElementsByTagName("body")[0].clientWidth;
+      let triggerBoxWidth = document.getElementsByClassName("sys-name")[0].clientWidth;
+      let logoBoxWidth = document.getElementsByClassName("custom-bread-crumb")[0].clientWidth;
+      let toolsBoxWidth = document.getElementsByClassName("custom-content-con")[0].clientWidth;
+      let othersWidth = 80;
+      let remainSpace = docWidth - triggerBoxWidth - logoBoxWidth - toolsBoxWidth - othersWidth;
+      let topMenuNumCalc = 0;
+      let sumWidth = 0;
+      (_a = document.querySelectorAll(".pro-layout-nav-wrapper>.ivu-menu>li")) == null ? void 0 : _a.forEach((dom) => {
+        sumWidth += dom.clientWidth;
+        if (sumWidth < remainSpace) {
+          topMenuNumCalc++;
+        }
+      });
+      console.log("topMenuNumCalc", topMenuNumCalc, "this.topMenuNum", this.topMenuNum);
+      if (topMenuNumCalc && this.topMenuNum > topMenuNumCalc) {
+        this.topMenuNum = topMenuNumCalc;
+        console.log("this.topMenuNum", this.topMenuNum);
+        this.getAppMenu();
+      }
     }
   }
 };
@@ -57603,7 +57715,7 @@ var __component__$V = /* @__PURE__ */ normalizeComponent(
   staticRenderFns$U,
   false,
   __vue2_injectStyles$V,
-  "f5dbd2ca",
+  null,
   null,
   null
 );
@@ -60138,6 +60250,7 @@ const __vue2_script$y = {
       this.searchValue = "";
       this.$refs.tree.clearCheckedAndSelectedNodes();
       this.selectedTitles = "";
+      this.$emit("input", []);
     },
     updateSearchNum(data) {
       this.searchNum = data;
@@ -60188,7 +60301,7 @@ var __component__$y = /* @__PURE__ */ normalizeComponent(
   staticRenderFns$x,
   false,
   __vue2_injectStyles$y,
-  "122a4764",
+  "2be5af4a",
   null,
   null
 );