cnhis-design-vue 3.3.1-beta.57 → 3.3.1-beta.59

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 (14) hide show
  1. package/es/components/field-set/src/FieldColor.vue.d.ts +1 -1
  2. package/es/components/field-set/src/FieldFilter.vue.d.ts +1 -1
  3. package/es/components/field-set/src/FieldSet.vue.d.ts +1 -1
  4. package/es/components/field-set/src/components/table-row.vue.d.ts +1 -1
  5. package/es/components/select-person/src/SelectPerson.vue2.js +18 -9
  6. package/es/components/table-filter/src/components/render-widget/enums.d.ts +2 -0
  7. package/es/components/table-filter/src/components/render-widget/enums.js +2 -1
  8. package/es/components/table-filter/src/components/render-widget/helpers/dateExtraMap.js +8 -0
  9. package/es/components/table-filter/src/components/render-widget/helpers/enums.d.ts +1 -0
  10. package/es/components/table-filter/src/components/render-widget/helpers/enums.js +2 -1
  11. package/es/components/table-filter/src/components/render-widget/helpers/presetValToTimestamp.js +4 -2
  12. package/es/components/table-filter/src/tool/baseOptions.js +3 -0
  13. package/es/shared/package.json.js +1 -1
  14. package/package.json +1 -1
package/es/components/field-set/src/FieldColor.vue.d.ts CHANGED
@@ -534,9 +534,9 @@ declare const _default: import("vue").DefineComponent<{
534
534
  }>;
535
535
  developMode: boolean;
536
536
  draggable: boolean;
537
- isHighlightRow: boolean;
538
537
  idx: number;
539
538
  isHighlight: boolean;
539
+ isHighlightRow: boolean;
540
540
  isFieldSet: boolean;
541
541
  fieldDescribeMode: "column" | "tooltip";
542
542
  hideExpressionOption: AnyObject[];
package/es/components/field-set/src/FieldFilter.vue.d.ts CHANGED
@@ -563,9 +563,9 @@ declare const _default: import("vue").DefineComponent<{
563
563
  }>;
564
564
  developMode: boolean;
565
565
  draggable: boolean;
566
- isHighlightRow: boolean;
567
566
  idx: number;
568
567
  isHighlight: boolean;
568
+ isHighlightRow: boolean;
569
569
  isFieldSet: boolean;
570
570
  fieldDescribeMode: "column" | "tooltip";
571
571
  hideExpressionOption: AnyObject[];
package/es/components/field-set/src/FieldSet.vue.d.ts CHANGED
@@ -722,9 +722,9 @@ declare const _default: import("vue").DefineComponent<{
722
722
  }>;
723
723
  developMode: boolean;
724
724
  draggable: boolean;
725
- isHighlightRow: boolean;
726
725
  idx: number;
727
726
  isHighlight: boolean;
727
+ isHighlightRow: boolean;
728
728
  isFieldSet: boolean;
729
729
  fieldDescribeMode: "column" | "tooltip";
730
730
  hideExpressionOption: AnyObject[];
package/es/components/field-set/src/components/table-row.vue.d.ts CHANGED
@@ -383,9 +383,9 @@ declare const _default: import("vue").DefineComponent<{
383
383
  }>;
384
384
  developMode: boolean;
385
385
  draggable: boolean;
386
- isHighlightRow: boolean;
387
386
  idx: number;
388
387
  isHighlight: boolean;
388
+ isHighlightRow: boolean;
389
389
  isFieldSet: boolean;
390
390
  fieldDescribeMode: "column" | "tooltip";
391
391
  hideExpressionOption: AnyObject[];
package/es/components/select-person/src/SelectPerson.vue2.js CHANGED
@@ -495,9 +495,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
495
495
  expandedKeys.value = treeData.value.length && keyword.value ? getExpandedKeys(treeData.value) : [];
496
496
  }
497
497
  function setTreeCheckd(tree, checked) {
498
- var _a3, _b3;
499
- const checkStrategy = (_b3 = (_a3 = props == null ? void 0 : props.treeSetting) == null ? void 0 : _a3.checkStrategy) != null ? _b3 : "child";
500
- switch (checkStrategy) {
498
+ switch (checkStrategyResult.value) {
501
499
  case "child":
502
500
  setCheckdWithChild(tree, checked);
503
501
  break;
@@ -540,19 +538,30 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
540
538
  }
541
539
  }
542
540
  function setCheckdWithAll(tree, checked) {
543
- checkedKeys.value = [];
541
+ var _a3;
542
+ if (!props.onlyForwardCascade) {
543
+ checkedKeys.value = [];
544
+ }
545
+ let newKeys = checkedKeys.value;
544
546
  for (let i = 0, len = tree.length; i < len; i++) {
545
547
  const item = tree[i];
546
548
  if (!item.disabled) {
547
- if (checked && !checkedKeys.value.includes(item.key)) {
548
- checkedKeys.value.push(item.key);
549
+ if (checked) {
550
+ newKeys = union(newKeys, [item.key]);
551
+ } else {
552
+ remove(newKeys, (key) => [item.key].includes(key));
549
553
  }
550
- if (!checked) {
551
- const keyIndex = checkedKeys.value.findIndex((key) => key === item.key);
552
- checkedKeys.value.splice(keyIndex, 1);
554
+ }
555
+ if (((_a3 = item.children) == null ? void 0 : _a3.length) && props.onlyForwardCascade) {
556
+ const flattenKeys = getFlattenKeys(item.children);
557
+ if (checked) {
558
+ newKeys = union(newKeys, flattenKeys);
559
+ } else {
560
+ remove(newKeys, (key) => flattenKeys.includes(key));
553
561
  }
554
562
  }
555
563
  }
564
+ checkedKeys.value = newKeys;
556
565
  }
557
566
  function checkedAllChange(checked) {
558
567
  setTreeCheckd(treeData.value, checked);
package/es/components/table-filter/src/components/render-widget/enums.d.ts CHANGED
@@ -38,6 +38,7 @@ export declare const DateRangeInnerValEnums: {
38
38
  LAST_YEAR: string;
39
39
  NEXT_YEAR: string;
40
40
  PAST_HALF_YEAR: string;
41
+ PAST_YEAR: string;
41
42
  };
42
43
  export declare const DateRangeOutDefEnums: {
43
44
  TODAY: string;
@@ -58,5 +59,6 @@ export declare const DateRangeOutDefEnums: {
58
59
  LAST_YEAR: string;
59
60
  NEXT_YEAR: string;
60
61
  PAST_HALF_YEAR: string;
62
+ PAST_YEAR: string;
61
63
  CUSTOM: string;
62
64
  };
package/es/components/table-filter/src/components/render-widget/enums.js CHANGED
@@ -37,7 +37,8 @@ const DateRangeInnerValEnums = {
37
37
  THIS_YEAR: "THIS_YEAR",
38
38
  LAST_YEAR: "LAST_YEAR",
39
39
  NEXT_YEAR: "NEXT_YEAR",
40
- PAST_HALF_YEAR: "PAST_HALF_YEAR"
40
+ PAST_HALF_YEAR: "PAST_HALF_YEAR",
41
+ PAST_YEAR: "PAST_YEAR"
41
42
  };
42
43
  const DateRangeOutDefEnums = {
43
44
  CUSTOM: "CUSTOM",
package/es/components/table-filter/src/components/render-widget/helpers/dateExtraMap.js CHANGED
@@ -175,6 +175,10 @@ const baseDateRangeInner = {
175
175
  name: ((_ea = window.getLanguageByCode) == null ? void 0 : _ea.call(window, "10010.1.397")) || "\u8FD1\u534A\u5E74",
176
176
  title: ((_fa = window.getLanguageByCode) == null ? void 0 : _fa.call(window, "10010.1.397")) || "\u8FD1\u534A\u5E74",
177
177
  con: WidgetValEnums.PAST_HALF_YEAR
178
+ }, {
179
+ name: "\u8FD1\u4E00\u5E74",
180
+ title: "\u8FD1\u4E00\u5E74",
181
+ con: WidgetValEnums.PAST_YEAR
178
182
  }],
179
183
  [WidgetOptionEnums.PAST_TIME]: [{
180
184
  name: ((_ga = window.getLanguageByCode) == null ? void 0 : _ga.call(window, "10010.1.134")) || "\u4ECA\u5929",
@@ -228,6 +232,10 @@ const baseDateRangeInner = {
228
232
  name: ((_Ea = window.getLanguageByCode) == null ? void 0 : _Ea.call(window, "10010.1.397")) || "\u8FD1\u534A\u5E74",
229
233
  title: ((_Fa = window.getLanguageByCode) == null ? void 0 : _Fa.call(window, "10010.1.397")) || "\u8FD1\u534A\u5E74",
230
234
  con: WidgetValEnums.PAST_HALF_YEAR
235
+ }, {
236
+ name: "\u8FD1\u4E00\u5E74",
237
+ title: "\u8FD1\u4E00\u5E74",
238
+ con: WidgetValEnums.PAST_YEAR
231
239
  }],
232
240
  [WidgetOptionEnums.FUTURE_TIME]: [{
233
241
  name: ((_Ga = window.getLanguageByCode) == null ? void 0 : _Ga.call(window, "10010.1.134")) || "\u4ECA\u5929",
package/es/components/table-filter/src/components/render-widget/helpers/enums.d.ts CHANGED
@@ -36,4 +36,5 @@ export declare const WidgetValEnums: {
36
36
  NEXT_YEAR: string;
37
37
  LAST_YEAR: string;
38
38
  PAST_HALF_YEAR: string;
39
+ PAST_YEAR: string;
39
40
  };
package/es/components/table-filter/src/components/render-widget/helpers/enums.js CHANGED
@@ -52,7 +52,8 @@ const WidgetValEnums = {
52
52
  YEAR_END: "THIS_YEAR_END",
53
53
  NEXT_YEAR: "NEXT_YEAR",
54
54
  LAST_YEAR: "LAST_YEAR",
55
- PAST_HALF_YEAR: "PAST_HALF_YEAR"
55
+ PAST_HALF_YEAR: "PAST_HALF_YEAR",
56
+ PAST_YEAR: "PAST_YEAR"
56
57
  };
57
58
 
58
59
  export { WidgetDateOptionEnums, WidgetValEnums };
package/es/components/table-filter/src/components/render-widget/helpers/presetValToTimestamp.js CHANGED
@@ -104,7 +104,8 @@ const dateRangeMapInner = /* @__PURE__ */ new Map([
104
104
  [DateRangeInnerValEnums.THIS_YEAR, () => [moment().startOf("year"), moment().endOf("year")]],
105
105
  [DateRangeInnerValEnums.NEXT_YEAR, () => [moment().add(1, "y").startOf("year"), moment().add(1, "y").endOf("year")]],
106
106
  [DateRangeInnerValEnums.LAST_YEAR, () => [moment().subtract(1, "y").startOf("year"), moment().subtract(1, "y").endOf("year")]],
107
- [DateRangeInnerValEnums.PAST_HALF_YEAR, () => [moment().subtract(6, "months").startOf("day"), moment().endOf("day")]]
107
+ [DateRangeInnerValEnums.PAST_HALF_YEAR, () => [moment().subtract(6, "months").startOf("day"), moment().endOf("day")]],
108
+ [DateRangeInnerValEnums.PAST_YEAR, () => [moment().subtract(12, "months").startOf("day"), moment().endOf("day")]]
108
109
  ]);
109
110
  const formatDateRangeInfo = (key, format = "x", optionSetting = WidgetOptionEnums.ALL, isOrigin = false) => {
110
111
  const isPastTime = optionSetting === WidgetOptionEnums.PAST_TIME;
@@ -128,7 +129,8 @@ const formatDateRangeInfo = (key, format = "x", optionSetting = WidgetOptionEnum
128
129
  [DateRangeInnerValEnums.THIS_YEAR, () => [isFutureTime ? currentTime : moment().startOf("year"), isPastTime ? currentTime : moment().endOf("year")]],
129
130
  [DateRangeInnerValEnums.NEXT_YEAR, () => [moment().add(1, "y").startOf("year"), moment().add(1, "y").endOf("year")]],
130
131
  [DateRangeInnerValEnums.LAST_YEAR, () => [moment().subtract(1, "y").startOf("year"), moment().subtract(1, "y").endOf("year")]],
131
- [DateRangeInnerValEnums.PAST_HALF_YEAR, () => [moment().subtract(6, "months").startOf("day"), isPastTime ? currentTime : moment().endOf("day")]]
132
+ [DateRangeInnerValEnums.PAST_HALF_YEAR, () => [moment().subtract(6, "months").startOf("day"), isPastTime ? currentTime : moment().endOf("day")]],
133
+ [DateRangeInnerValEnums.PAST_YEAR, () => [moment().subtract(12, "months").startOf("day"), isPastTime ? currentTime : moment().endOf("day")]]
132
134
  ]);
133
135
  const fun = dateRangeMap.get(key);
134
136
  if (fun) {
package/es/components/table-filter/src/tool/baseOptions.js CHANGED
@@ -55,6 +55,9 @@ const widgetDateRangeOptions = [{
55
55
  }, {
56
56
  label: ((_r = window.getLanguageByCode) == null ? void 0 : _r.call(window, "10010.1.397")) || "\u8FD1\u534A\u5E74",
57
57
  value: DateRangeOutDefEnums.PAST_HALF_YEAR
58
+ }, {
59
+ label: "\u8FD1\u4E00\u5E74",
60
+ value: DateRangeOutDefEnums.PAST_YEAR
58
61
  }];
59
62
 
60
63
  export { widgetDateRangeOptions };
package/es/shared/package.json.js CHANGED
@@ -1,5 +1,5 @@
1
1
  var name = "@cnhis-design-vue/shared";
2
- var version = "3.3.1-beta.57";
2
+ var version = "3.3.1-beta.59";
3
3
  var main = "index.ts";
4
4
  var peerDependencies = {
5
5
  "naive-ui": "^2.30.0",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cnhis-design-vue",
3
- "version": "3.3.1-beta.57",
3
+ "version": "3.3.1-beta.59",
4
4
  "license": "ISC",
5
5
  "module": "./es/components/index.js",
6
6
  "main": "./es/components/index.js",