ele-admin-plus 1.2.1 → 1.2.2-beta.2

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 (60) hide show
  1. package/es/ele-app/components/form-item-rest.d.ts +4 -0
  2. package/es/ele-app/components/form-item-rest.js +15 -0
  3. package/es/ele-cropper/components/cropper-tools.js +1 -1
  4. package/es/ele-cropper/style/index.scss +10 -1
  5. package/es/ele-data-table/index.js +3 -3
  6. package/es/ele-dropdown/components/pro-dropdown.d.ts +9 -0
  7. package/es/ele-dropdown/index.d.ts +11 -2
  8. package/es/ele-dropdown/index.js +3 -1
  9. package/es/ele-dropdown/props.d.ts +11 -2
  10. package/es/ele-dropdown/props.js +6 -1
  11. package/es/ele-file-list/index.js +2 -1
  12. package/es/ele-menus/components/item-title.js +4 -3
  13. package/es/ele-menus/types.d.ts +2 -0
  14. package/es/ele-pro-table/components/table-tools.js +1 -0
  15. package/es/ele-pro-table/index.js +19 -5
  16. package/es/ele-segmented/index.d.ts +9 -0
  17. package/es/ele-segmented/index.js +3 -1
  18. package/es/ele-segmented/props.d.ts +5 -0
  19. package/es/ele-segmented/props.js +6 -1
  20. package/es/ele-split-panel/index.d.ts +2 -0
  21. package/es/ele-split-panel/index.js +8 -8
  22. package/es/ele-split-panel/props.d.ts +3 -1
  23. package/es/ele-split-panel/props.js +3 -1
  24. package/es/ele-tab-wrap/components/tab-dropdown.js +2 -1
  25. package/es/ele-tabs/index.js +1 -0
  26. package/es/ele-tabs/style/index.scss +1 -2
  27. package/es/icons/LoadingOutlined.js +1 -1
  28. package/es/utils/hook.d.ts +16 -0
  29. package/es/utils/hook.js +57 -3
  30. package/lib/ele-app/components/form-item-rest.cjs +14 -0
  31. package/lib/ele-app/components/form-item-rest.d.ts +4 -0
  32. package/lib/ele-cropper/components/cropper-tools.cjs +1 -1
  33. package/lib/ele-cropper/style/index.scss +10 -1
  34. package/lib/ele-data-table/index.cjs +3 -3
  35. package/lib/ele-dropdown/components/pro-dropdown.d.ts +9 -0
  36. package/lib/ele-dropdown/index.cjs +3 -1
  37. package/lib/ele-dropdown/index.d.ts +11 -2
  38. package/lib/ele-dropdown/props.cjs +6 -1
  39. package/lib/ele-dropdown/props.d.ts +11 -2
  40. package/lib/ele-file-list/index.cjs +2 -1
  41. package/lib/ele-menus/components/item-title.cjs +4 -3
  42. package/lib/ele-menus/types.d.ts +2 -0
  43. package/lib/ele-pro-table/components/table-tools.cjs +1 -0
  44. package/lib/ele-pro-table/index.cjs +19 -5
  45. package/lib/ele-segmented/index.cjs +3 -1
  46. package/lib/ele-segmented/index.d.ts +9 -0
  47. package/lib/ele-segmented/props.cjs +6 -1
  48. package/lib/ele-segmented/props.d.ts +5 -0
  49. package/lib/ele-split-panel/index.cjs +8 -8
  50. package/lib/ele-split-panel/index.d.ts +2 -0
  51. package/lib/ele-split-panel/props.cjs +3 -1
  52. package/lib/ele-split-panel/props.d.ts +3 -1
  53. package/lib/ele-tab-wrap/components/tab-dropdown.cjs +2 -1
  54. package/lib/ele-tabs/index.cjs +1 -0
  55. package/lib/ele-tabs/style/index.scss +1 -2
  56. package/lib/icons/LoadingOutlined.cjs +1 -1
  57. package/lib/utils/hook.cjs +56 -2
  58. package/lib/utils/hook.d.ts +16 -0
  59. package/package.json +1 -1
  60. package/typings/global.d.ts +1 -1
@@ -0,0 +1,4 @@
1
+ declare const _default: import('vue').DefineComponent<{}, () => import('vue').VNode<import('vue').RendererNode, import('vue').RendererElement, {
2
+ [key: string]: any;
3
+ }>[] | undefined, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
4
+ export default _default;
@@ -0,0 +1,15 @@
1
+ import { defineComponent } from "vue";
2
+ import { useFormItemRest } from "../../utils/hook";
3
+ const formItemRest = defineComponent({
4
+ name: "FormItemRest",
5
+ setup(_props, { slots }) {
6
+ useFormItemRest();
7
+ return () => {
8
+ var _a;
9
+ return (_a = slots.default) == null ? void 0 : _a.call(slots);
10
+ };
11
+ }
12
+ });
13
+ export {
14
+ formItemRest as default
15
+ };
@@ -168,7 +168,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
168
168
  accept: _ctx.accept,
169
169
  showFileList: false,
170
170
  beforeUpload: _ctx.handleUpload,
171
- style: { "display": "inline-block", "line-height": "0" }
171
+ class: "ele-cropper-tool-upload"
172
172
  }, {
173
173
  default: withCtx(() => [
174
174
  createVNode(_component_ElButton, {
@@ -68,12 +68,21 @@
68
68
  }
69
69
 
70
70
  .ele-cropper-tool-item {
71
- margin: 10px 14px 0 0;
71
+ margin: 10px 10px 0 0;
72
72
  vertical-align: top;
73
73
 
74
74
  &:last-child {
75
75
  margin-right: 0;
76
76
  }
77
+
78
+ & > .ele-cropper-tool-upload {
79
+ float: left;
80
+ }
81
+
82
+ .ele-cropper-tool-upload {
83
+ line-height: 0;
84
+ display: inline-block;
85
+ }
77
86
  }
78
87
 
79
88
  .ele-cropper-tool {
@@ -331,10 +331,10 @@ const index = /* @__PURE__ */ defineComponent({
331
331
  }), {
332
332
  header: (slotProps) => {
333
333
  var _a, _b, _c;
334
- return col.headerSlot && !ownSlots.includes(col.headerSlot) && slots[col.headerSlot] ? (_a = slots[col.headerSlot]) == null ? void 0 : _a.call(slots, slotProps) : createVNode("div", {
334
+ return createVNode("div", {
335
335
  "class": "ele-cell-title",
336
- "title": (_b = slotProps == null ? void 0 : slotProps.column) == null ? void 0 : _b.label
337
- }, [(_c = slotProps == null ? void 0 : slotProps.column) == null ? void 0 : _c.label]);
336
+ "title": (_a = slotProps == null ? void 0 : slotProps.column) == null ? void 0 : _a.label
337
+ }, [col.headerSlot && !ownSlots.includes(col.headerSlot) && slots[col.headerSlot] ? (_b = slots[col.headerSlot]) == null ? void 0 : _b.call(slots, slotProps) : (_c = slotProps == null ? void 0 : slotProps.column) == null ? void 0 : _c.label]);
338
338
  },
339
339
  ["filter-icon"]: (slotProps) => {
340
340
  var _a;
@@ -17,6 +17,10 @@ declare const _default: import('vue').DefineComponent<{
17
17
  preventContextmenu: BooleanConstructor;
18
18
  splitButtonProps: PropType<import('../../ele-app/el').ElButtonProps>;
19
19
  caretButtonProps: PropType<import('../../ele-app/el').ElButtonProps>;
20
+ formValidate: {
21
+ type: BooleanConstructor;
22
+ default: boolean;
23
+ };
20
24
  type: {
21
25
  readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>) | ((new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>))[], unknown, unknown>>;
22
26
  readonly required: false;
@@ -128,6 +132,10 @@ declare const _default: import('vue').DefineComponent<{
128
132
  preventContextmenu: BooleanConstructor;
129
133
  splitButtonProps: PropType<import('../../ele-app/el').ElButtonProps>;
130
134
  caretButtonProps: PropType<import('../../ele-app/el').ElButtonProps>;
135
+ formValidate: {
136
+ type: BooleanConstructor;
137
+ default: boolean;
138
+ };
131
139
  type: {
132
140
  readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>) | ((new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>))[], unknown, unknown>>;
133
141
  readonly required: false;
@@ -234,5 +242,6 @@ declare const _default: import('vue').DefineComponent<{
234
242
  virtualTriggering: boolean;
235
243
  gpuAcceleration: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
236
244
  preventContextmenu: boolean;
245
+ formValidate: boolean;
237
246
  }, {}>;
238
247
  export default _default;
@@ -17,6 +17,10 @@ declare const _default: import('vue').DefineComponent<{
17
17
  preventContextmenu: BooleanConstructor;
18
18
  splitButtonProps: import('vue').PropType<import('../ele-app/el').ElButtonProps>;
19
19
  caretButtonProps: import('vue').PropType<import('../ele-app/el').ElButtonProps>;
20
+ formValidate: {
21
+ type: BooleanConstructor;
22
+ default: boolean;
23
+ };
20
24
  type: {
21
25
  readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>) | ((new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>))[], unknown, unknown>>;
22
26
  readonly required: false;
@@ -30,7 +34,7 @@ declare const _default: import('vue').DefineComponent<{
30
34
  readonly validator: ((val: unknown) => boolean) | undefined;
31
35
  readonly __epPropKey: true;
32
36
  };
33
- placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
37
+ placement: import('element-plus/es/utils/index').EpPropFinalized<(new (... /** 关闭下拉菜单 */args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
34
38
  popperClass: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
35
39
  teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
36
40
  disabled: BooleanConstructor;
@@ -120,6 +124,10 @@ declare const _default: import('vue').DefineComponent<{
120
124
  preventContextmenu: BooleanConstructor;
121
125
  splitButtonProps: import('vue').PropType<import('../ele-app/el').ElButtonProps>;
122
126
  caretButtonProps: import('vue').PropType<import('../ele-app/el').ElButtonProps>;
127
+ formValidate: {
128
+ type: BooleanConstructor;
129
+ default: boolean;
130
+ };
123
131
  type: {
124
132
  readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>) | ((new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>))[], unknown, unknown>>;
125
133
  readonly required: false;
@@ -133,7 +141,7 @@ declare const _default: import('vue').DefineComponent<{
133
141
  readonly validator: ((val: unknown) => boolean) | undefined;
134
142
  readonly __epPropKey: true;
135
143
  };
136
- placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
144
+ placement: import('element-plus/es/utils/index').EpPropFinalized<(new (... /** 关闭下拉菜单 */args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
137
145
  popperClass: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
138
146
  teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
139
147
  disabled: BooleanConstructor;
@@ -226,5 +234,6 @@ declare const _default: import('vue').DefineComponent<{
226
234
  virtualTriggering: boolean;
227
235
  gpuAcceleration: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
228
236
  preventContextmenu: boolean;
237
+ formValidate: boolean;
229
238
  }, {}>;
230
239
  export default _default;
@@ -38,7 +38,9 @@ const _sfc_main = defineComponent({
38
38
  const updateModelValue = (value) => {
39
39
  if (value !== props.modelValue) {
40
40
  emit("update:modelValue", value);
41
- validateChange();
41
+ if (props.formValidate) {
42
+ validateChange();
43
+ }
42
44
  emit("change", value);
43
45
  }
44
46
  };
@@ -14,7 +14,9 @@ declare const normalizeDropdownProps: import('../ele-app/types').Mutable<Omit<{
14
14
  readonly __epPropKey: true;
15
15
  };
16
16
  readonly type: {
17
- readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>) | ((new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>))[], unknown, unknown>>;
17
+ readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (
18
+ /** 是否支持表单验证 */
19
+ ... /** 是否支持表单验证 */args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>) | ((new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>))[], unknown, unknown>>;
18
20
  readonly required: false;
19
21
  readonly validator: ((val: unknown) => boolean) | undefined;
20
22
  __epPropKey: true;
@@ -66,8 +68,15 @@ export declare const dropdownProps: {
66
68
  splitButtonProps: PropType<ElButtonProps>;
67
69
  /** 箭头按钮属性 */
68
70
  caretButtonProps: PropType<ElButtonProps>;
71
+ /** 是否支持表单验证 */
72
+ formValidate: {
73
+ type: BooleanConstructor;
74
+ default: boolean;
75
+ };
69
76
  type: {
70
- readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>) | ((new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>))[], unknown, unknown>>;
77
+ readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (
78
+ /** 是否支持表单验证 */
79
+ ... /** 是否支持表单验证 */args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>) | ((new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "text" | "default" | "success" | "warning" | "info" | "primary" | "danger", unknown>))[], unknown, unknown>>;
71
80
  readonly required: false;
72
81
  readonly validator: ((val: unknown) => boolean) | undefined;
73
82
  __epPropKey: true;
@@ -50,7 +50,12 @@ const dropdownProps = {
50
50
  /** 内容按钮属性 */
51
51
  splitButtonProps: Object,
52
52
  /** 箭头按钮属性 */
53
- caretButtonProps: Object
53
+ caretButtonProps: Object,
54
+ /** 是否支持表单验证 */
55
+ formValidate: {
56
+ type: Boolean,
57
+ default: true
58
+ }
54
59
  };
55
60
  const dropdownEmits = {
56
61
  ...popoverEmits,
@@ -356,7 +356,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
356
356
  key: 2,
357
357
  persistent: false,
358
358
  placement: "bottom-start",
359
- popperClass: "ele-file-list-item-context"
359
+ popperClass: "ele-file-list-item-context",
360
+ formValidate: false
360
361
  }, _ctx.contextMenuProps || {}, {
361
362
  ref: "ctxMenuDropdownRef",
362
363
  componentType: "pro",
@@ -52,7 +52,7 @@ const _hoisted_1 = {
52
52
  key: 0,
53
53
  class: "ele-menu-title"
54
54
  };
55
- const _hoisted_2 = ["href"];
55
+ const _hoisted_2 = ["href", "target"];
56
56
  function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
57
57
  const _component_ElIcon = resolveComponent("ElIcon");
58
58
  const _component_ElBadge = resolveComponent("ElBadge");
@@ -89,15 +89,16 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
89
89
  _ctx.isExternalLink(_ctx.item.path) ? (openBlock(), createElementBlock("a", {
90
90
  key: 0,
91
91
  href: _ctx.item.path,
92
- target: "_blank",
92
+ target: _ctx.item.pathTarget || "_blank",
93
93
  class: "ele-menu-link",
94
94
  onClick: _cache[0] || (_cache[0] = withModifiers(() => {
95
95
  }, ["stop"]))
96
96
  }, null, 8, _hoisted_2)) : _ctx.item.path ? (openBlock(), createBlock(_component_RouterLink, {
97
97
  key: 1,
98
98
  to: _ctx.item.path,
99
+ target: _ctx.item.pathTarget,
99
100
  class: "ele-menu-link"
100
- }, null, 8, ["to"])) : createCommentVNode("", true)
101
+ }, null, 8, ["to", "target"])) : createCommentVNode("", true)
101
102
  ], 64)) : createCommentVNode("", true)
102
103
  ], 32)
103
104
  ], 64);
@@ -28,6 +28,8 @@ export interface MenuItem
28
28
  iconStyle?: StyleValue;
29
29
  /** 菜单链接地址 */
30
30
  path?: string;
31
+ /** 菜单的打开位置 */
32
+ pathTarget?: string;
31
33
  /** 是否展示为分组菜单 */
32
34
  group?: boolean;
33
35
  /** 徽章 */
@@ -306,6 +306,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
306
306
  createVNode(_component_EleDropdown, {
307
307
  trigger: "click",
308
308
  placement: "bottom",
309
+ formValidate: false,
309
310
  popperClass: "ele-tool-size-popper",
310
311
  modelValue: _ctx.size,
311
312
  items: _ctx.sizeDropdownItems,
@@ -235,14 +235,28 @@ const _sfc_main = defineComponent({
235
235
  );
236
236
  requestCallback(data, total, parent, result, resolve);
237
237
  }).catch((e) => {
238
- requestCallback(e == null ? void 0 : e.message);
238
+ const errorMsg = e == null ? void 0 : e.message;
239
+ requestCallback(
240
+ errorMsg == null ? errorMsg : String(errorMsg),
241
+ void 0,
242
+ parent,
243
+ e,
244
+ resolve
245
+ );
239
246
  resolve && console.error(e);
240
247
  });
241
248
  };
242
249
  const requestCallback = (data, total, parent, response, resolve) => {
243
- var _a;
244
- if (!Array.isArray(data)) {
245
- tableData.value = [];
250
+ var _a, _b;
251
+ if (data == null || !Array.isArray(data)) {
252
+ if (resolve) {
253
+ if (parent != null) {
254
+ parent[((_a = props.treeProps) == null ? void 0 : _a.children) || "children"] = [];
255
+ }
256
+ resolve([]);
257
+ } else {
258
+ tableData.value = [];
259
+ }
246
260
  tableLoading.value = false;
247
261
  if (typeof data === "string" && data) {
248
262
  errorText.value = data;
@@ -259,7 +273,7 @@ const _sfc_main = defineComponent({
259
273
  }
260
274
  if (resolve) {
261
275
  if (parent != null) {
262
- parent[((_a = props.treeProps) == null ? void 0 : _a.children) || "children"] = data;
276
+ parent[((_b = props.treeProps) == null ? void 0 : _b.children) || "children"] = data;
263
277
  }
264
278
  resolve(data);
265
279
  } else {
@@ -9,6 +9,10 @@ declare const _default: import('vue').DefineComponent<{
9
9
  required: boolean;
10
10
  };
11
11
  size: import('vue').PropType<import('./types').SegmentedSize>;
12
+ formValidate: {
13
+ type: BooleanConstructor;
14
+ default: boolean;
15
+ };
12
16
  }, {
13
17
  tabRef: import('vue').Ref<ElTabsInstance>;
14
18
  isEmptyActive: import('vue').ComputedRef<boolean>;
@@ -26,11 +30,16 @@ declare const _default: import('vue').DefineComponent<{
26
30
  required: boolean;
27
31
  };
28
32
  size: import('vue').PropType<import('./types').SegmentedSize>;
33
+ formValidate: {
34
+ type: BooleanConstructor;
35
+ default: boolean;
36
+ };
29
37
  }>> & {
30
38
  "onUpdate:modelValue"?: ((_value: string | number) => any) | undefined;
31
39
  onChange?: ((_active: string | number) => any) | undefined;
32
40
  }, {
33
41
  disabled: boolean;
34
42
  block: boolean;
43
+ formValidate: boolean;
35
44
  }, {}>;
36
45
  export default _default;
@@ -16,7 +16,9 @@ const _sfc_main = defineComponent({
16
16
  const handleUpdateModelValue = (value) => {
17
17
  if (props.modelValue !== value) {
18
18
  emit("update:modelValue", value);
19
- validateChange();
19
+ if (props.formValidate) {
20
+ validateChange();
21
+ }
20
22
  emit("change", value);
21
23
  }
22
24
  };
@@ -18,6 +18,11 @@ export declare const segmentedProps: {
18
18
  };
19
19
  /** 尺寸 */
20
20
  size: PropType<SegmentedSize>;
21
+ /** 是否支持表单验证 */
22
+ formValidate: {
23
+ type: BooleanConstructor;
24
+ default: boolean;
25
+ };
21
26
  };
22
27
  export type SegmentedProps = ExtractPropTypes<typeof segmentedProps>;
23
28
  /**
@@ -11,7 +11,12 @@ const segmentedProps = {
11
11
  required: true
12
12
  },
13
13
  /** 尺寸 */
14
- size: String
14
+ size: String,
15
+ /** 是否支持表单验证 */
16
+ formValidate: {
17
+ type: Boolean,
18
+ default: true
19
+ }
15
20
  };
16
21
  const segmentedEmits = {
17
22
  /** 更新绑定值 */
@@ -6,6 +6,7 @@ declare const _default: import('vue').DefineComponent<{
6
6
  maxSize: NumberConstructor;
7
7
  space: StringConstructor;
8
8
  customStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
9
+ customWrapStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
9
10
  bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
10
11
  allowCollapse: BooleanConstructor;
11
12
  collapseStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
@@ -37,6 +38,7 @@ declare const _default: import('vue').DefineComponent<{
37
38
  maxSize: NumberConstructor;
38
39
  space: StringConstructor;
39
40
  customStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
41
+ customWrapStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
40
42
  bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
41
43
  allowCollapse: BooleanConstructor;
42
44
  collapseStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
@@ -122,11 +122,7 @@ const _export_sfc = (sfc, props) => {
122
122
  }
123
123
  return target;
124
124
  };
125
- const _hoisted_1 = {
126
- ref: "wrapRef",
127
- class: "ele-split-panel-wrap"
128
- };
129
- const _hoisted_2 = { class: "ele-split-panel-space" };
125
+ const _hoisted_1 = { class: "ele-split-panel-space" };
130
126
  function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
131
127
  const _component_ArrowUp = resolveComponent("ArrowUp");
132
128
  const _component_ArrowLeft = resolveComponent("ArrowLeft");
@@ -149,7 +145,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
149
145
  })
150
146
  }, {
151
147
  default: withCtx(() => [
152
- createElementVNode("div", _hoisted_1, [
148
+ createElementVNode("div", {
149
+ ref: "wrapRef",
150
+ class: "ele-split-panel-wrap",
151
+ style: normalizeStyle(_ctx.customWrapStyle)
152
+ }, [
153
153
  createElementVNode("div", {
154
154
  ref: "sideRef",
155
155
  class: "ele-split-panel-side",
@@ -157,14 +157,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
157
157
  }, [
158
158
  renderSlot(_ctx.$slots, "default")
159
159
  ], 4),
160
- createElementVNode("div", _hoisted_2, [
160
+ createElementVNode("div", _hoisted_1, [
161
161
  _ctx.resizable ? (openBlock(), createElementBlock("div", {
162
162
  key: 0,
163
163
  class: "ele-split-resize-line",
164
164
  onMousedown: _cache[0] || (_cache[0] = (...args) => _ctx.handleResize && _ctx.handleResize(...args))
165
165
  }, null, 32)) : createCommentVNode("", true)
166
166
  ])
167
- ], 512),
167
+ ], 4),
168
168
  createElementVNode("div", {
169
169
  class: "ele-split-panel-body",
170
170
  style: normalizeStyle(_ctx.bodyStyle)
@@ -13,8 +13,10 @@ export declare const splitPanelProps: {
13
13
  maxSize: NumberConstructor;
14
14
  /** 间距 */
15
15
  space: StringConstructor;
16
- /** 自定义样式 */
16
+ /** 自定义边栏样式 */
17
17
  customStyle: PropType<StyleValue>;
18
+ /** 自定义边栏容器样式 */
19
+ customWrapStyle: PropType<StyleValue>;
18
20
  /** 自定义内容样式 */
19
21
  bodyStyle: PropType<StyleValue>;
20
22
  /** 是否可折叠 */
@@ -7,8 +7,10 @@ const splitPanelProps = {
7
7
  maxSize: Number,
8
8
  /** 间距 */
9
9
  space: String,
10
- /** 自定义样式 */
10
+ /** 自定义边栏样式 */
11
11
  customStyle: Object,
12
+ /** 自定义边栏容器样式 */
13
+ customWrapStyle: Object,
12
14
  /** 自定义内容样式 */
13
15
  bodyStyle: Object,
14
16
  /** 是否可折叠 */
@@ -57,7 +57,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
57
57
  popperClass: "ele-tab-popup",
58
58
  popperOptions: {
59
59
  modifiers: [{ name: "offset", options: { offset: [12, 8] } }]
60
- }
60
+ },
61
+ formValidate: false
61
62
  }, _ctx.dropdownProps || {}, {
62
63
  ref: "dropdownRef",
63
64
  items: _ctx.items,
@@ -436,6 +436,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
436
436
  key: 0,
437
437
  triggerKeys: [],
438
438
  persistent: false,
439
+ formValidate: false,
439
440
  placement: "bottom-start",
440
441
  popperClass: "ele-tab-popup",
441
442
  popperOptions: {
@@ -1043,8 +1043,6 @@
1043
1043
  /* 内部表格高度铺满 */
1044
1044
  .ele-tabs.is-flex-table {
1045
1045
  flex: 1;
1046
- display: flex;
1047
- flex-direction: column;
1048
1046
  overflow: auto;
1049
1047
 
1050
1048
  & > .el-tabs__content {
@@ -1056,6 +1054,7 @@
1056
1054
  display: flex;
1057
1055
  flex-direction: column;
1058
1056
  box-sizing: border-box;
1057
+ overflow: auto;
1059
1058
 
1060
1059
  & > .ele-pro-table {
1061
1060
  flex: 1;
@@ -16,7 +16,7 @@ const _hoisted_1 = {
16
16
  "stroke-width": "4",
17
17
  "stroke-linecap": "round"
18
18
  };
19
- const _hoisted_2 = /* @__PURE__ */ createElementVNode("path", { d: "M 22 6 C 34 6 42 14 42 26" }, null, -1);
19
+ const _hoisted_2 = /* @__PURE__ */ createElementVNode("path", { d: "M22 6C34 6 42 14 42 26" }, null, -1);
20
20
  const _hoisted_3 = [
21
21
  _hoisted_2
22
22
  ];
@@ -1,5 +1,10 @@
1
1
  import { Ref } from 'vue';
2
+ import { default as SortableJs } from 'sortablejs';
2
3
 
4
+ /**
5
+ * 重置组件表单验证
6
+ */
7
+ export declare function useFormItemRest(): void;
3
8
  /**
4
9
  * useTimer 返回结果
5
10
  */
@@ -111,3 +116,14 @@ export declare function useMoveEvent(option?: UseTouchEventOption<MoveEvent>): {
111
116
  handleMousedown: (e: MouseEvent) => void;
112
117
  handleTouchstart: (e: TouchEvent) => void;
113
118
  };
119
+ /**
120
+ * 拖拽排序
121
+ * @param getEl 获取容器方法
122
+ * @param getData 获取数据方法
123
+ * @param updateData 更新数据方法
124
+ * @param options 自定义参数
125
+ */
126
+ export declare function useSortable<T>(getEl: () => HTMLElement | undefined | null, getData: () => T[] | undefined | null, updateData: (data: T[]) => void, options?: SortableJs.Options): {
127
+ initSortable: () => void;
128
+ destroySortable: () => void;
129
+ };
package/es/utils/hook.js CHANGED
@@ -1,4 +1,9 @@
1
- import { ref, onBeforeUnmount } from "vue";
1
+ import { provide, ref, onBeforeUnmount, onMounted } from "vue";
2
+ import { formItemContextKey } from "element-plus";
3
+ import SortableJs from "sortablejs";
4
+ function useFormItemRest() {
5
+ provide(formItemContextKey, null);
6
+ }
2
7
  function useTimer(ms, cb) {
3
8
  let timer = null;
4
9
  const waiting = ref(false);
@@ -31,10 +36,18 @@ function useMediaQuery(query, onChange) {
31
36
  };
32
37
  const startWatch = () => {
33
38
  stopWatch();
34
- mediaQuery.addEventListener("change", handleChange);
39
+ if ("addEventListener" in mediaQuery) {
40
+ mediaQuery.addEventListener("change", handleChange);
41
+ } else {
42
+ mediaQuery.addListener(handleChange);
43
+ }
35
44
  };
36
45
  const stopWatch = () => {
37
- mediaQuery.removeEventListener("change", handleChange);
46
+ if ("removeEventListener" in mediaQuery) {
47
+ mediaQuery.removeEventListener("change", handleChange);
48
+ } else {
49
+ mediaQuery.removeListener(handleChange);
50
+ }
38
51
  handleChange();
39
52
  };
40
53
  onBeforeUnmount(() => {
@@ -253,11 +266,52 @@ function useMoveEvent(option) {
253
266
  handleTouchstart
254
267
  };
255
268
  }
269
+ function useSortable(getEl, getData, updateData, options) {
270
+ let sortableIns = null;
271
+ const destroySortable = () => {
272
+ if (sortableIns != null) {
273
+ sortableIns.destroy();
274
+ }
275
+ sortableIns = null;
276
+ };
277
+ const initSortable = () => {
278
+ destroySortable();
279
+ const el = getEl();
280
+ if (el == null) {
281
+ return;
282
+ }
283
+ sortableIns = new SortableJs(el, {
284
+ onUpdate: ({ oldDraggableIndex, newDraggableIndex }) => {
285
+ if (typeof oldDraggableIndex === "number" && typeof newDraggableIndex === "number") {
286
+ const data = [...getData() || []];
287
+ data.splice(
288
+ newDraggableIndex,
289
+ 0,
290
+ data.splice(oldDraggableIndex, 1)[0]
291
+ );
292
+ updateData(data);
293
+ }
294
+ },
295
+ setData: () => {
296
+ },
297
+ ...options || {}
298
+ });
299
+ };
300
+ onMounted(() => {
301
+ initSortable();
302
+ });
303
+ onBeforeUnmount(() => {
304
+ destroySortable();
305
+ });
306
+ return { initSortable, destroySortable };
307
+ }
256
308
  export {
257
309
  useCollapseAnim,
310
+ useFormItemRest,
258
311
  useMediaQuery,
259
312
  useMousewheel,
260
313
  useMoveEvent,
314
+ useSortable,
261
315
  useTimer,
262
316
  useTouchEvent,
263
317
  useWindowListener