ele-admin-plus 1.1.3 → 1.1.4-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 (284) hide show
  1. package/es/ele-alert/index.d.ts +10 -10
  2. package/es/ele-alert/props.d.ts +6 -6
  3. package/es/ele-app/style/message.scss +1 -0
  4. package/es/ele-app/style/overwrite.scss +84 -3
  5. package/es/ele-app/types/index.d.ts +7 -6
  6. package/es/ele-avatar-group/index.d.ts +7 -8
  7. package/es/ele-avatar-group/props.d.ts +3 -4
  8. package/es/ele-basic-select/style/index.scss +4 -6
  9. package/es/ele-bottom-bar/index.d.ts +4 -4
  10. package/es/ele-bottom-bar/props.d.ts +2 -3
  11. package/es/ele-card/index.d.ts +6 -6
  12. package/es/ele-card/props.d.ts +3 -4
  13. package/es/ele-check-card/components/card-item.d.ts +2 -3
  14. package/es/ele-check-card/index.d.ts +4 -4
  15. package/es/ele-check-card/props.d.ts +3 -3
  16. package/es/ele-config-provider/receiver.d.ts +1 -1
  17. package/es/ele-config-provider/receiver.js +29 -29
  18. package/es/ele-copyable/index.d.ts +8 -8
  19. package/es/ele-copyable/index.js +5 -4
  20. package/es/ele-copyable/props.d.ts +5 -5
  21. package/es/ele-copyable/style/index.scss +4 -0
  22. package/es/ele-count-up/index.d.ts +2 -2
  23. package/es/ele-count-up/index.js +2 -1
  24. package/es/ele-count-up/props.d.ts +1 -1
  25. package/es/ele-cropper/index.js +2 -2
  26. package/es/ele-dashboard/index.d.ts +1 -2
  27. package/es/ele-drawer/index.d.ts +16 -10
  28. package/es/ele-drawer/props.d.ts +7 -6
  29. package/es/ele-dropdown/index.d.ts +2 -2
  30. package/es/ele-dropdown/props.d.ts +1 -2
  31. package/es/ele-edit-tag/index.d.ts +4 -4
  32. package/es/ele-edit-tag/props.d.ts +2 -3
  33. package/es/ele-ellipsis/index.d.ts +4 -5
  34. package/es/ele-ellipsis/props.d.ts +1 -1
  35. package/es/ele-ellipsis/style/index.scss +4 -0
  36. package/es/ele-file-list/index.d.ts +2 -7
  37. package/es/ele-file-list/index.js +2 -2
  38. package/es/ele-file-list/types/index.d.ts +0 -4
  39. package/es/ele-icon-select/components/icon-grid.d.ts +5 -5
  40. package/es/ele-icon-select/components/icon-popper.d.ts +15 -15
  41. package/es/ele-icon-select/index.d.ts +15 -16
  42. package/es/ele-icon-select/props.d.ts +8 -8
  43. package/es/ele-loading/index.d.ts +26 -1
  44. package/es/ele-loading/index.js +53 -11
  45. package/es/ele-loading/props.d.ts +11 -1
  46. package/es/ele-loading/props.js +16 -1
  47. package/es/ele-loading/style/css-var.scss +7 -0
  48. package/es/ele-loading/style/index.js +1 -0
  49. package/es/ele-loading/style/index.scss +90 -0
  50. package/es/ele-loading/types/index.d.ts +17 -0
  51. package/es/ele-map-picker/components/map-view.d.ts +2 -2
  52. package/es/ele-map-picker/index.d.ts +2 -2
  53. package/es/ele-map-picker/props.d.ts +3 -3
  54. package/es/ele-menus/index.d.ts +2 -0
  55. package/es/ele-menus/index.js +11 -5
  56. package/es/ele-menus/props.d.ts +10 -0
  57. package/es/ele-menus/props.js +7 -1
  58. package/es/ele-menus/style/index.scss +18 -18
  59. package/es/ele-menus/types/index.d.ts +4 -0
  60. package/es/ele-menus/util.d.ts +4 -3
  61. package/es/ele-menus/util.js +23 -12
  62. package/es/ele-modal/index.d.ts +19 -13
  63. package/es/ele-modal/props.d.ts +8 -7
  64. package/es/ele-modal/types/index.d.ts +9 -0
  65. package/es/ele-modal/util.js +45 -32
  66. package/es/ele-pagination/index.d.ts +1 -1
  67. package/es/ele-popconfirm/index.d.ts +10 -10
  68. package/es/ele-popconfirm/index.js +8 -2
  69. package/es/ele-popconfirm/props.d.ts +6 -6
  70. package/es/ele-popover/index.d.ts +6 -6
  71. package/es/ele-popover/props.d.ts +3 -4
  72. package/es/ele-printer/index.d.ts +7 -6
  73. package/es/ele-printer/index.js +11 -4
  74. package/es/ele-printer/props.d.ts +3 -4
  75. package/es/ele-pro-layout/components/pro-header.d.ts +7 -2
  76. package/es/ele-pro-layout/components/pro-header.js +15 -5
  77. package/es/ele-pro-layout/components/pro-iframe.js +10 -7
  78. package/es/ele-pro-layout/components/pro-sidebar.d.ts +7 -2
  79. package/es/ele-pro-layout/components/pro-sidebar.js +14 -5
  80. package/es/ele-pro-layout/components/pro-sidebox.d.ts +11 -4
  81. package/es/ele-pro-layout/components/pro-sidebox.js +16 -5
  82. package/es/ele-pro-layout/components/tab-dropdown.js +1 -4
  83. package/es/ele-pro-layout/index.d.ts +17 -3
  84. package/es/ele-pro-layout/index.js +208 -105
  85. package/es/ele-pro-layout/props.d.ts +6 -1
  86. package/es/ele-pro-layout/props.js +10 -0
  87. package/es/ele-pro-layout/style/collapse.scss +9 -10
  88. package/es/ele-pro-layout/style/index.js +0 -1
  89. package/es/ele-pro-layout/style/layout-mobile.scss +1 -0
  90. package/es/ele-pro-layout/types/index.d.ts +9 -0
  91. package/es/ele-pro-layout/util.d.ts +4 -2
  92. package/es/ele-pro-layout/util.js +20 -17
  93. package/es/ele-pro-table/components/table-view.d.ts +9 -3
  94. package/es/ele-pro-table/components/table-view.js +27 -24
  95. package/es/ele-pro-table/components/tool-column.d.ts +2 -1
  96. package/es/ele-pro-table/components/tool-column.js +26 -18
  97. package/es/ele-pro-table/index.d.ts +46 -25
  98. package/es/ele-pro-table/index.js +182 -196
  99. package/es/ele-pro-table/props.d.ts +27 -15
  100. package/es/ele-pro-table/props.js +15 -3
  101. package/es/ele-pro-table/style/index.js +1 -1
  102. package/es/ele-pro-table/style/index.scss +64 -8
  103. package/es/ele-pro-table/types/index.d.ts +39 -5
  104. package/es/ele-pro-table/util.d.ts +84 -49
  105. package/es/ele-pro-table/util.js +193 -78
  106. package/es/ele-qr-code/index.d.ts +3 -3
  107. package/es/ele-qr-code/props.d.ts +1 -2
  108. package/es/ele-qr-code-svg/index.d.ts +3 -3
  109. package/es/ele-split-panel/index.d.ts +6 -6
  110. package/es/ele-split-panel/props.d.ts +3 -4
  111. package/es/ele-table/style/index.scss +1 -0
  112. package/es/ele-tabs/index.js +4 -3
  113. package/es/ele-tabs/types/index.d.ts +3 -0
  114. package/es/ele-text/index.d.ts +3 -3
  115. package/es/ele-text/props.d.ts +2 -2
  116. package/es/ele-toolbar/index.d.ts +6 -6
  117. package/es/ele-toolbar/props.d.ts +3 -4
  118. package/es/ele-tooltip/index.d.ts +3 -3
  119. package/es/ele-tooltip/props.d.ts +1 -2
  120. package/es/ele-tour/index.d.ts +2 -3
  121. package/es/ele-tour/style/index.scss +1 -1
  122. package/es/ele-tour/util.js +3 -3
  123. package/es/ele-upload-list/index.d.ts +8 -7
  124. package/es/ele-upload-list/index.js +18 -11
  125. package/es/ele-upload-list/props.d.ts +4 -4
  126. package/es/ele-upload-list/props.js +1 -1
  127. package/es/ele-watermark/index.d.ts +16 -8
  128. package/es/ele-watermark/index.js +18 -12
  129. package/es/ele-watermark/props.d.ts +3 -1
  130. package/es/ele-watermark/props.js +5 -1
  131. package/es/ele-watermark/util.js +1 -1
  132. package/es/ele-xg-player/index.js +1 -0
  133. package/es/style/index.scss +1 -0
  134. package/es/style/nprogress.scss +2 -2
  135. package/es/style/themes/default.scss +36 -12
  136. package/es/style/themes/rounded.scss +4 -2
  137. package/es/style/themes/theme-util.scss +2 -0
  138. package/es/utils/core.d.ts +1 -1
  139. package/es/utils/core.js +17 -15
  140. package/es/utils/resolvers.js +2 -2
  141. package/lib/ele-alert/index.d.ts +10 -10
  142. package/lib/ele-alert/props.d.ts +6 -6
  143. package/lib/ele-app/style/message.scss +1 -0
  144. package/lib/ele-app/style/overwrite.scss +84 -3
  145. package/lib/ele-app/types/index.d.ts +7 -6
  146. package/lib/ele-avatar-group/index.d.ts +7 -8
  147. package/lib/ele-avatar-group/props.d.ts +3 -4
  148. package/lib/ele-basic-select/style/index.scss +4 -6
  149. package/lib/ele-bottom-bar/index.d.ts +4 -4
  150. package/lib/ele-bottom-bar/props.d.ts +2 -3
  151. package/lib/ele-card/index.d.ts +6 -6
  152. package/lib/ele-card/props.d.ts +3 -4
  153. package/lib/ele-check-card/components/card-item.d.ts +2 -3
  154. package/lib/ele-check-card/index.d.ts +4 -4
  155. package/lib/ele-check-card/props.d.ts +3 -3
  156. package/lib/ele-config-provider/receiver.d.ts +1 -1
  157. package/lib/ele-config-provider/receiver.js +2 -2
  158. package/lib/ele-copyable/index.d.ts +8 -8
  159. package/lib/ele-copyable/index.js +4 -3
  160. package/lib/ele-copyable/props.d.ts +5 -5
  161. package/lib/ele-copyable/style/index.scss +4 -0
  162. package/lib/ele-count-up/index.d.ts +2 -2
  163. package/lib/ele-count-up/index.js +2 -1
  164. package/lib/ele-count-up/props.d.ts +1 -1
  165. package/lib/ele-cropper/index.js +2 -2
  166. package/lib/ele-dashboard/index.d.ts +1 -2
  167. package/lib/ele-drawer/index.d.ts +16 -10
  168. package/lib/ele-drawer/props.d.ts +7 -6
  169. package/lib/ele-dropdown/index.d.ts +2 -2
  170. package/lib/ele-dropdown/props.d.ts +1 -2
  171. package/lib/ele-edit-tag/index.d.ts +4 -4
  172. package/lib/ele-edit-tag/props.d.ts +2 -3
  173. package/lib/ele-ellipsis/index.d.ts +4 -5
  174. package/lib/ele-ellipsis/props.d.ts +1 -1
  175. package/lib/ele-ellipsis/style/index.scss +4 -0
  176. package/lib/ele-file-list/index.d.ts +2 -7
  177. package/lib/ele-file-list/index.js +2 -2
  178. package/lib/ele-file-list/types/index.d.ts +0 -4
  179. package/lib/ele-icon-select/components/icon-grid.d.ts +5 -5
  180. package/lib/ele-icon-select/components/icon-popper.d.ts +15 -15
  181. package/lib/ele-icon-select/index.d.ts +15 -16
  182. package/lib/ele-icon-select/props.d.ts +8 -8
  183. package/lib/ele-loading/index.d.ts +26 -1
  184. package/lib/ele-loading/index.js +52 -10
  185. package/lib/ele-loading/props.d.ts +11 -1
  186. package/lib/ele-loading/props.js +16 -1
  187. package/lib/ele-loading/style/css-var.scss +7 -0
  188. package/lib/ele-loading/style/index.js +1 -0
  189. package/lib/ele-loading/style/index.scss +90 -0
  190. package/lib/ele-loading/types/index.d.ts +17 -0
  191. package/lib/ele-map-picker/components/map-view.d.ts +2 -2
  192. package/lib/ele-map-picker/index.d.ts +2 -2
  193. package/lib/ele-map-picker/props.d.ts +3 -3
  194. package/lib/ele-menus/index.d.ts +2 -0
  195. package/lib/ele-menus/index.js +9 -3
  196. package/lib/ele-menus/props.d.ts +10 -0
  197. package/lib/ele-menus/props.js +6 -0
  198. package/lib/ele-menus/style/index.scss +18 -18
  199. package/lib/ele-menus/types/index.d.ts +4 -0
  200. package/lib/ele-menus/util.d.ts +4 -3
  201. package/lib/ele-menus/util.js +23 -12
  202. package/lib/ele-modal/index.d.ts +19 -13
  203. package/lib/ele-modal/props.d.ts +8 -7
  204. package/lib/ele-modal/types/index.d.ts +9 -0
  205. package/lib/ele-modal/util.js +45 -32
  206. package/lib/ele-pagination/index.d.ts +1 -1
  207. package/lib/ele-popconfirm/index.d.ts +10 -10
  208. package/lib/ele-popconfirm/index.js +8 -2
  209. package/lib/ele-popconfirm/props.d.ts +6 -6
  210. package/lib/ele-popover/index.d.ts +6 -6
  211. package/lib/ele-popover/props.d.ts +3 -4
  212. package/lib/ele-printer/index.d.ts +7 -6
  213. package/lib/ele-printer/index.js +10 -3
  214. package/lib/ele-printer/props.d.ts +3 -4
  215. package/lib/ele-pro-layout/components/pro-header.d.ts +7 -2
  216. package/lib/ele-pro-layout/components/pro-header.js +15 -5
  217. package/lib/ele-pro-layout/components/pro-iframe.js +10 -7
  218. package/lib/ele-pro-layout/components/pro-sidebar.d.ts +7 -2
  219. package/lib/ele-pro-layout/components/pro-sidebar.js +14 -5
  220. package/lib/ele-pro-layout/components/pro-sidebox.d.ts +11 -4
  221. package/lib/ele-pro-layout/components/pro-sidebox.js +16 -5
  222. package/lib/ele-pro-layout/components/tab-dropdown.js +1 -4
  223. package/lib/ele-pro-layout/index.d.ts +17 -3
  224. package/lib/ele-pro-layout/index.js +205 -102
  225. package/lib/ele-pro-layout/props.d.ts +6 -1
  226. package/lib/ele-pro-layout/props.js +10 -0
  227. package/lib/ele-pro-layout/style/collapse.scss +9 -10
  228. package/lib/ele-pro-layout/style/index.js +0 -1
  229. package/lib/ele-pro-layout/style/layout-mobile.scss +1 -0
  230. package/lib/ele-pro-layout/types/index.d.ts +9 -0
  231. package/lib/ele-pro-layout/util.d.ts +4 -2
  232. package/lib/ele-pro-layout/util.js +19 -16
  233. package/lib/ele-pro-table/components/table-view.d.ts +9 -3
  234. package/lib/ele-pro-table/components/table-view.js +25 -22
  235. package/lib/ele-pro-table/components/tool-column.d.ts +2 -1
  236. package/lib/ele-pro-table/components/tool-column.js +25 -17
  237. package/lib/ele-pro-table/index.d.ts +46 -25
  238. package/lib/ele-pro-table/index.js +180 -194
  239. package/lib/ele-pro-table/props.d.ts +27 -15
  240. package/lib/ele-pro-table/props.js +15 -3
  241. package/lib/ele-pro-table/style/index.js +1 -1
  242. package/lib/ele-pro-table/style/index.scss +64 -8
  243. package/lib/ele-pro-table/types/index.d.ts +39 -5
  244. package/lib/ele-pro-table/util.d.ts +84 -49
  245. package/lib/ele-pro-table/util.js +192 -77
  246. package/lib/ele-qr-code/index.d.ts +3 -3
  247. package/lib/ele-qr-code/props.d.ts +1 -2
  248. package/lib/ele-qr-code-svg/index.d.ts +3 -3
  249. package/lib/ele-split-panel/index.d.ts +6 -6
  250. package/lib/ele-split-panel/props.d.ts +3 -4
  251. package/lib/ele-table/style/index.scss +1 -0
  252. package/lib/ele-tabs/index.js +4 -3
  253. package/lib/ele-tabs/types/index.d.ts +3 -0
  254. package/lib/ele-text/index.d.ts +3 -3
  255. package/lib/ele-text/props.d.ts +2 -2
  256. package/lib/ele-toolbar/index.d.ts +6 -6
  257. package/lib/ele-toolbar/props.d.ts +3 -4
  258. package/lib/ele-tooltip/index.d.ts +3 -3
  259. package/lib/ele-tooltip/props.d.ts +1 -2
  260. package/lib/ele-tour/index.d.ts +2 -3
  261. package/lib/ele-tour/style/index.scss +1 -1
  262. package/lib/ele-tour/util.js +3 -3
  263. package/lib/ele-upload-list/index.d.ts +8 -7
  264. package/lib/ele-upload-list/index.js +17 -10
  265. package/lib/ele-upload-list/props.d.ts +4 -4
  266. package/lib/ele-upload-list/props.js +1 -1
  267. package/lib/ele-watermark/index.d.ts +16 -8
  268. package/lib/ele-watermark/index.js +17 -11
  269. package/lib/ele-watermark/props.d.ts +3 -1
  270. package/lib/ele-watermark/props.js +5 -1
  271. package/lib/ele-watermark/util.js +1 -1
  272. package/lib/ele-xg-player/index.js +1 -0
  273. package/lib/style/index.scss +1 -0
  274. package/lib/style/nprogress.scss +2 -2
  275. package/lib/style/themes/default.scss +36 -12
  276. package/lib/style/themes/rounded.scss +4 -2
  277. package/lib/style/themes/theme-util.scss +2 -0
  278. package/lib/utils/core.d.ts +1 -1
  279. package/lib/utils/core.js +17 -15
  280. package/lib/utils/resolvers.js +2 -2
  281. package/package.json +25 -23
  282. package/typings/global.d.ts +52 -52
  283. package/es/ele-alert/types/index.d.ts +0 -0
  284. package/lib/ele-alert/types/index.d.ts +0 -0
@@ -1,10 +1,9 @@
1
1
  import type { PropType, ExtractPropTypes } from 'vue';
2
- import type { StyleValue } from '../ele-app/types';
3
2
  /**
4
3
  * 属性
5
4
  */
6
5
  export declare const tooltipProps: {
7
- bodyStyle: PropType<StyleValue>;
6
+ bodyStyle: PropType<Partial<import("vue").CSSProperties>>;
8
7
  bg: StringConstructor;
9
8
  arrowBg: StringConstructor;
10
9
  keepAlive: BooleanConstructor;
@@ -1,5 +1,4 @@
1
1
  import type { Ref } from 'vue';
2
- import type { StyleValue } from '../ele-app/types';
3
2
  import type { ElePopoverProps } from '../ele-avatar-group/types';
4
3
  import type { TourStep, TourLocale } from './types';
5
4
  declare const _default: import("vue").DefineComponent<{
@@ -26,10 +25,10 @@ declare const _default: import("vue").DefineComponent<{
26
25
  visible: Ref<boolean>;
27
26
  step: import("vue").ShallowRef<TourStep | null>;
28
27
  isLast: Ref<boolean>;
29
- boxStyle: Ref<StyleValue>;
28
+ boxStyle: Ref<Partial<import("vue").CSSProperties>>;
30
29
  showMask: Ref<boolean>;
31
30
  popProps: import("vue").ShallowRef<ElePopoverProps>;
32
- rootStyle: import("vue").ComputedRef<StyleValue>;
31
+ rootStyle: import("vue").ComputedRef<Partial<import("vue").CSSProperties>>;
33
32
  onPrev: () => void;
34
33
  onNext: () => void;
35
34
  onFinish: () => void;
@@ -89,7 +89,7 @@
89
89
  transform: translateY(-50.1%);
90
90
  transform-origin: center !important;
91
91
  box-sizing: border-box;
92
- max-width: 100%;
92
+ max-width: calc(100% - 32px);
93
93
 
94
94
  & > .el-popper__arrow {
95
95
  display: none;
@@ -2,10 +2,10 @@
2
2
  Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
3
  function getOffset(el) {
4
4
  const { top, left } = el.getBoundingClientRect();
5
- const { pageYOffset, pageXOffset } = el.ownerDocument.defaultView ?? {};
5
+ const { scrollY, scrollX } = el.ownerDocument.defaultView ?? {};
6
6
  return {
7
- top: top + (pageYOffset ?? 0),
8
- left: left + (pageXOffset ?? 0)
7
+ top: top + (scrollY ?? 0),
8
+ left: left + (scrollX ?? 0)
9
9
  };
10
10
  }
11
11
  function getPopProps(visible, modal, props) {
@@ -18,10 +18,10 @@ declare const _default: import("vue").DefineComponent<{
18
18
  type: StringConstructor;
19
19
  default: string;
20
20
  };
21
- itemStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
22
- buttonStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
21
+ itemStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
22
+ buttonStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
23
23
  sortable: {
24
- type: BooleanConstructor;
24
+ type: import("vue").PropType<boolean | Record<string | number | symbol, any>>;
25
25
  default: boolean;
26
26
  };
27
27
  progressProps: import("vue").PropType<import("../ele-app/types").ElProgressProps>;
@@ -36,6 +36,7 @@ declare const _default: import("vue").DefineComponent<{
36
36
  images: string[];
37
37
  };
38
38
  uploadEnable: import("vue").ComputedRef<boolean>;
39
+ draggableProps: import("vue").ComputedRef<Record<string | number | symbol, any>>;
39
40
  updateModelValue: (value: UploadItem[]) => void;
40
41
  onUpload: (file: File) => boolean;
41
42
  onItemRemove: (item: UploadItem) => void;
@@ -65,10 +66,10 @@ declare const _default: import("vue").DefineComponent<{
65
66
  type: StringConstructor;
66
67
  default: string;
67
68
  };
68
- itemStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
69
- buttonStyle: import("vue").PropType<import("../ele-app/types").StyleValue>;
69
+ itemStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
70
+ buttonStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
70
71
  sortable: {
71
- type: BooleanConstructor;
72
+ type: import("vue").PropType<boolean | Record<string | number | symbol, any>>;
72
73
  default: boolean;
73
74
  };
74
75
  progressProps: import("vue").PropType<import("../ele-app/types").ElProgressProps>;
@@ -82,7 +83,7 @@ declare const _default: import("vue").DefineComponent<{
82
83
  }, {
83
84
  disabled: boolean;
84
85
  readonly: boolean;
85
- sortable: boolean;
86
+ sortable: boolean | Record<string | number | symbol, any>;
86
87
  drag: boolean;
87
88
  multiple: boolean;
88
89
  preview: boolean;
@@ -36,6 +36,20 @@ const _sfc_main = vue.defineComponent({
36
36
  const uploadEnable = vue.computed(() => {
37
37
  return !props2.readonly && !(typeof props2.limit === "number" && props2.limit > 0 && props2.modelValue != null && props2.modelValue.length >= props2.limit);
38
38
  });
39
+ const draggableProps = vue.computed(() => {
40
+ const defaultProps = {
41
+ itemKey: "key",
42
+ animation: 300,
43
+ setData: () => void 0,
44
+ modelValue: props2.modelValue,
45
+ draggable: ".ele-draggable",
46
+ class: ["ele-upload-list", { "is-disabled": props2.disabled }]
47
+ };
48
+ if (typeof props2.sortable === "boolean" || props2.sortable == null) {
49
+ return defaultProps;
50
+ }
51
+ return Object.assign(defaultProps, props2.sortable);
52
+ });
39
53
  const updateModelValue = (value) => {
40
54
  emit("update:modelValue", value);
41
55
  };
@@ -91,6 +105,7 @@ const _sfc_main = vue.defineComponent({
91
105
  previewRef,
92
106
  previewOption,
93
107
  uploadEnable,
108
+ draggableProps,
94
109
  updateModelValue,
95
110
  onUpload,
96
111
  onItemRemove,
@@ -114,15 +129,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
114
129
  const _component_ElUpload = vue.resolveComponent("ElUpload");
115
130
  const _component_ElImage = vue.resolveComponent("ElImage");
116
131
  const _component_VueDraggable = vue.resolveComponent("VueDraggable");
117
- return vue.openBlock(), vue.createBlock(_component_VueDraggable, {
118
- itemKey: "key",
119
- animation: 300,
120
- setData: () => void 0,
121
- modelValue: _ctx.modelValue,
122
- draggable: ".ele-draggable",
123
- class: vue.normalizeClass(["ele-upload-list", { "is-disabled": _ctx.disabled }]),
124
- "onUpdate:modelValue": _ctx.updateModelValue
125
- }, {
132
+ return vue.openBlock(), vue.createBlock(_component_VueDraggable, vue.mergeProps(_ctx.draggableProps, { "onUpdate:modelValue": _ctx.updateModelValue }), {
126
133
  item: vue.withCtx(({ element }) => [
127
134
  vue.createVNode(_component_ListItem, {
128
135
  item: element,
@@ -189,7 +196,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
189
196
  ])
190
197
  ]),
191
198
  _: 3
192
- }, 8, ["modelValue", "class", "onUpdate:modelValue"]);
199
+ }, 16, ["onUpdate:modelValue"]);
193
200
  }
194
201
  const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
195
202
  module.exports = index;
@@ -1,5 +1,5 @@
1
1
  import type { PropType, ExtractPropTypes } from 'vue';
2
- import type { StyleValue, ElProgressProps } from '../ele-app/types';
2
+ import type { ElProgressProps } from '../ele-app/types';
3
3
  import type { UploadItem, UploadLocale } from './types';
4
4
  /**
5
5
  * 属性
@@ -22,10 +22,10 @@ export declare const uploadListProps: {
22
22
  type: StringConstructor;
23
23
  default: string;
24
24
  };
25
- itemStyle: PropType<StyleValue>;
26
- buttonStyle: PropType<StyleValue>;
25
+ itemStyle: PropType<Partial<import("vue").CSSProperties>>;
26
+ buttonStyle: PropType<Partial<import("vue").CSSProperties>>;
27
27
  sortable: {
28
- type: BooleanConstructor;
28
+ type: PropType<boolean | Record<string | number | symbol, any>>;
29
29
  default: boolean;
30
30
  };
31
31
  progressProps: PropType<ElProgressProps>;
@@ -32,7 +32,7 @@ const uploadListProps = {
32
32
  buttonStyle: Object,
33
33
  // 是否开启拖拽排序
34
34
  sortable: {
35
- type: Boolean,
35
+ type: [Boolean, Object],
36
36
  default: true
37
37
  },
38
38
  // 进度条属性
@@ -1,3 +1,4 @@
1
+ import type { Ref } from 'vue';
1
2
  declare const _default: import("vue").DefineComponent<{
2
3
  width: NumberConstructor;
3
4
  height: NumberConstructor;
@@ -8,13 +9,15 @@ declare const _default: import("vue").DefineComponent<{
8
9
  font: import("vue").PropType<import("./types").WatermarkFont>;
9
10
  gap: import("vue").PropType<import("./types").WatermarkGap>;
10
11
  offset: import("vue").PropType<import("./types").WatermarkOffset>;
11
- customStyle: import("vue").PropType<import("vue").CSSProperties>;
12
+ customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
13
+ fixed: BooleanConstructor;
14
+ disabled: BooleanConstructor;
12
15
  }, {
13
- rootKey: import("vue").Ref<number>;
14
- rootRef: import("vue").Ref<HTMLDivElement | null>;
15
- imgKey: import("vue").Ref<number>;
16
- imgRef: import("vue").Ref<HTMLDivElement | null>;
17
- imgStyle: import("vue").Ref<import("vue").CSSProperties | undefined>;
16
+ rootKey: Ref<number>;
17
+ rootRef: Ref<HTMLDivElement | null>;
18
+ imgKey: Ref<number>;
19
+ imgRef: Ref<HTMLDivElement | null>;
20
+ imgStyle: Ref<Partial<import("vue").CSSProperties>>;
18
21
  }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
19
22
  width: NumberConstructor;
20
23
  height: NumberConstructor;
@@ -25,6 +28,11 @@ declare const _default: import("vue").DefineComponent<{
25
28
  font: import("vue").PropType<import("./types").WatermarkFont>;
26
29
  gap: import("vue").PropType<import("./types").WatermarkGap>;
27
30
  offset: import("vue").PropType<import("./types").WatermarkOffset>;
28
- customStyle: import("vue").PropType<import("vue").CSSProperties>;
29
- }>>, {}, {}>;
31
+ customStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
32
+ fixed: BooleanConstructor;
33
+ disabled: BooleanConstructor;
34
+ }>>, {
35
+ disabled: boolean;
36
+ fixed: boolean;
37
+ }, {}>;
30
38
  export default _default;
@@ -1,6 +1,5 @@
1
1
  "use strict";
2
2
  const vue = require("vue");
3
- const receiver = require("../ele-config-provider/receiver");
4
3
  const util = require("./util");
5
4
  const props = require("./props");
6
5
  const SIZE = 2;
@@ -9,7 +8,6 @@ const _sfc_main = vue.defineComponent({
9
8
  name: "EleWatermark",
10
9
  props: props.watermarkProps,
11
10
  setup(props2) {
12
- const { authenticated } = receiver.useLicense();
13
11
  const { observe, disconnect } = util.useMutation({
14
12
  getRoot: () => rootRef.value,
15
13
  getEl: () => imgRef.value,
@@ -32,16 +30,19 @@ const _sfc_main = vue.defineComponent({
32
30
  const rootRef = vue.ref(null);
33
31
  const imgKey = vue.ref(1);
34
32
  const imgRef = vue.ref(null);
35
- const imgStyle = vue.ref();
33
+ const imgStyle = vue.ref({ display: "none" });
36
34
  const updateStyle = (base64, size) => {
35
+ const position = props2.fixed ? "fixed" : "absolute";
36
+ const width = props2.fixed ? "100vw" : "100%";
37
+ const height = props2.fixed ? "100vh" : "100%";
37
38
  const style = {
38
- position: "absolute !important",
39
+ position: `${position} !important`,
39
40
  top: "0 !important",
40
41
  left: "0 !important",
41
42
  right: "auto !important",
42
43
  bottom: "auto !important",
43
- width: "100% !important",
44
- height: "100% !important",
44
+ width: `${width} !important`,
45
+ height: `${height} !important`,
45
46
  pointerEvents: "none !important",
46
47
  backgroundRepeat: "repeat !important",
47
48
  opacity: "1 !important",
@@ -50,7 +51,7 @@ const _sfc_main = vue.defineComponent({
50
51
  display: "block !important",
51
52
  ...props2.customStyle
52
53
  };
53
- if (!authenticated || !base64) {
54
+ if (!base64) {
54
55
  style.display = "none !important";
55
56
  } else {
56
57
  style.backgroundImage = `url('${base64}') !important`;
@@ -110,6 +111,11 @@ const _sfc_main = vue.defineComponent({
110
111
  });
111
112
  };
112
113
  const render = () => {
114
+ if (props2.disabled) {
115
+ disconnect();
116
+ imgStyle.value = { display: "none" };
117
+ return;
118
+ }
113
119
  const canvas = document.createElement("canvas");
114
120
  const ctx = canvas.getContext("2d");
115
121
  if (!ctx) {
@@ -189,15 +195,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
189
195
  return vue.openBlock(), vue.createElementBlock("div", {
190
196
  ref: "rootRef",
191
197
  key: _ctx.rootKey,
192
- style: { position: "relative" }
198
+ style: vue.normalizeStyle(_ctx.fixed ? void 0 : { position: "relative" })
193
199
  }, [
194
200
  vue.renderSlot(_ctx.$slots, "default"),
195
- (vue.openBlock(), vue.createElementBlock("div", {
201
+ !_ctx.disabled ? (vue.openBlock(), vue.createElementBlock("div", {
196
202
  ref: "imgRef",
197
203
  key: _ctx.imgKey,
198
204
  style: vue.normalizeStyle(_ctx.imgStyle)
199
- }, null, 4))
200
- ]);
205
+ }, null, 4)) : vue.createCommentVNode("", true)
206
+ ], 4);
201
207
  }
202
208
  const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
203
209
  module.exports = index;
@@ -10,6 +10,8 @@ export declare const watermarkProps: {
10
10
  font: PropType<WatermarkFont>;
11
11
  gap: PropType<WatermarkGap>;
12
12
  offset: PropType<WatermarkOffset>;
13
- customStyle: PropType<import("vue").CSSProperties>;
13
+ customStyle: PropType<Partial<import("vue").CSSProperties>>;
14
+ fixed: BooleanConstructor;
15
+ disabled: BooleanConstructor;
14
16
  };
15
17
  export type WatermarkProps = ExtractPropTypes<typeof watermarkProps>;
@@ -20,6 +20,10 @@ const watermarkProps = {
20
20
  // 距离左上角的偏移量
21
21
  offset: Array,
22
22
  // 自定义样式
23
- customStyle: Object
23
+ customStyle: Object,
24
+ // 是否使用固定定位
25
+ fixed: Boolean,
26
+ // 是否禁用
27
+ disabled: Boolean
24
28
  };
25
29
  exports.watermarkProps = watermarkProps;
@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
3
  const vue = require("vue");
4
4
  function getFont(font) {
5
5
  const style = {
6
- color: "rgba(68, 68, 68, .25)",
6
+ color: "rgba(122, 122, 122, .35)",
7
7
  fontSize: 16,
8
8
  fontWeight: "normal",
9
9
  fontFamily: "sans-serif",
@@ -28,6 +28,7 @@ const _sfc_main = vue.defineComponent({
28
28
  const destroy = () => {
29
29
  if (player && typeof player.destroy === "function") {
30
30
  player.destroy();
31
+ player = null;
31
32
  }
32
33
  };
33
34
  vue.onMounted(() => {
@@ -16,6 +16,7 @@
16
16
  @use '../ele-ellipsis/style/index.scss' as ellipsis;
17
17
  @use '../ele-file-list/style/index.scss' as fileList;
18
18
  @use '../ele-icon-select/style/index.scss' as iconSelect;
19
+ @use '../ele-loading/style/index.scss' as loading;
19
20
  @use '../ele-map-picker/style/index.scss' as mapPicker;
20
21
  @use '../ele-menus/style/index.scss' as menus;
21
22
  @use '../ele-modal/style/index.scss' as modal;
@@ -1,4 +1,4 @@
1
- @use './themes/default.scss' as *;
1
+ @use './util.scss' as *;
2
2
 
3
3
  /* Make clicks pass-through */
4
4
  #nprogress {
@@ -24,7 +24,7 @@
24
24
  right: 0;
25
25
  width: 100px;
26
26
  height: 100%;
27
- box-shadow: 0 0 10px elVar('color-primary'), 0 0 5px elVar('color-primary');
27
+ box-shadow: (0 0 10px elVar('color-primary'), 0 0 5px elVar('color-primary'));
28
28
  opacity: 1;
29
29
 
30
30
  -webkit-transform: rotate(3deg) translate(0px, -4px);
@@ -241,7 +241,7 @@ $ele: map.deep-merge(
241
241
  'item-radius': elVar('border-radius', 'base'),
242
242
  'item-padding': 6px 4px,
243
243
  'item-border': 1px solid transparent,
244
- 'item-active-border-color': elVar('color-primary', 'light-8'),
244
+ 'item-active-border-color': elVar('color-primary', 'light-7'),
245
245
  'item-active-bg': elVar('color-primary', 'light-9'),
246
246
  'icon-height': 84px,
247
247
  'icon-size': 56px,
@@ -294,11 +294,22 @@ $ele: map.deep-merge(
294
294
  'color': elVar('text-color', 'regular'),
295
295
  'hover-color': elVar('color-primary'),
296
296
  'hover-bg': elVar('color-primary', 'light-9'),
297
- 'hover-border': 1px solid elVar('color-primary', 'light-8'),
297
+ 'hover-border': 1px solid elVar('color-primary', 'light-7'),
298
298
  'active-color': elVar('color-primary'),
299
299
  'active-bg': elVar('color-primary', 'light-9'),
300
300
  'active-border': 2px solid elVar('color-primary')
301
301
  ),
302
+ 'loading': (
303
+ // 加载
304
+ 'bg': elVar('mask-color'),
305
+ 'size': 19px,
306
+ 'space': 5px,
307
+ 'index': 2000,
308
+ 'sm-size': 13px,
309
+ 'sm-space': 3px,
310
+ 'lg-size': 29px,
311
+ 'lg-space': 8px
312
+ ),
302
313
  'map': (
303
314
  // 地图位置选择
304
315
  'header-padding': 8px 14px
@@ -564,7 +575,7 @@ $ele: map.deep-merge(
564
575
  'transition': (color, background-color, border-color, font-weight)
565
576
  ),
566
577
  'tab-sm': (
567
- // 标签页小型尺寸
578
+ // 标签页小号
568
579
  'height': 32px,
569
580
  'padding': 12px,
570
581
  'font-size': elVar('font-size', 'small'),
@@ -573,7 +584,7 @@ $ele: map.deep-merge(
573
584
  'tool-font-size': elVar('font-size', 'small')
574
585
  ),
575
586
  'tab-lg': (
576
- // 标签页大型尺寸
587
+ // 标签页大号
577
588
  'height': 52px,
578
589
  'padding': 22px,
579
590
  'font-size': elVar('font-size', 'medium'),
@@ -639,9 +650,12 @@ $ele: map.deep-merge(
639
650
  'sm-radius': 0,
640
651
  'sticky-top': 0,
641
652
  'fixed-header-sticky-top': 94px,
642
- 'maximized-sticky-top': 40px
653
+ 'maximized-sticky-top': 40px,
654
+ 'fix-height': 0.45px,
655
+ 'fix-border': 0.65px
643
656
  ),
644
657
  'table-select': (
658
+ // 下拉表格选择
645
659
  'padding': 10px,
646
660
  'th-bg': elVar('fill-color', 'light'),
647
661
  'tr-bg': elVar('bg-color', 'overlay'),
@@ -649,16 +663,24 @@ $ele: map.deep-merge(
649
663
  'mobile-space': 16px
650
664
  ),
651
665
  'tool-column': (
652
- // 表格列配置
666
+ // 高级表格列配置
653
667
  'width': 220px,
654
668
  'max-height': 480px,
655
- 'header-padding': 6px 16px 4px 16px,
669
+ 'header-padding': 6px 16px 4px 12px,
656
670
  'header-border': 1px solid elVar('border-color', 'light'),
657
671
  'body-padding': 6px 0,
658
- 'item-padding': 16px,
672
+ 'item-padding': 12px,
659
673
  'item-height': 28px,
660
674
  'item-hover-bg': elVar('color-primary', 'light-9'),
661
- 'item-radius': 0
675
+ 'item-radius': 0,
676
+ 'btn-space': 0,
677
+ 'btn-padding': 3px,
678
+ 'btn-radius': elVar('border-radius', 'small'),
679
+ 'btn-color': elVar('text-color', 'placeholder'),
680
+ 'btn-hover-color': elVar('text-color', 'primary'),
681
+ 'btn-hover-bg': transparent,
682
+ 'btn-active-color': elVar('color-primary'),
683
+ 'btn-active-bg': transparent
662
684
  ),
663
685
  'text': (
664
686
  // 文本
@@ -691,7 +713,7 @@ $ele: map.deep-merge(
691
713
  'font-size': 16px
692
714
  ),
693
715
  'popper': (
694
- // 气泡通用
716
+ // 底层气泡
695
717
  'bg': elVar('bg-color', 'overlay'),
696
718
  'border': none,
697
719
  'radius': elVar('border-radius', 'base'),
@@ -704,7 +726,7 @@ $ele: map.deep-merge(
704
726
  'tooltip': (
705
727
  // 文字提示
706
728
  'color': '#fff',
707
- 'font-size': elVar('font-size', 'extra-small'),
729
+ 'font-size': elVar('font-size', 'small'),
708
730
  'line-height': '22px',
709
731
  'padding': '6px 12px',
710
732
  'bg': '#000',
@@ -780,6 +802,7 @@ $ele: map.deep-merge(
780
802
  ),
781
803
  'table-filter': (
782
804
  // 表格筛选框
805
+ 'max-height': none,
783
806
  'padding': 6px 0,
784
807
  'item-height': 32px,
785
808
  'item-margin': 0,
@@ -810,6 +833,7 @@ $ele: map.deep-merge(
810
833
  'icon-hover-bg': transparent,
811
834
  'icon-radius': elVar('border-radius', 'small'),
812
835
  'body-padding': 12px 20px,
836
+ 'input-padding': 8px,
813
837
  'footer-padding': 8px 20px 18px 20px,
814
838
  'footer-border': none,
815
839
  'mobile-space': 16px
@@ -936,7 +960,7 @@ $ele: map.deep-merge(
936
960
  'shortcut-radius': 0,
937
961
  'shortcut-hover-color': elVar('text-color', 'primary'),
938
962
  'shortcut-hover-bg': elVar('fill-color', 'light'),
939
- 'range-icon-color': elVar('text-color', 'secondary'),
963
+ 'range-icon-color': elVar('text-color', 'placeholder'),
940
964
  'range-icon-size': elVar('font-size', 'base')
941
965
  ),
942
966
  'timepicker': (
@@ -168,8 +168,10 @@ $ele-rounded: map.deep-merge(
168
168
  ),
169
169
  'tool-column': (
170
170
  'body-padding': 6px 4px,
171
- 'item-padding': 12px,
172
- 'item-radius': elVar('border-radius', 'small')
171
+ 'item-padding': 8px,
172
+ 'item-radius': elVar('border-radius', 'small'),
173
+ 'btn-hover-bg': elVar('color-primary', 'light-8'),
174
+ 'btn-active-bg': elVar('color-primary', 'light-7')
173
175
  ),
174
176
  'text': (
175
177
  'heading-weight': bold
@@ -7,6 +7,7 @@
7
7
  @use '../../ele-dropdown/style/css-var.scss' as *;
8
8
  @use '../../ele-file-list/style/css-var.scss' as *;
9
9
  @use '../../ele-icon-select/style/css-var.scss' as *;
10
+ @use '../../ele-loading/style/css-var.scss' as *;
10
11
  @use '../../ele-map-picker/style/css-var.scss' as *;
11
12
  @use '../../ele-menus/style/css-var.scss' as *;
12
13
  @use '../../ele-modal/style/css-var.scss' as *;
@@ -40,6 +41,7 @@
40
41
  @include set-dropdown-var($var);
41
42
  @include set-file-var($var);
42
43
  @include set-icon-var($var);
44
+ @include set-loading-var($var);
43
45
  @include set-map-var($var);
44
46
  @include set-menus-var($var);
45
47
  @include set-modal-var($var);
@@ -113,7 +113,7 @@ export declare function throttle<T extends (...args: any) => any>(func: T, wait:
113
113
  * @param obj 来源对象
114
114
  * @param fields 忽略的属性
115
115
  */
116
- export declare function omit<T extends object, K extends keyof T>(obj: T, fields: Array<K>): Omit<T, K>;
116
+ export declare function omit<T extends object, K extends keyof T>(obj: T | null | undefined, fields: Array<K>): Omit<T, K>;
117
117
  /**
118
118
  * 摘选对象属性
119
119
  * @param obj 来源对象
package/lib/utils/core.js CHANGED
@@ -69,22 +69,24 @@ function eachTree(data, callback, childrenField = "children", parent) {
69
69
  }
70
70
  function mapTree(data, formatter, childrenField = "children", resultChildrenField = "children", parent) {
71
71
  const result = [];
72
- data == null ? void 0 : data.forEach((d, i) => {
73
- var _a;
74
- const item = formatter(d, i, parent);
75
- if (item) {
76
- if ((_a = d[childrenField]) == null ? void 0 : _a.length) {
77
- item[resultChildrenField] = mapTree(
78
- d[childrenField],
79
- formatter,
80
- childrenField,
81
- resultChildrenField,
82
- item
83
- );
72
+ if (data) {
73
+ data.forEach((d, i) => {
74
+ var _a;
75
+ const item = formatter(d, i, parent);
76
+ if (item) {
77
+ if ((_a = d[childrenField]) == null ? void 0 : _a.length) {
78
+ item[resultChildrenField] = mapTree(
79
+ d[childrenField],
80
+ formatter,
81
+ childrenField,
82
+ resultChildrenField,
83
+ item
84
+ );
85
+ }
86
+ result.push(item);
84
87
  }
85
- result.push(item);
86
- }
87
- });
88
+ });
89
+ }
88
90
  return result;
89
91
  }
90
92
  function uuid(length = 32, radix) {
@@ -18,8 +18,8 @@ function EleAdminResolver(options = {}) {
18
18
  return {
19
19
  type: "component",
20
20
  resolve: (key) => {
21
- var _a;
22
- if (key.match(/^Ele[A-Z]/) && !((_a = options == null ? void 0 : options.exclude) == null ? void 0 : _a.includes(key))) {
21
+ var _a, _b;
22
+ if (key.match(/^Ele[A-Z]/) && !((_b = (_a = options == null ? void 0 : options.exclude) == null ? void 0 : _a.includes) == null ? void 0 : _b.call(_a, key))) {
23
23
  const packageName = "ele-admin-plus";
24
24
  const name = kebabCase(key);
25
25
  const dir = options.path ?? "/es";