@indfnd/common 1.0.114 → 1.0.116

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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.116](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.115...v1.0.116) (2025-05-13)
+
+
+### Bug Fixes
+
+* 表格内部echarts部分配置项改为外部传参 ([3e2dbbd](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/3e2dbbded5a5efa24030440af78cc73b1a1750c5))
+
+### [1.0.115](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.114...v1.0.115) (2025-05-13)
+
 ### [1.0.114](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.113...v1.0.114) (2025-05-12)
 
 

package/dist/ind-common.es.js

@@ -5460,7 +5460,7 @@ var lodash = { exports: {} };
 })(lodash, lodash.exports);
 var _ = lodash.exports;
 const name$1 = "@indfnd/common";
-const version = "1.0.112";
+const version = "1.0.115";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -54564,6 +54564,7 @@ const __vue2_script$13 = {
       this.setChartOption(chart);
     },
     setChartOption(chart) {
+      var _a, _b, _c, _d;
       chart.off("click");
       const containerHeight = this.$refs.lineChart.offsetHeight;
       const gridHeight = containerHeight * 0.8;
@@ -54600,8 +54601,9 @@ const __vue2_script$13 = {
             type: "line",
             smooth: true,
             symbolSize: 4,
+            symbol: ((_b = (_a = this.params) == null ? void 0 : _a.config) == null ? void 0 : _b.symbol) ? this.params.config.symbol : "circle",
             itemStyle: {
-              color: "rgb(19, 127, 209)"
+              color: ((_d = (_c = this.params) == null ? void 0 : _c.config) == null ? void 0 : _d.color) ? this.params.config.color : "rgb(19, 127, 209)"
             }
           }
         ]
@@ -54646,7 +54648,7 @@ var render$11 = function() {
   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%" } }, [_vm.showUnitSwitch && _vm.isShowUnitSwitch ? _c("IndUnitRadio", { staticStyle: { "margin-top": "var(--ind-unit-switch-bottom)", "line-height": "1", "margin-left": "10px" }, attrs: { "isShowWX": _vm.isShowWX, "isShowJ": _vm.isShowJ }, model: { value: _vm.unitType, callback: function($$v) {
     _vm.unitType = $$v;
-  }, expression: "unitType" } }) : _vm._e()], 1)], _c("i-col", { directives: [{ name: "show", rawName: "v-show", value: _vm.showUnitSwitch && _vm.isShowUnitSwitch || _vm.showTableOption || _vm.$slots.options, expression: "(showUnitSwitch && isShowUnitSwitch) || showTableOption || $slots.options" }], staticStyle: { "text-align": "right" }, attrs: { "flex": "0 0 auto" } }, [_c("div", { staticClass: "ind-flex end" }, [_c("div", { staticStyle: { "line-height": "var(--ivu-form-item-content-line-height)", "padding-bottom": "calc(var(--ind-table-button-padding) + 2px)", "margin-right": "10px" } }, [_vm._t("options")], 2)])])], 2)], 1), _c("IndLoadingPanel", { attrs: { "loading": _vm.tableLoading } }, [!_vm.refreshTable ? _c("ag-grid-vue", _vm._g(_vm._b({ ref: "tableRef", staticClass: "ag-theme-balham", style: { height: _vm.height && !_vm.fullSreen ? _vm.height + "px" : "100%" }, attrs: { "id": "agTable", "suppressCellFocus": true, "suppressMenu": true, "suppressContextMenu": !_vm.showTableOption, "defaultColDef": _vm.defaultColDef, "headerHeight": _vm.headerHeight, "rowHeight": _vm.getRowHeight(), "getRowHeight": _vm.getRowHeight, "rowData": _vm.rowDataFiltered, "suppressRowClickSelection": (_vm.isPc || _vm.isEditTable) && _vm.rowSelection == "multiple" || _vm.suppressRowClickSelection, "rowSelection": _vm.rowSelection, "rowMultiSelectWithClick": !_vm.isPc && !_vm.isEditTable && (_vm.rowSelection == "multiple" || _vm.rowMultiSelectWithClick), "columnDefs": _vm.tableColumns, "localeText": _vm.localeText, "singleClickEdit": true, "pinnedTopRowData": _vm.topRows, "pinnedBottomRowData": _vm.pinnedBottomRowData, "suppressRowTransform": true, "stopEditingWhenCellsLoseFocus": true, "getRowClass": _vm.getRowClassCommon, "getRowId": _vm.getRowId, "tooltipShowDelay": 500, "overlayNoRowsTemplate": _vm.noRowsTemplate || _vm.overlayNoRowsTemplate, "treeData": _vm.treeData, "getDataPath": _vm.getDataPath, "autoGroupColumnDef": _vm.autoGroupColumnDef, "groupDisplayType": _vm.groupDisplayType, "groupSelectsChildren": _vm.groupSelectsChildren, "groupDefaultExpanded": _vm.groupDefaultExpanded, "getContextMenuItems": _vm.getContextMenuItems }, on: { "sortChanged": _vm.sortChanged, "selection-changed": _vm.selectionChanged, "rowSelected": _vm.rowSelected, "grid-ready": _vm.onGridReady, "cellClicked": _vm.cellClicked, "cellDoubleClicked": _vm.cellDoubleClicked } }, "ag-grid-vue", _vm.$attrs, false), _vm.$listeners)) : _vm._e()], 1), _vm.showBottom ? _c("div", { ref: "bottom" }, [_c("Row", { staticStyle: { "margin-top": "10px" } }, [_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "span": "18" } }, [_c("Page", { directives: [{ name: "show", rawName: "v-show", value: !_vm.disablePage, expression: "!disablePage" }], attrs: { "size": "small", "total": _vm.totalNumber, "current": _vm.currentPage, "page-size": _vm.limitNumber, "show-sizer": "", "show-total": "", "show-elevator": "" }, on: { "on-change": _vm.onPageChange, "on-page-size-change": _vm.onPageSizeChange } }), _c("span", { directives: [{ name: "show", rawName: "v-show", value: _vm.disablePage, expression: "disablePage" }] }, [_vm._v("\u5171 " + _vm._s(_vm.tableData.length) + " \u6761\u6570\u636E")])], 1)], 1)], 1) : _vm._e()], 1);
+  }, expression: "unitType" } }) : _vm._e()], 1)], _c("i-col", { directives: [{ name: "show", rawName: "v-show", value: _vm.showUnitSwitch && _vm.isShowUnitSwitch || _vm.showTableOption || _vm.$slots.options, expression: "(showUnitSwitch && isShowUnitSwitch) || showTableOption || $slots.options" }], staticStyle: { "text-align": "right" }, attrs: { "flex": "0 0 auto" } }, [_c("div", { staticClass: "ind-flex end" }, [_c("div", { staticStyle: { "line-height": "var(--ivu-form-item-content-line-height)", "padding-bottom": "calc(var(--ind-table-button-padding) + 2px)", "margin-right": "10px" } }, [_vm._t("options")], 2)])])], 2)], 1), _c("IndLoadingPanel", { attrs: { "loading": _vm.tableLoading } }, [!_vm.refreshTable ? _c("ag-grid-vue", _vm._g(_vm._b({ ref: "tableRef", staticClass: "ag-theme-balham", style: { height: _vm.height && !_vm.fullSreen ? _vm.height + "px" : "100%" }, attrs: { "id": "agTable", "suppressCellFocus": true, "suppressMenu": true, "suppressContextMenu": !_vm.showTableOption, "defaultColDef": _vm.defaultColDef, "headerHeight": _vm.headerHeight, "rowHeight": _vm.getRowHeightProp ? _vm.getRowHeightProp() : _vm.getRowHeight(), "getRowHeight": _vm.getRowHeightProp || _vm.getRowHeight, "rowData": _vm.rowDataFiltered, "suppressRowClickSelection": (_vm.isPc || _vm.isEditTable) && _vm.rowSelection == "multiple" || _vm.suppressRowClickSelection, "rowSelection": _vm.rowSelection, "rowMultiSelectWithClick": !_vm.isPc && !_vm.isEditTable && (_vm.rowSelection == "multiple" || _vm.rowMultiSelectWithClick), "columnDefs": _vm.tableColumns, "localeText": _vm.localeText, "singleClickEdit": true, "pinnedTopRowData": _vm.topRows, "pinnedBottomRowData": _vm.pinnedBottomRowData, "suppressRowTransform": true, "stopEditingWhenCellsLoseFocus": true, "getRowClass": _vm.getRowClassCommon, "getRowId": _vm.getRowId, "tooltipShowDelay": 500, "overlayNoRowsTemplate": _vm.noRowsTemplate || _vm.overlayNoRowsTemplate, "treeData": _vm.treeData, "getDataPath": _vm.getDataPath, "autoGroupColumnDef": _vm.autoGroupColumnDef, "groupDisplayType": _vm.groupDisplayType, "groupSelectsChildren": _vm.groupSelectsChildren, "groupDefaultExpanded": _vm.groupDefaultExpanded, "getContextMenuItems": _vm.getContextMenuItems }, on: { "sortChanged": _vm.sortChanged, "selection-changed": _vm.selectionChanged, "rowSelected": _vm.rowSelected, "grid-ready": _vm.onGridReady, "cellClicked": _vm.cellClicked, "cellDoubleClicked": _vm.cellDoubleClicked } }, "ag-grid-vue", _vm.$attrs, false), _vm.$listeners)) : _vm._e()], 1), _vm.showBottom ? _c("div", { ref: "bottom" }, [_c("Row", { staticStyle: { "margin-top": "10px" } }, [_c("i-col", { staticStyle: { "text-align": "left" }, attrs: { "span": "18" } }, [_c("Page", { directives: [{ name: "show", rawName: "v-show", value: !_vm.disablePage, expression: "!disablePage" }], attrs: { "size": "small", "total": _vm.totalNumber, "current": _vm.currentPage, "page-size": _vm.limitNumber, "show-sizer": "", "show-total": "", "show-elevator": "" }, on: { "on-change": _vm.onPageChange, "on-page-size-change": _vm.onPageSizeChange } }), _c("span", { directives: [{ name: "show", rawName: "v-show", value: _vm.disablePage, expression: "disablePage" }] }, [_vm._v("\u5171 " + _vm._s(_vm.tableData.length) + " \u6761\u6570\u636E")])], 1)], 1)], 1) : _vm._e()], 1);
 };
 var staticRenderFns$11 = [];
 function suppressNavigation(params) {
@@ -54743,6 +54745,7 @@ const __vue2_script$12 = {
       type: Number,
       default: 28
     },
+    getRowHeightProp: Function,
     rowMultiSelectWithClick: Boolean,
     pinnedTopRowData: Array,
     pinnedBottomRowData: Array,
@@ -56340,6 +56343,56 @@ const __vue2_script$12 = {
       });
       await this.$nextTick();
       this.updating = false;
+    },
+    async outSortChanged(sortParams) {
+      if (sortParams.order === void 0) {
+        Reflect.deleteProperty(this.sortParams, "sort");
+        Reflect.deleteProperty(this.sortParams, "order");
+      } else {
+        this.sortParams = {
+          sort: sortParams.sort,
+          order: sortParams.order
+        };
+      }
+      if (this.dataApi && !this.disablePage) {
+        this.currentPage = 1;
+        this.tableRefresh();
+      } else {
+        let topData = [];
+        if (sortParams.order === void 0) {
+          if (this.dataApi) {
+            let tableDataTmp = _.cloneDeep(this.tableData);
+            tableDataTmp = _.orderBy(tableDataTmp, ["_initialseq"], ["asc"]);
+            this.tableData = tableDataTmp;
+          } else {
+            this.tableData = _.cloneDeep(this.value);
+          }
+        } else {
+          if (this.noSortLine > -1) {
+            topData = this.tableData.slice(0, this.noSortLine);
+            this.tableData.splice(0, this.noSortLine);
+          }
+          this.tableData.sort((a, b) => {
+            if (typeof a[this.sortParams.sort] == "number" && typeof b[this.sortParams.sort] == "number") {
+              let _a = isNaN(parseFloat(a[this.sortParams.sort])) ? 0 : parseFloat(a[this.sortParams.sort]);
+              let _b = isNaN(parseFloat(b[this.sortParams.sort])) ? 0 : parseFloat(b[this.sortParams.sort]);
+              return this.sortParams.order === "asc" ? _a - _b : _b - _a;
+            } else {
+              let a2 = a[this.sortParams.sort] || "";
+              let b2 = b[this.sortParams.sort] || "";
+              return this.sortParams.order === "asc" ? a2.localeCompare(b2, "zh-CN") : b2.localeCompare(a2, "zh-CN");
+            }
+          });
+          if (this.noSortLine > -1) {
+            this.tableData = [...topData, ..._.cloneDeep(this.tableData)];
+          }
+        }
+        this.$nextTick().then(() => {
+          this.gridApi.refreshCells({ force: true });
+        });
+      }
+      this.refreshCells();
+      this.$emit("on-sort-change", sortParams);
     }
   }
 };