@indfnd/common 0.1.91 → 0.1.95

package/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 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.95](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.93...v0.1.95) (2024-06-13)
+
+
+### Features
+
+* 关闭登录页面 ([4cba3ef](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/4cba3ef3cc9a4d3f3fbb6a0da316d65161e0a348))
+
+### [0.1.94](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.93...v0.1.94) (2024-06-13)
+
+
+### Features
+
+* 关闭登录页面 ([4cba3ef](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/4cba3ef3cc9a4d3f3fbb6a0da316d65161e0a348))
+
+### [0.1.93](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.92...v0.1.93) (2024-06-13)
+
+### [0.1.92](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.91...v0.1.92) (2024-06-13)
+
+
+### Features
+
+* 表格组件支持导出excel自动计算合并行定义 ([f9fe99e](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/f9fe99e4e5f3c1e7d47483af7924830c0b12ea91))
+
 ### [0.1.91](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.90...v0.1.91) (2024-06-11)
 
 ### [0.1.90](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.89...v0.1.90) (2024-06-11)

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, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, isFunction, isString, uuid, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, getPermissionCache, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, putOssFileApi, isEqual, getCaptchaURL, getLocalStorage, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, 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.90";
+const version = "0.1.94";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -52159,7 +52159,7 @@ var render$Y = function() {
     return _vm.$emit("revertColumnRow");
   } } }, [_vm._v(" \u8F6C\u7F6E ")]) : _vm._e(), _c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": function($event) {
     return _vm.tableSettingToggle("3");
-  } } }, [_vm._v(" \u5BFC\u51FA ")])], 1), _c("DropdownMenu", { style: { width: _vm.btnSel != "1" ? "400px" : "200px", padding: "5px 10px" }, attrs: { "slot": "list" }, slot: "list" }, [_c("ExportData", { directives: [{ name: "show", rawName: "v-show", value: _vm.btnSel == "3", expression: "btnSel == '3'" }], ref: "exportData", attrs: { "rowSpanDefs": _vm.rowSpanDefs, "exportFileName": _vm.exportFileName, "paramLeft": _vm.paramLeft, "paramRight": _vm.paramRight || _vm.paramRightUnit, "rowSpanColumns": _vm.rowSpanColumns, "rowSpanIndexCol": _vm.rowSpanIndexCol, "pinnedTopRowData": _vm.topRows, "tableColumns": _vm.tableColumns, "data": _vm.tableData, "dataApi": _vm.dataApi, "searchParams": _vm.searchParams, "sortParams": _vm.sortParams, "paginationParams": _vm.paginationParams, "show-summary": _vm.tableShowSummary, "summary-method": _vm.tableSummaryMethod, "parsedColumns": _vm.parsedColumns, "exportEnum": _vm.exportEnum, "data-children": _vm.dataChildren, "defaultUnitType": _vm.defaultUnitType, "unitType": _vm.unitType, "switchCols": _vm.switchCols }, on: { "doExport": function($event) {
+  } } }, [_vm._v(" \u5BFC\u51FA ")])], 1), _c("DropdownMenu", { style: { width: _vm.btnSel != "1" ? "400px" : "200px", padding: "5px 10px" }, attrs: { "slot": "list" }, slot: "list" }, [_c("ExportData", { directives: [{ name: "show", rawName: "v-show", value: _vm.btnSel == "3", expression: "btnSel == '3'" }], ref: "exportData", attrs: { "rowSpanDefs": _vm.rowSpanDefs, "exportFileName": _vm.exportFileName, "paramLeft": _vm.paramLeft, "paramRight": _vm.paramRight || _vm.paramRightUnit, "rowSpanColumns": _vm.rowSpanColumns || _vm.mergeColumns, "rowSpanIndexCol": _vm.rowSpanIndexCol || _vm.mergeIndexCol, "pinnedTopRowData": _vm.topRows, "tableColumns": _vm.tableColumns, "data": _vm.tableData, "dataApi": _vm.dataApi, "searchParams": _vm.searchParams, "sortParams": _vm.sortParams, "paginationParams": _vm.paginationParams, "show-summary": _vm.tableShowSummary, "summary-method": _vm.tableSummaryMethod, "parsedColumns": _vm.parsedColumns, "exportEnum": _vm.exportEnum, "data-children": _vm.dataChildren, "defaultUnitType": _vm.defaultUnitType, "unitType": _vm.unitType, "switchCols": _vm.switchCols }, on: { "doExport": function($event) {
     _vm.optionDropdownVisible = false;
   } } }), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.btnSel == "2", expression: "btnSel == '2'" }], staticStyle: { "border-bottom": "1px solid #e9e9e9", "padding-bottom": "6px", "margin-bottom": "6px" } }, [_c("Checkbox", { attrs: { "value": _vm.checkAll }, on: { "on-change": _vm.handleCheckAll } }, [_vm._v("\u5168\u9009")])], 1), _c("CheckboxGroup", { directives: [{ name: "show", rawName: "v-show", value: _vm.btnSel == "2", expression: "btnSel == '2'" }], on: { "on-change": _vm.checkAllGroupChange }, model: { value: _vm.checkAllGroup, callback: function($$v) {
     _vm.checkAllGroup = $$v;
@@ -52497,6 +52497,17 @@ const __vue2_script$Z = {
     };
   },
   computed: {
+    mergeIndexCol() {
+      let mergeIndex = _.find(this.columns, (d) => {
+        return d.autoMergeRow === true;
+      });
+      return mergeIndex.key || mergeIndex.field;
+    },
+    mergeColumns() {
+      return _.filter(this.columns, (d) => {
+        return !!d.autoMergeRow;
+      }).map((d) => d.key || d.field);
+    },
     paramRightUnit() {
       return _.some(this.flatColumns, (d) => {
         return d.isSwitchUnit;
@@ -64318,7 +64329,11 @@ function createMacroBasicRoutes({ homeComponent, rootChildren } = {}) {
   if (rootChildren && rootChildren.length) {
     rootRouteTemp.children.push(...rootChildren);
   }
-  return [rootRouteTemp, loginRoute, userRoute, notFoundRoute];
+  let routesTmp = [rootRouteTemp, userRoute, notFoundRoute];
+  if (location.host.includes("localhost")) {
+    routesTmp.push(loginRoute);
+  }
+  return routesTmp;
 }
 function createMicroBasicRoutes({ rootChildren } = {}) {
   const rootRouteTemp = _.cloneDeep(rootRoute);