cnhis-design-vue 3.3.3-beta.24 → 3.3.3-beta.26

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 (9) hide show
  1. package/es/components/field-set/src/FieldColor.vue.d.ts +6 -4
  2. package/es/components/field-set/src/FieldFilter.vue.d.ts +6 -4
  3. package/es/components/field-set/src/FieldSet.vue.d.ts +8 -5
  4. package/es/components/field-set/src/FieldSet.vue2.js +6 -4
  5. package/es/components/field-set/src/components/table-row.vue.d.ts +4 -4
  6. package/es/components/field-set/src/types/index.d.ts +1 -0
  7. package/es/components/iho-chat/src/hooks/useDraggable.js +12 -3
  8. package/es/shared/package.json.js +1 -1
  9. package/package.json +2 -2
package/es/components/field-set/src/FieldColor.vue.d.ts CHANGED
@@ -49,6 +49,7 @@ declare const _default: import("vue").DefineComponent<{
49
49
  isHeadCheckHide?: boolean | undefined;
50
50
  isShow?: boolean | undefined;
51
51
  contentRender?: ((column: AnyObject, row: AnyObject) => import("vue").VNodeChild) | undefined;
52
+ titleRender?: ((column: AnyObject) => import("vue").VNodeChild) | undefined;
52
53
  hide?: boolean | undefined;
53
54
  positionField?: string | undefined;
54
55
  }[]>;
@@ -63,6 +64,7 @@ declare const _default: import("vue").DefineComponent<{
63
64
  isHeadCheckHide?: boolean | undefined;
64
65
  isShow?: boolean | undefined;
65
66
  contentRender?: ((column: AnyObject, row: AnyObject) => import("vue").VNodeChild) | undefined;
67
+ titleRender?: ((column: AnyObject) => import("vue").VNodeChild) | undefined;
66
68
  hide?: boolean | undefined;
67
69
  positionField?: string | undefined;
68
70
  }[];
@@ -534,12 +536,12 @@ declare const _default: import("vue").DefineComponent<{
534
536
  }>;
535
537
  developMode: boolean;
536
538
  draggable: boolean;
537
- fieldDescribeMode: "column" | "tooltip";
538
- isFieldSet: boolean;
539
- hideExpressionOption: AnyObject[];
539
+ isHighlightRow: boolean;
540
540
  idx: number;
541
541
  isHighlight: boolean;
542
- isHighlightRow: boolean;
542
+ isFieldSet: boolean;
543
+ fieldDescribeMode: "column" | "tooltip";
544
+ hideExpressionOption: AnyObject[];
543
545
  }>;
544
546
  EditDialog: import("vue").DefineComponent<{
545
547
  visible: {
package/es/components/field-set/src/FieldFilter.vue.d.ts CHANGED
@@ -45,6 +45,7 @@ declare const _default: import("vue").DefineComponent<{
45
45
  isHeadCheckHide?: boolean | undefined;
46
46
  isShow?: boolean | undefined;
47
47
  contentRender?: ((column: AnyObject, row: AnyObject) => import("vue").VNodeChild) | undefined;
48
+ titleRender?: ((column: AnyObject) => import("vue").VNodeChild) | undefined;
48
49
  hide?: boolean | undefined;
49
50
  positionField?: string | undefined;
50
51
  }[]>;
@@ -72,6 +73,7 @@ declare const _default: import("vue").DefineComponent<{
72
73
  isHeadCheckHide?: boolean | undefined;
73
74
  isShow?: boolean | undefined;
74
75
  contentRender?: ((column: AnyObject, row: AnyObject) => import("vue").VNodeChild) | undefined;
76
+ titleRender?: ((column: AnyObject) => import("vue").VNodeChild) | undefined;
75
77
  hide?: boolean | undefined;
76
78
  positionField?: string | undefined;
77
79
  }[];
@@ -563,12 +565,12 @@ declare const _default: import("vue").DefineComponent<{
563
565
  }>;
564
566
  developMode: boolean;
565
567
  draggable: boolean;
566
- fieldDescribeMode: "column" | "tooltip";
567
- isFieldSet: boolean;
568
- hideExpressionOption: AnyObject[];
568
+ isHighlightRow: boolean;
569
569
  idx: number;
570
570
  isHighlight: boolean;
571
- isHighlightRow: boolean;
571
+ isFieldSet: boolean;
572
+ fieldDescribeMode: "column" | "tooltip";
573
+ hideExpressionOption: AnyObject[];
572
574
  }>;
573
575
  setStyle: typeof setStyle;
574
576
  }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "save" | "reset")[], "close" | "save" | "reset", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
package/es/components/field-set/src/FieldSet.vue.d.ts CHANGED
@@ -229,6 +229,7 @@ declare const _default: import("vue").DefineComponent<{
229
229
  isHeadCheckHide?: boolean | undefined;
230
230
  isShow?: boolean | undefined;
231
231
  contentRender?: ((column: AnyObject, row: AnyObject) => VNodeChild) | undefined;
232
+ titleRender?: ((column: AnyObject) => VNodeChild) | undefined;
232
233
  hide?: boolean | undefined;
233
234
  positionField?: string | undefined;
234
235
  }[]>;
@@ -247,6 +248,7 @@ declare const _default: import("vue").DefineComponent<{
247
248
  isHeadCheckHide?: boolean | undefined;
248
249
  isShow?: boolean | undefined;
249
250
  contentRender?: ((column: AnyObject, row: AnyObject) => VNodeChild) | undefined;
251
+ titleRender?: ((column: AnyObject) => VNodeChild) | undefined;
250
252
  hide?: boolean | undefined;
251
253
  positionField?: string | undefined;
252
254
  }[];
@@ -754,17 +756,18 @@ declare const _default: import("vue").DefineComponent<{
754
756
  }>;
755
757
  developMode: boolean;
756
758
  draggable: boolean;
757
- fieldDescribeMode: "column" | "tooltip";
758
- isFieldSet: boolean;
759
- hideExpressionOption: AnyObject[];
759
+ isHighlightRow: boolean;
760
760
  idx: number;
761
761
  isHighlight: boolean;
762
- isHighlightRow: boolean;
762
+ isFieldSet: boolean;
763
+ fieldDescribeMode: "column" | "tooltip";
764
+ hideExpressionOption: AnyObject[];
763
765
  }>;
764
766
  isArray: {
765
767
  (value?: any): value is any[];
766
768
  <T>(value?: any): value is any[];
767
769
  };
770
+ isFunction: (value: any) => value is (...args: any[]) => any;
768
771
  setStyle: typeof setStyle;
769
772
  isDraggableItem: typeof isDraggableItem;
770
773
  HelpCircleSharp: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
@@ -898,9 +901,9 @@ declare const _default: import("vue").DefineComponent<{
898
901
  showSeq: boolean;
899
902
  developMode: boolean;
900
903
  footerFlag: boolean;
904
+ fieldDescribeMode: "column" | "tooltip";
901
905
  customColumns: FieldSetColumnItem[];
902
906
  showSortPriority: boolean;
903
907
  showHeadFilter: boolean;
904
- fieldDescribeMode: "column" | "tooltip";
905
908
  }>;
906
909
  export default _default;
package/es/components/field-set/src/FieldSet.vue2.js CHANGED
@@ -1,8 +1,8 @@
1
- import { createElementVNode, defineComponent, ref, computed, reactive, toRef, watch, openBlock, createElementBlock, createBlock, unref, withKeys, withModifiers, createCommentVNode, Fragment, renderList, normalizeStyle, withCtx, createTextVNode, toDisplayString, createVNode, normalizeClass, mergeProps, renderSlot } from 'vue';
1
+ import { createElementVNode, defineComponent, ref, computed, reactive, toRef, watch, openBlock, createElementBlock, createBlock, unref, withKeys, withModifiers, createCommentVNode, Fragment, renderList, normalizeStyle, withCtx, createTextVNode, toDisplayString, resolveDynamicComponent, createVNode, normalizeClass, mergeProps, renderSlot } from 'vue';
2
2
  import { NInput, NCheckbox, NTooltip, NIcon, NSelect, NPopconfirm, NButton } from 'naive-ui';
3
3
  import draggableComponent from '../../../shared/components/VueDraggable/src/vuedraggable.js';
4
4
  import Row from './components/table-row.vue.js';
5
- import { isArray, cloneDeep, isString, omit } from 'lodash-es';
5
+ import { isFunction, isArray, cloneDeep, isString, omit } from 'lodash-es';
6
6
  import { isDisable, setStyle, isDraggableItem, isDraggable, getGroupTree } from './utils/index.js';
7
7
  import { uuidGenerator } from '../../../shared/utils/index.js';
8
8
  import { HelpCircleSharp } from '@vicons/ionicons5';
@@ -652,10 +652,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
652
652
  }, {
653
653
  default: withCtx(() => [createTextVNode(toDisplayString(column.title), 1)]),
654
654
  _: 2
655
- }, 1032, ["checked", "onUpdate:checked", "disabled"])) : (openBlock(), createElementBlock(Fragment, {
655
+ }, 1032, ["checked", "onUpdate:checked", "disabled"])) : unref(isFunction)(column.titleRender) ? (openBlock(), createBlock(resolveDynamicComponent(() => column.titleRender(column)), {
656
656
  key: 1
657
+ })) : (openBlock(), createElementBlock(Fragment, {
658
+ key: 2
657
659
  }, [createTextVNode(toDisplayString(getTitle(column)), 1)], 64)), column.field === "sortPriority" ? (openBlock(), createBlock(unref(NTooltip), {
658
- key: 2,
660
+ key: 3,
659
661
  trigger: "hover"
660
662
  }, {
661
663
  trigger: withCtx(() => [createVNode(unref(NIcon), {
package/es/components/field-set/src/components/table-row.vue.d.ts CHANGED
@@ -383,11 +383,11 @@ declare const _default: import("vue").DefineComponent<{
383
383
  }>;
384
384
  developMode: boolean;
385
385
  draggable: boolean;
386
- fieldDescribeMode: "column" | "tooltip";
387
- isFieldSet: boolean;
388
- hideExpressionOption: AnyObject[];
386
+ isHighlightRow: boolean;
389
387
  idx: number;
390
388
  isHighlight: boolean;
391
- isHighlightRow: boolean;
389
+ isFieldSet: boolean;
390
+ fieldDescribeMode: "column" | "tooltip";
391
+ hideExpressionOption: AnyObject[];
392
392
  }>;
393
393
  export default _default;
package/es/components/field-set/src/types/index.d.ts CHANGED
@@ -28,6 +28,7 @@ export type FieldSetColumnItem = {
28
28
  isHeadCheckHide?: boolean;
29
29
  isShow?: boolean;
30
30
  contentRender?: (column: AnyObject, row: AnyObject) => VNodeChild;
31
+ titleRender?: (column: AnyObject) => VNodeChild;
31
32
  hide?: boolean;
32
33
  positionField?: string;
33
34
  [key: string]: any;
package/es/components/iho-chat/src/hooks/useDraggable.js CHANGED
@@ -65,6 +65,7 @@ function useDraggable(target, options = {}) {
65
65
  topRightElement();
66
66
  }
67
67
  };
68
+ const clamp = (val, min, max) => Math.max(min, Math.min(val, max));
68
69
  const onMouseDown = (e) => {
69
70
  var _a;
70
71
  if (!target.value)
@@ -87,12 +88,20 @@ function useDraggable(target, options = {}) {
87
88
  };
88
89
  const onMouseMove = (e) => {
89
90
  var _a;
90
- if (!isDragging.value)
91
+ if (!isDragging.value || !target.value)
91
92
  return;
92
93
  const dx = e.clientX - startMousePos.value.x;
93
94
  const dy = e.clientY - startMousePos.value.y;
94
- x.value = startPos.value.x + dx;
95
- y.value = startPos.value.y + dy;
95
+ const {
96
+ width,
97
+ height
98
+ } = target.value.getBoundingClientRect();
99
+ const minX = 0;
100
+ const minY = 0;
101
+ const maxX = window.innerWidth - width;
102
+ const maxY = window.innerHeight - height;
103
+ x.value = clamp(startPos.value.x + dx, minX, maxX);
104
+ y.value = clamp(startPos.value.y + dy, minY, maxY);
96
105
  updatePosition();
97
106
  (_a = options.onDrag) == null ? void 0 : _a.call(options, {
98
107
  x: x.value,
package/es/shared/package.json.js CHANGED
@@ -1,5 +1,5 @@
1
1
  var name = "@cnhis-design-vue/shared";
2
- var version = "3.3.3-beta.24";
2
+ var version = "3.3.3-beta.26";
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.3-beta.24",
3
+ "version": "3.3.3-beta.26",
4
4
  "license": "ISC",
5
5
  "module": "./es/components/index.js",
6
6
  "main": "./es/components/index.js",
@@ -73,5 +73,5 @@
73
73
  "iOS 7",
74
74
  "last 3 iOS versions"
75
75
  ],
76
- "gitHead": "306c63061cc5f7099aae06f1656f4f64e7f966f0"
76
+ "gitHead": "6ade384bd38c4da713d5dcb430b65b6213a284cd"
77
77
  }