zmdms-webui 2.0.9 → 2.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/es/message/index.js +6 -7
  2. package/dist/es/table/interface.d.ts +1 -1
  3. package/dist/es/table/utils.js +44 -35
  4. package/package.json +1 -1
package/dist/es/message/index.js CHANGED
@@ -20,30 +20,29 @@ function getConfig(content, duration, onClose) {
20
20
  };
21
21
  return config;
22
22
  }
23
- var defaultDuration = 10;
24
23
  var myMessage = {
25
24
  info: function (content, duration, onClose) {
26
- var config = getConfig(content, duration ? duration : defaultDuration, onClose);
25
+ var config = getConfig(content, duration, onClose);
27
26
  message.info(config, duration, onClose);
28
27
  return Promise.resolve();
29
28
  },
30
29
  success: function (content, duration, onClose) {
31
- var config = getConfig(content, duration ? duration : defaultDuration, onClose);
30
+ var config = getConfig(content, duration, onClose);
32
31
  message.success(config, duration, onClose);
33
32
  return Promise.resolve();
34
33
  },
35
34
  error: function (content, duration, onClose) {
36
- var config = getConfig(content, duration ? duration : defaultDuration, onClose);
35
+ var config = getConfig(content, duration, onClose);
37
36
  message.error(config, duration, onClose);
38
37
  return Promise.resolve();
39
38
  },
40
39
  warning: function (content, duration, onClose) {
41
- var config = getConfig(content, duration ? duration : defaultDuration, onClose);
40
+ var config = getConfig(content, duration, onClose);
42
41
  message.warning(config, duration, onClose);
43
42
  return Promise.resolve();
44
43
  },
45
44
  loading: function (content, duration, onClose) {
46
- var config = getConfig(content, duration ? duration : defaultDuration, onClose);
45
+ var config = getConfig(content, duration, onClose);
47
46
  message.loading(config, duration, onClose);
48
47
  return Promise.resolve();
49
48
  },
@@ -52,7 +51,7 @@ var myMessage = {
52
51
  return Promise.resolve();
53
52
  },
54
53
  warn: function (content, duration, onClose) {
55
- var config = getConfig(content, duration ? duration : defaultDuration, onClose);
54
+ var config = getConfig(content, duration, onClose);
56
55
  message.warn(config, duration, onClose);
57
56
  return Promise.resolve();
58
57
  },
package/dist/es/table/interface.d.ts CHANGED
@@ -519,7 +519,7 @@ interface ITableProps<RecordType> extends Omit<TableProps<RecordType>, "columns"
519
519
  /** 自定义合计的key */
520
520
  key: string;
521
521
  /** 自定义合计的值 */
522
- value: (record: any) => string | number;
522
+ value?: (record: any) => string | number;
523
523
  /** 合计方式 */
524
524
  summaryType?: "sum" | "first" | "computed";
525
525
  /** 当summaryType为computed时，用于计算合计值的函数 */
package/dist/es/table/utils.js CHANGED
@@ -855,6 +855,7 @@ summaryKeys, dimensionCustomSumKeys) {
855
855
  var summaryKey = summaryKeys_2[_d];
856
856
  _loop_7(summaryKey);
857
857
  }
858
+ console.log("dimensionCustomSumKeys", dimensionCustomSumKeys);
858
859
  // 处理dimensionCustomSumKeys的额外合并计算逻辑
859
860
  if (dimensionCustomSumKeys && Array.isArray(dimensionCustomSumKeys)) {
860
861
  var _loop_8 = function (customSumKey) {
@@ -867,35 +868,39 @@ summaryKeys, dimensionCustomSumKeys) {
867
868
  return plus(sum, value);
868
869
  }, 0);
869
870
  }
870
- else if (typeof customSumKey === "object" &&
871
- customSumKey.key &&
872
- typeof customSumKey.value === "function") {
871
+ else if (typeof customSumKey === "object" && customSumKey.key) {
873
872
  // 如果是对象，使用自定义的key和value函数
874
873
  var key = customSumKey.key, valueFn_1 = customSumKey.value, _f = customSumKey.summaryType, summaryType = _f === void 0 ? "sum" : _f, computedSummary = customSumKey.computedSummary;
875
874
  var filteredItems = items.filter(function (item) { return !isSummaryRow(item); }); // 排除已有的合计行
876
875
  switch (summaryType) {
877
876
  case "sum":
878
- // 默认累加方式
879
- var customValues = filteredItems.map(function (item) {
880
- var result = valueFn_1(item);
881
- return typeof result === "number"
882
- ? result
883
- : parseFloat(result) || 0;
884
- });
885
- var customSum = customValues.reduce(function (sum, value) {
886
- return plus(sum, value);
887
- }, 0);
888
- summaryRow[key] = customSum;
877
+ if (valueFn_1) {
878
+ // 默认累加方式
879
+ var customValues = filteredItems.map(function (item) {
880
+ var result = valueFn_1(item);
881
+ return typeof result === "number"
882
+ ? result
883
+ : parseFloat(result) || 0;
884
+ });
885
+ var customSum = customValues.reduce(function (sum, value) {
886
+ return plus(sum, value);
887
+ }, 0);
888
+ summaryRow[key] = customSum;
889
+ }
889
890
  break;
890
891
  case "first":
891
- // 使用第一条记录的值
892
- if (filteredItems.length > 0) {
893
- var result_1 = valueFn_1(filteredItems[0]);
894
- summaryRow[key] =
895
- typeof result_1 === "number" ? result_1 : parseFloat(result_1) || 0;
896
- }
897
- else {
898
- summaryRow[key] = 0;
892
+ if (valueFn_1) {
893
+ // 使用第一条记录的值
894
+ if (filteredItems.length > 0) {
895
+ var result_1 = valueFn_1(filteredItems[0]);
896
+ summaryRow[key] =
897
+ typeof result_1 === "number"
898
+ ? result_1
899
+ : parseFloat(result_1) || 0;
900
+ }
901
+ else {
902
+ summaryRow[key] = 0;
903
+ }
899
904
  }
900
905
  break;
901
906
  case "computed":
@@ -903,7 +908,9 @@ summaryKeys, dimensionCustomSumKeys) {
903
908
  if (typeof computedSummary === "function") {
904
909
  var result_2 = computedSummary(filteredItems, summaryRow);
905
910
  summaryRow[key] =
906
- typeof result_2 === "number" ? result_2 : parseFloat(result_2) || 0;
911
+ typeof result_2 === "number"
912
+ ? result_2
913
+ : parseFloat(result_2) || result_2;
907
914
  }
908
915
  else {
909
916
  console.warn("\u5B57\u6BB5 ".concat(key, " \u8BBE\u7F6E\u4E86 summaryType: 'computed' \u4F46\u6CA1\u6709\u63D0\u4F9B computedSummary \u51FD\u6570"));
@@ -912,18 +919,20 @@ summaryKeys, dimensionCustomSumKeys) {
912
919
  break;
913
920
  default:
914
921
  console.warn("\u672A\u77E5\u7684 summaryType: ".concat(summaryType, "\uFF0C\u4F7F\u7528\u9ED8\u8BA4\u7684 sum \u65B9\u5F0F"));
915
- // 回退到默认的 sum 方式
916
- var defaultValues = filteredItems.map(function (item) {
917
- var result = valueFn_1(item);
918
- return typeof result === "number"
919
- ? result
920
- : parseFloat(result) || 0;
921
- });
922
- var defaultSum = defaultValues.reduce(function (sum, value) {
923
- return plus(sum, value);
924
- }, 0);
925
- summaryRow[key] = defaultSum;
926
- break;
922
+ if (valueFn_1) {
923
+ // 回退到默认的 sum 方式
924
+ var defaultValues = filteredItems.map(function (item) {
925
+ var result = valueFn_1(item);
926
+ return typeof result === "number"
927
+ ? result
928
+ : parseFloat(result) || 0;
929
+ });
930
+ var defaultSum = defaultValues.reduce(function (sum, value) {
931
+ return plus(sum, value);
932
+ }, 0);
933
+ summaryRow[key] = defaultSum;
934
+ break;
935
+ }
927
936
  }
928
937
  }
929
938
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zmdms-webui",
3
- "version": "2.0.9",
3
+ "version": "2.1.1",
4
4
  "private": false,
5
5
  "main": "dist/index.es.js",
6
6
  "module": "dist/index.es.js",