@indfnd/common 0.1.47 → 0.1.49

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 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.49](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.48...v0.1.49) (2024-04-25)
+
+
+### Features
+
+* 紧凑版样式优化 ([4ca842e](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/4ca842e485e47d51e7b5f9e5f94e3e84ccb85add))
+
+
+### Bug Fixes
+
+* **drop:** 解决popper的报错 ([1666a69](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/1666a69eda20dd5cf07219b58ba5ddb1ba518e03))
+* **table:** 封装valueSetter,对于返回false的情况将值置回原来的值 ([1c56c45](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/1c56c45e995a9216a5f0b0b76049c20c47aa8001))
+
+### [0.1.48](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.47...v0.1.48) (2024-04-24)
+
+
+### Features
+
+* 紧凑版样式修改 ([5b9f2ed](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/5b9f2edc38fdd4a1e0eedf3ac623a6160353629a))
+* **date-picker:** 半年日期框支持全年 ([205c5d5](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/205c5d5aa1b4e99ef6ab72849c62a3767d07df0b))
+
 ### [0.1.47](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.46...v0.1.47) (2024-04-24)
 
 

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, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
 import Vue$1 from "vue";
 const name$1 = "@indfnd/common";
-const version = "0.1.46";
+const version = "0.1.48";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -43837,7 +43837,7 @@ var classnames$1 = { exports: {} };
 var classnames = classnames$1.exports;
 const THEME_KEY = "ind-theme";
 const THEME_LIST = ["ind-default-theme", "ind-small-theme"];
-const defaultTheme = "ind-default-theme";
+const defaultTheme = "ind-small-theme";
 function getDefaultTheme() {
   return getLocalStorage(THEME_KEY) || defaultTheme;
 }
@@ -43914,10 +43914,13 @@ const __vue2_script$1s = {
       if (isServer$2)
         return;
       this.$nextTick(() => {
+        var _a, _b;
         if (this.popper) {
           this.popper.update();
           this.popperStatus = true;
         } else {
+          if (!((_b = (_a = this.$parent) == null ? void 0 : _a.$refs) == null ? void 0 : _b.reference) || !this.$el)
+            return;
           this.popper = new Popper$1(this.$parent.$refs.reference, this.$el, {
             eventsEnabled: this.eventsEnabled,
             placement: this.placement,
@@ -47599,6 +47602,7 @@ const __vue2_script$1g = {
     confirm: Boolean,
     readonly: Boolean,
     disabled: Boolean,
+    fullYear: Boolean,
     options: { type: Object, default: () => ({}) }
   },
   data() {
@@ -47623,10 +47627,11 @@ const __vue2_script$1g = {
       return this.showClose ? "ios-close-circle" : "ios-calendar-outline";
     },
     messageTxt() {
-      if (!this.message || this.message.length < 6)
+      var _a;
+      if (!this.message || this.message.length < 4)
         return "";
       const halfYear = this.message.substring(4, 6);
-      const halfYearText = halfYear === "H1" ? "\u4E0A\u534A\u5E74" : "\u4E0B\u534A\u5E74";
+      const halfYearText = ((_a = this.dataList.find((item2) => item2.value === halfYear)) == null ? void 0 : _a.label) || "";
       return `${this.message.substring(0, 4)}${halfYearText}`;
     },
     selectYear() {
@@ -47647,6 +47652,9 @@ const __vue2_script$1g = {
     }
   },
   created() {
+    if (this.fullYear) {
+      this.dataList.unshift({ label: "\u5168\u5E74", value: "", disable: false });
+    }
     this.initData();
   },
   methods: {
@@ -51864,11 +51872,11 @@ var render$W = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("div", { staticClass: "lambo-grid-table", class: [_vm.fullSreen ? "fullscreen-fixed" : ""] }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.search, expression: "$slots.search" }], ref: "search", staticClass: "search" }, [_vm._t("search")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.tip, expression: "$slots.tip" }], ref: "tip", staticClass: "tip" }, [_vm._t("tip")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.important - _vm.tip, expression: "$slots.important - tip" }], ref: "important-tip", staticClass: "important-tip" }, [_c("Icon", { attrs: { "type": "md-information-circle" } }), _vm._t("important-tip")], 2), _c("div", { ref: "buttons", staticClass: "other-button" }, [_c("Row", [[_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "flex": "1 1 0%" } }, [_c("IndButtonGroup", { attrs: { "split": "", "mb": "" } }, [_vm._t("buttons")], 2)], 1)], _vm.showUnitSwitch && _vm.isShowUnitSwitch || _vm.showTableOption || _vm.$slots.options ? _c("i-col", { staticStyle: { "text-align": "right" }, attrs: { "flex": "0 0 auto" } }, [_c("div", { staticClass: "ind-flex end" }, [_c("div", { staticStyle: { "line-height": "32px", "padding-bottom": "var(--ind-padding-base)", "margin-right": "10px" } }, [_vm._t("options")], 2), _vm.showZeroSwitch ? _c("IndZeroRadio", { staticStyle: { "margin-bottom": "10px", "line-height": "1" }, attrs: { "zeroTitle": _vm.switchZeroTitle }, model: { value: _vm.showZero, callback: function($$v) {
+  return _c("div", { staticClass: "lambo-grid-table", class: [_vm.fullSreen ? "fullscreen-fixed" : ""] }, [_c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.search, expression: "$slots.search" }], ref: "search", staticClass: "search" }, [_vm._t("search")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.tip, expression: "$slots.tip" }], ref: "tip", staticClass: "tip" }, [_vm._t("tip")], 2), _c("div", { directives: [{ name: "show", rawName: "v-show", value: _vm.$slots.important - _vm.tip, expression: "$slots.important - tip" }], ref: "important-tip", staticClass: "important-tip" }, [_c("Icon", { attrs: { "type": "md-information-circle" } }), _vm._t("important-tip")], 2), _c("div", { ref: "buttons", staticClass: "other-button" }, [_c("Row", [[_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "flex": "1 1 0%" } }, [_c("IndButtonGroup", { attrs: { "split": "", "mb": "" } }, [_vm._t("buttons")], 2)], 1)], _vm.showUnitSwitch && _vm.isShowUnitSwitch || _vm.showTableOption || _vm.$slots.options ? _c("i-col", { staticStyle: { "text-align": "right" }, attrs: { "flex": "0 0 auto" } }, [_c("div", { staticClass: "ind-flex end" }, [_c("div", { staticStyle: { "line-height": "32px", "padding-bottom": "var(--ind-table-button-padding)", "margin-right": "10px" } }, [_vm._t("options")], 2), _vm.showZeroSwitch ? _c("IndZeroRadio", { staticStyle: { "margin-bottom": "var(--ind-unit-switch-bottom)", "line-height": "1" }, attrs: { "zeroTitle": _vm.switchZeroTitle }, model: { value: _vm.showZero, callback: function($$v) {
     _vm.showZero = $$v;
-  }, expression: "showZero" } }) : _vm._e(), _vm.showUnitSwitch && _vm.isShowUnitSwitch ? _c("IndUnitRadio", { staticStyle: { "margin-bottom": "10px", "line-height": "1" }, attrs: { "isShowWX": _vm.isShowWX, "isShowJ": _vm.isShowJ }, model: { value: _vm.unitType, callback: function($$v) {
+  }, expression: "showZero" } }) : _vm._e(), _vm.showUnitSwitch && _vm.isShowUnitSwitch ? _c("IndUnitRadio", { staticStyle: { "margin-bottom": "var(--ind-unit-switch-bottom)", "line-height": "1" }, attrs: { "isShowWX": _vm.isShowWX, "isShowJ": _vm.isShowJ }, model: { value: _vm.unitType, callback: function($$v) {
     _vm.unitType = $$v;
-  }, expression: "unitType" } }) : _vm._e(), _vm.showTableOption ? _c("Dropdown", { staticClass: "table-option-dropdown", staticStyle: { "float": "right", "margin-bottom": "var(--ind-padding-base)" }, attrs: { "trigger": "custom", "visible": _vm.optionDropdownVisible, "placement": "bottom-end" }, on: { "on-click": _vm.resetTableSize } }, [_c("IndButtonGroup", { staticStyle: { "display": "flex" }, attrs: { "split": false, "mb": "" } }, [_c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": _vm.toggleFullScreen } }, [_vm._v(" " + _vm._s(_vm.fullSreen ? "\u53D6\u6D88\u5168\u5C4F" : "\u5168\u5C4F") + " ")]), _vm.revertBtn ? _c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": function($event) {
+  }, expression: "unitType" } }) : _vm._e(), _vm.showTableOption ? _c("Dropdown", { staticClass: "table-option-dropdown", staticStyle: { "float": "right", "margin-bottom": "var(--ind-table-button-padding)" }, attrs: { "trigger": "custom", "visible": _vm.optionDropdownVisible, "placement": "bottom-end" }, on: { "on-click": _vm.resetTableSize } }, [_c("IndButtonGroup", { staticStyle: { "display": "flex" }, attrs: { "split": false, "mb": "" } }, [_c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": _vm.toggleFullScreen } }, [_vm._v(" " + _vm._s(_vm.fullSreen ? "\u53D6\u6D88\u5168\u5C4F" : "\u5168\u5C4F") + " ")]), _vm.revertBtn ? _c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": function($event) {
     return _vm.$emit("revertColumnRow");
   } } }, [_vm._v(" \u8F6C\u7F6E ")]) : _vm._e(), !_vm.isIndexManageTable ? _c("IndexManage", { attrs: { "tableRef": _vm.tableRef, "funId": (_vm.funId || "") + "-" + _vm.$route.meta.permissionId }, on: { "resetColumns": _vm.resetColumns } }) : _vm._e(), _c("IndButton", { attrs: { "bizType": "reset" }, on: { "click": function($event) {
     return _vm.tableSettingToggle("3");
@@ -52129,6 +52137,7 @@ const __vue2_script$X = {
       rowSelection: "single",
       suppressRowClickSelection: false,
       localeText: AG_GRID_LOCALE_ZH,
+      isRevertingOldValue: false,
       btnSel: "",
       tableDataSrc: [],
       tableData: _.cloneDeep(this.value),
@@ -52754,9 +52763,9 @@ const __vue2_script$X = {
         let agColumn = {
           resizable: true,
           headerName: column.title || column.headerName,
-          width: column.width,
-          minWidth: column.minWidth,
-          maxWidth: column.maxWidth,
+          width: column.width ? parseInt(column.width) * (this.getTheme == "ind-small-theme" ? 0.8 : 1) : column.width,
+          minWidth: column.minWidth ? parseInt(column.minWidth) * (this.getTheme == "ind-small-theme" ? 0.8 : 1) : column.minWidth,
+          maxWidth: column.maxWidth ? parseInt(column.maxWidth) * (this.getTheme == "ind-small-theme" ? 0.8 : 1) : column.maxWidth,
           pinned: column.fixed || column.pinned,
           cellDataType: column.cellDataType || "text",
           headerTooltip: (_c = (_b = (_a = this.$store) == null ? void 0 : _a.getters) == null ? void 0 : _b.getIndexDesc) == null ? void 0 : _c[column.standardField || column.key || column.field]
@@ -52953,8 +52962,24 @@ const __vue2_script$X = {
           if (column.cellRendererSelector) {
             agColumn.cellRendererSelector = column.cellRendererSelector;
           }
-          if (column.valueSetter) {
+          if (column.valueSetter && isString(column.valueSetter)) {
             agColumn.valueSetter = column.valueSetter;
+          } else if (column.valueSetter) {
+            agColumn.valueSetter = (params) => {
+              const isValid = column.valueSetter(params);
+              if (!isValid) {
+                const { newValue, oldValue, data, colDef, column: column2 } = params;
+                this.isRevertingOldValue = true;
+                data[colDef.key] = newValue;
+                setTimeout(() => {
+                  params.node.setDataValue(column2, oldValue);
+                  this.isRevertingOldValue = false;
+                }, 0);
+              }
+              if (!this.isRevertingOldValue) {
+                return isValid;
+              }
+            };
           }
           if (this.columnCalcMap && this.columnCalcMap[column.field || column.key]) {
             let calcRules = this.columnCalcMap[column.field || column.key];
@@ -64427,6 +64452,10 @@ if (typeof window !== "undefined" && window.Vue) {
   window.addEventListener("resize", () => EventBus.$on("resize"), { passive: true });
   window.addEventListener("orientationchange", () => EventBus.$on("resize"), { passive: true });
 }
+document.documentElement.style.setProperty(
+  "--common-label-width",
+  window.innerWidth / 1920 * 200 + "px"
+);
 const API = {
   version: pkg.version,
   install,