plain-design 1.0.0-beta.3 → 1.0.0-beta.31

Sign up to get free protection for your applications and to get access to all the features.
Files changed (119) hide show
  1. package/dist/plain-design.commonjs.min.js +2 -2
  2. package/dist/plain-design.min.css +22 -19
  3. package/dist/plain-design.min.js +2 -2
  4. package/dist/report.html +5 -5
  5. package/package.json +6 -6
  6. package/src/packages/build.ts +2 -10
  7. package/src/packages/components/Alert/alert.scss +1 -1
  8. package/src/packages/components/Application/theme/theme.ts +2 -3
  9. package/src/packages/components/ArrowStepGroup/arrow-step.scss +4 -4
  10. package/src/packages/components/AutoTable/use/useTableOption.methods.tsx +2 -0
  11. package/src/packages/components/AutoTable/use/useTableOption.state.tsx +1 -0
  12. package/src/packages/components/AutoTable/utils/TableOption.space.tsx +1 -0
  13. package/src/packages/components/Badge/badge.scss +1 -1
  14. package/src/packages/components/Button/button.scss +1 -1
  15. package/src/packages/components/CarouselGroup/carousel.scss +1 -1
  16. package/src/packages/components/CascadePanel/list/CascadeListPanelItem.tsx +3 -3
  17. package/src/packages/components/CheckboxInner/checkbox-inner.scss +1 -1
  18. package/src/packages/components/ColorPicker/sub/ColorSlider.tsx +8 -5
  19. package/src/packages/components/ColorPicker/sub/ColorSvPanel.tsx +7 -4
  20. package/src/packages/components/DatePicker/date.scss +1 -1
  21. package/src/packages/components/Dialog/dialog.scss +1 -1
  22. package/src/packages/components/Dialog/index.tsx +4 -3
  23. package/src/packages/components/Dialog/useDialogMovable.tsx +7 -4
  24. package/src/packages/components/Dialog/utils/dialog.mouse.ts +4 -2
  25. package/src/packages/components/DropdownOption/index.tsx +3 -3
  26. package/src/packages/components/Image/image.scss +3 -3
  27. package/src/packages/components/Input/useMultipleInput.tsx +5 -2
  28. package/src/packages/components/Input/useTextareaInput.tsx +10 -5
  29. package/src/packages/components/Input/uses/useInputHooks.tsx +11 -11
  30. package/src/packages/components/InputNumber/NumberResize.tsx +20 -3
  31. package/src/packages/components/InputNumber/input-number.utils.tsx +7 -5
  32. package/src/packages/components/InputNumber/useInputNumber.public.tsx +25 -6
  33. package/src/packages/components/Layout/index.tsx +31 -0
  34. package/src/packages/components/Layout/layout.scss +227 -0
  35. package/src/packages/components/Layout/layout.utils.ts +3 -0
  36. package/src/packages/components/LayoutSection/index.tsx +67 -0
  37. package/src/packages/components/LayoutSection/useLayoutSectionResizer.tsx +184 -0
  38. package/src/packages/components/LoadingMask/index.tsx +1 -1
  39. package/src/{pages/index/PageThemeUtils.tsx → packages/components/PageThemeUtils/index.tsx} +58 -18
  40. package/src/packages/components/Pagination/pagination.scss +2 -2
  41. package/src/packages/components/Popup/index.tsx +24 -10
  42. package/src/packages/components/ProgressBar/progress-bar.scss +1 -1
  43. package/src/packages/components/Rate/index.tsx +3 -1
  44. package/src/packages/components/Scroll/HorizontalScrollbar.tsx +7 -3
  45. package/src/packages/components/Scroll/VerticalScrollbar.tsx +7 -3
  46. package/src/packages/components/Select/createPublicSelectRender.tsx +1 -1
  47. package/src/packages/components/Slider/slider.scss +1 -1
  48. package/src/packages/components/Slider/useSliderDotDragier.tsx +7 -4
  49. package/src/packages/components/StepGroup/step-group.scss +9 -9
  50. package/src/packages/components/TabGroup/TabsInner.tsx +5 -3
  51. package/src/packages/components/TabGroup/header/horizontal/tabs-header-horizontal.scss +0 -1
  52. package/src/packages/components/TabGroup/index.tsx +5 -1
  53. package/src/packages/components/TabGroup/tabs.scss +3 -0
  54. package/src/packages/components/Table/standard/PlcExpand.tsx +12 -20
  55. package/src/packages/components/Table/table/Table.tsx +10 -3
  56. package/src/packages/components/Table/table/head/useHeadCellResize.ts +8 -3
  57. package/src/packages/components/Table/table/table.scss +1 -0
  58. package/src/packages/components/Table/table/use/useTableDraggier.col.tsx +10 -5
  59. package/src/packages/components/Table/table/use/useTableDraggier.row.tsx +11 -6
  60. package/src/packages/components/Table/table/utils/createTableHooks.ts +3 -1
  61. package/src/packages/components/Table/table/utils/table.utils.ts +6 -1
  62. package/src/packages/components/ThemeEditor/index.tsx +172 -0
  63. package/src/packages/components/ThemeEditor/theme-editor.scss +105 -0
  64. package/src/packages/components/ThemePrimaryColors/index.ts +5 -0
  65. package/src/packages/components/Tree/RenderTreeNode.tsx +6 -2
  66. package/src/packages/components/Tree/index.tsx +3 -3
  67. package/src/packages/components/Tree/tree.scss +42 -9
  68. package/src/packages/components/TreeCore/TreeCore.type.tsx +2 -0
  69. package/src/packages/components/TreeCore/createTreeCore.tsx +5 -1
  70. package/src/packages/components/TreeCore/createTreeDraggier.tsx +70 -56
  71. package/src/packages/components/TreeCore/createTreeMethods.tsx +1 -0
  72. package/src/packages/components/TreeCore/createTreeProps.ts +2 -1
  73. package/src/packages/components/TreeNodeWithMenu/index.tsx +91 -0
  74. package/src/packages/components/TreeNodeWithMenu/tree-node-with-menu.scss +39 -0
  75. package/src/packages/components/TreeNodeWithMenu/treeNodeWithMenu.utils.ts +12 -0
  76. package/src/packages/components/VirtualList/index.tsx +3 -3
  77. package/src/packages/components/VirtualList/useVirtualList.tsx +94 -62
  78. package/src/packages/components/VirtualTable/index.tsx +6 -6
  79. package/src/packages/components/createProvider/index.ts +5 -0
  80. package/src/packages/components/nextPopupId/index.ts +5 -0
  81. package/src/packages/components/useDialog/DialogService.tsx +13 -1
  82. package/src/packages/components/useImage/ImageService.tsx +7 -4
  83. package/src/packages/components/useMessage/Message.tsx +5 -1
  84. package/src/packages/components/useMessage/message.scss +5 -1
  85. package/src/packages/components/useNotice/notice.scss +1 -1
  86. package/src/packages/components/usePopup/PopupItem.tsx +45 -26
  87. package/src/packages/components/usePopup/popup-item.scss +5 -1
  88. package/src/packages/components/usePopup/usePopupManager.tsx +2 -1
  89. package/src/packages/components/usePopup/utils/popup.utils.ts +2 -1
  90. package/src/packages/components/usePopupManager/index.ts +5 -0
  91. package/src/packages/components/usePopupTrigger/index.tsx +5 -0
  92. package/src/packages/components/useReferenceTrigger/index.tsx +5 -0
  93. package/src/packages/components/useTooltip/index.tsx +2 -0
  94. package/src/packages/components/useWatchAutoClear/index.ts +5 -0
  95. package/src/packages/entry.tsx +39 -0
  96. package/src/packages/uses/useEdit.ts +5 -1
  97. package/src/packages/uses/useStyle.tsx +10 -2
  98. package/src/packages/utils/ClientZoom.ts +24 -2
  99. package/src/packages/utils/useMove.tsx +10 -4
  100. package/src/pages/index/App.tsx +3 -2
  101. package/src/pages/index/Demo/DemoRow.scss +9 -6
  102. package/src/pages/index/Demo/DemoRowController.tsx +2 -2
  103. package/src/pages/index/app.scss +5 -0
  104. package/src/pages/index/components/AutoTable/AutoHeightAutoRow.tsx +10 -5
  105. package/src/pages/index/components/normal/DemoDropdown.tsx +1 -1
  106. package/src/pages/index/components/normal/DemoLayout.tsx +144 -0
  107. package/src/pages/index/components/normal/DemoLoading.tsx +3 -0
  108. package/src/pages/index/components/normal/DemoNumber.tsx +4 -1
  109. package/src/pages/index/components/normal/DemoTab.tsx +6 -6
  110. package/src/pages/index/components/normal/DemoTree.tsx +86 -2
  111. package/src/pages/index/components/normal/DemoVirtualList.tsx +9 -9
  112. package/src/pages/index/components/service/DemoDialogService.tsx +1 -0
  113. package/src/pages/index/components/service/DemoPopupService.tsx +6 -3
  114. package/src/pages/index/components/table/DemoTableExpand.tsx +41 -19
  115. package/src/pages/index/components/table/DemoVirtualTable.tsx +4 -4
  116. package/src/pages/index/home/AppHead.tsx +6 -93
  117. package/src/pages/index/home/menus.tsx +1 -0
  118. package/src/pages/index/home/plain-design.png +0 -0
  119. package/src/pages/index/main.tsx +0 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "plain-design",
3
- "version": "1.0.0-beta.3",
3
+ "version": "1.0.0-beta.31",
4
4
  "description": "",
5
5
  "main": "dist/plain-design.min.js",
6
6
  "module": "dist/plain-design.commonjs.min.js",
@@ -19,9 +19,9 @@
19
19
  "peerDependencies": {
20
20
  "exceljs": "^4.2.1",
21
21
  "file-saver": "^2.0.5",
22
- "plain-design-composition": "^0.0.167",
23
- "react": "^17.0.1",
24
- "react-dom": "^17.0.1"
22
+ "plain-design-composition": "^0.0.177",
23
+ "react": "^18.0.1",
24
+ "react-dom": "^18.0.1"
25
25
  },
26
26
  "resolutions": {
27
27
  "@types/react": "18.2.4",
@@ -32,7 +32,7 @@
32
32
  "@types/react-transition-group": "^4.4.1",
33
33
  "color": "^4.2.3",
34
34
  "dayjs": "^1.10.4",
35
- "plain-icons": "0.0.6",
35
+ "plain-icons": "0.0.7",
36
36
  "plain-utils": "^0.1.48",
37
37
  "react-flip-move": "^3.0.4",
38
38
  "react-transition-group": "^4.4.1"
@@ -68,7 +68,7 @@
68
68
  "fork-ts-checker-webpack-plugin": "^6.2.4",
69
69
  "mini-css-extract-plugin": "^1.4.1",
70
70
  "mockjs": "^1.1.0",
71
- "plain-design-composition": "^0.0.167",
71
+ "plain-design-composition": "^0.0.180",
72
72
  "postcss": "^8.2.13",
73
73
  "postcss-loader": "^4.2.0",
74
74
  "qs": "^6.10.1",
@@ -1,15 +1,7 @@
1
1
  import Plain from './index';
2
- // @ts-ignore
3
- import allIcons from 'plain-icons/dist/icons.js';
2
+ import {installAllIcon} from "./utils/installAllIcons";
4
3
 
5
- // @ts-ignore
6
- Plain.Icon.PlainIcon.use.options.props.getIcon.default = (icon: string) => {
7
- const iconMeta = (allIcons as any)[icon];
8
- if (!iconMeta) {
9
- throw new Error(`getIcon: can't find icon match ${icon}`);
10
- }
11
- return iconMeta;
12
- };
4
+ installAllIcon();
13
5
 
14
6
  export * from './index';
15
7
  export default Plain;
@@ -125,7 +125,7 @@
125
125
  &.alert-theme-deep {
126
126
  @include statusMixin(alert) {
127
127
  background-color: $color-6;
128
- color: white;
128
+ color: plv(pbfc);
129
129
  .alert-close {
130
130
  &:hover {
131
131
  background-color: $color-8;
@@ -128,9 +128,7 @@ function createOtherVars(prefix: string | null, referenceVariable: (name: string
128
128
  'dialog-foot-padding': '8px 16px',
129
129
  'dialog-head-size': '48px',
130
130
  /*---------------------------------------message-------------------------------------------*/
131
- 'message-padding': '12px 20px',
132
131
  'message-box-shadow': '0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05)',
133
- 'message-font-size': referenceVariable('font-size-normal'),
134
132
  /*---------------------------------------notice-------------------------------------------*/
135
133
  'notice-padding': '20px 24px',
136
134
  'notice-box-shadow': '0 3px 6px -4px rgba(0, 0, 0, .12), 0 6px 16px 0 rgba(0, 0, 0, .08), 0 9px 28px 8px rgba(0, 0, 0, .05)',
@@ -203,7 +201,7 @@ export function createThemeConfigurationData(prefix: string | null, config?: Dee
203
201
 
204
202
  const baseColorList: Record<tGenerateBaseColorList<iThemeBaseColors>, string> = (() => {
205
203
  const colors = {} as any;
206
- Object.keys(BaseColors).forEach((colorName) => {
204
+ Object.keys(base).forEach((colorName) => {
207
205
  const baseColor = (base as any)[colorName];
208
206
  if (!baseColor) {return;}
209
207
  ThemeColorNum.forEach(i => {
@@ -232,6 +230,7 @@ export function createThemeConfigurationData(prefix: string | null, config?: Dee
232
230
  ...secondaryColorList,
233
231
  ...createGrayColors(dark, false),
234
232
  ...createGrayColors(dark, true),
233
+ ...base.primary === '#ffffff' ? { 'pbfc': 'black' } : { 'pbfc': 'white' },
235
234
  ...dark ? {
236
235
  'background-hover': '#3c3c4d',
237
236
  'scrollbar-color': '#141414',
@@ -32,7 +32,7 @@
32
32
  align-items: center;
33
33
  justify-content: center;
34
34
  padding: 0 16px;
35
- color: white;
35
+ color: plv(pbfc);
36
36
  }
37
37
 
38
38
  .#{componentName(triangle)} {
@@ -73,7 +73,7 @@
73
73
  &.arrow-step-status-process, &.arrow-step-status-finish {
74
74
  .arrow-step-content {
75
75
  background-color: plv(primary-6);
76
- color: white;
76
+ color: plv(pbfc);
77
77
  }
78
78
 
79
79
  .#{componentName(triangle)} {
@@ -84,7 +84,7 @@
84
84
  &.arrow-step-status-success {
85
85
  .arrow-step-content {
86
86
  background-color: plv(success-6);
87
- color: white;
87
+ color: plv(pbfc);
88
88
  }
89
89
 
90
90
  .#{componentName(triangle)} {
@@ -95,7 +95,7 @@
95
95
  &.arrow-step-status-error {
96
96
  .arrow-step-content {
97
97
  background-color: plv(error-6);
98
- color: white;
98
+ color: plv(pbfc);
99
99
  }
100
100
 
101
101
  .#{componentName(triangle)} {
@@ -161,6 +161,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
161
161
  }
162
162
  };
163
163
  const reload = async (reloadParam?: { size?: number }) => {
164
+ if (!state.isInit) {state.isInit = true;}
164
165
  await load({
165
166
  page: 1,
166
167
  size: reloadParam?.size,
@@ -488,6 +489,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
488
489
  })();
489
490
 
490
491
  hooks.onTableSetup.use(() => {
492
+ if (state.isInit) {return;}
491
493
  if (config.loadOnStart !== false) {pageMethods.reload();}
492
494
  });
493
495
 
@@ -14,6 +14,7 @@ declare module '../utils/TableOption.space' {
14
14
 
15
15
  export const useTableOptionState = AutoModule.createRegistration(({ config, hooks }) => {
16
16
  const state: TableOptionSpace.iTableOptionState = reactive({
17
+ isInit: false,
17
18
  getTable: () => null,
18
19
  getAutoTable: () => null,
19
20
  list: [],
@@ -118,6 +118,7 @@ export namespace TableOptionSpace {
118
118
  * @date 2023/2/7 9:47
119
119
  */
120
120
  export interface iTableOptionState {
121
+ isInit: boolean,
121
122
  getTable: () => null | iTableRefer,
122
123
  getAutoTable: () => null | iAutoTableRefer;
123
124
  list: PlainObject[],
@@ -18,7 +18,7 @@
18
18
  @include statusMixin(badge-content) {
19
19
  background-color: $color-6;
20
20
  border-radius: 100px;
21
- color: white;
21
+ color: plv(pbfc);
22
22
  }
23
23
 
24
24
  &.badge-content-top {
@@ -37,7 +37,7 @@
37
37
  @include statusMixin(button) {
38
38
  background-color: $color-6;
39
39
  border-color: $color-6;
40
- color: white;
40
+ color: plv(pbfc);
41
41
  @include hover(button) {
42
42
  background-color: $color-4;
43
43
  border-color: $color-4;
@@ -40,7 +40,7 @@
40
40
  transition: background-color 300ms linear;
41
41
  cursor: pointer;
42
42
  pointer-events: auto;
43
- background-color: rgba(#ffffff, 0.45);
43
+ background-color: rgba(#000000, 0.2);
44
44
  color: white;
45
45
  width: 36px;
46
46
  height: 36px;
@@ -59,13 +59,13 @@ export const CascadeListPanelItem = designComponent({
59
59
  return (
60
60
  <VirtualList data={props.treeNodes} size={CascadePanelVirtualSize[panel.styleComputed.value.size]} dynamicSize>
61
61
  {{
62
- default: ({ item: treeNode, index, virtualIndex }: { item: iTreeNode, index: number, virtualIndex: number }) => (
62
+ default: ({ item: treeNode, index, vIndex, vid }: { item: iTreeNode, index: number, vIndex: number, vid: string }) => (
63
63
  <CascadeListPanelNode
64
- data-vid={index}
64
+ data-vid={vid}
65
65
  treeNode={treeNode}
66
66
  treeNodes={props.treeNodes}
67
67
  index={index}
68
- key={virtualIndex}
68
+ key={vIndex}
69
69
  handleClickNode={props.handleClickNode}
70
70
  {...props.nodeAttrs}
71
71
  >
@@ -14,7 +14,7 @@
14
14
 
15
15
  .checkbox-inner-check-polyline {
16
16
  fill: transparent;
17
- stroke: white;
17
+ stroke: plv(pbfc);
18
18
  stroke-width: 10;
19
19
  }
20
20
  }
@@ -5,6 +5,7 @@ import {createEffects} from "plain-utils/utils/createEffects";
5
5
  import {disabledUserSelect} from "plain-utils/dom/disabledUserSelect";
6
6
  import {enableUserSelect} from "plain-utils/dom/enableUserSelect";
7
7
  import './color-slider.scss';
8
+ import {ClientZoom} from "../../ClientZoom";
8
9
 
9
10
  export const ColorSlider = designComponent({
10
11
  name: 'color-slider',
@@ -110,12 +111,13 @@ export const ColorSlider = designComponent({
110
111
  };
111
112
  const handler = {
112
113
  onMousedown: (e: iMouseEvent) => {
113
- utils.setOffsetX(e.nativeEvent.offsetX);
114
+ const { clientX, clientY, offsetX } = ClientZoom.getClientPosition(e);
115
+ utils.setOffsetX(offsetX);
114
116
  staticState = {
115
117
  start: {
116
- x: e.clientX,
117
- y: e.clientY,
118
- offsetX: e.nativeEvent.offsetX,
118
+ x: clientX,
119
+ y: clientY,
120
+ offsetX: offsetX,
119
121
  }
120
122
  };
121
123
  draggierEffects.push(() => staticState = null);
@@ -129,7 +131,8 @@ export const ColorSlider = designComponent({
129
131
  },
130
132
  onMousemove: (e: MouseEvent) => {
131
133
  if (!staticState) {return;}
132
- const durX = e.clientX - staticState.start.x;
134
+ const { clientX } = ClientZoom.getClientPosition(e);
135
+ const durX = clientX - staticState.start.x;
133
136
  const newOffsetX = durX + staticState.start.offsetX;
134
137
  utils.setOffsetX(newOffsetX);
135
138
  },
@@ -5,6 +5,7 @@ import {disabledUserSelect} from "plain-utils/dom/disabledUserSelect";
5
5
  import {enableUserSelect} from "plain-utils/dom/enableUserSelect";
6
6
  import {getRgbColor} from "../../../utils/color.utils";
7
7
  import Color from 'color';
8
+ import {ClientZoom} from "../../..";
8
9
 
9
10
  export const ColorSvPanel = designComponent({
10
11
  name: 'color-sv-panel',
@@ -71,14 +72,16 @@ export const ColorSvPanel = designComponent({
71
72
  document.body.addEventListener('mousemove', handler.mousemove);
72
73
  document.body.addEventListener('mouseup', handler.mouseup);
73
74
  disabledUserSelect();
74
- methods.updatePosition(e.nativeEvent.offsetX, e.nativeEvent.offsetY);
75
- state.startX = e.clientX;
76
- state.startY = e.clientY;
75
+ const { offsetX, offsetY, clientX, clientY } = ClientZoom.getClientPosition(e);
76
+ methods.updatePosition(offsetX, offsetY);
77
+ state.startX = clientX;
78
+ state.startY = clientY;
77
79
  state.tempSaturation = state.saturation as number;
78
80
  state.tempValue = state.val as number;
79
81
  },
80
82
  mousemove: (e: MouseEvent) => {
81
- methods.updatePosition(e.clientX - state.startX, e.clientY - state.startY, false);
83
+ const { clientX, clientY } = ClientZoom.getClientPosition(e);
84
+ methods.updatePosition(clientX - state.startX, clientY - state.startY, false);
82
85
  },
83
86
  mouseup: () => {
84
87
  document.body.removeEventListener('mousemove', handler.mousemove);
@@ -141,7 +141,7 @@ $width: 276px;
141
141
 
142
142
  & > span {
143
143
  background-color: plv(primary-6);
144
- color: white;
144
+ color: plv(pbfc);
145
145
  }
146
146
  }
147
147
  }
@@ -138,7 +138,7 @@
138
138
 
139
139
  &:hover {
140
140
  @include prefix(icon) {
141
- color: white;
141
+ color: plv(pbfc);
142
142
  }
143
143
 
144
144
  &:after {
@@ -42,6 +42,7 @@ export const Dialog = designComponent({
42
42
 
43
43
  noContentPadding: { type: Boolean }, // 去掉内容默认内边距
44
44
  noHead: { type: Boolean, }, // 去掉默认弹框标题
45
+ noFoot: { type: Boolean }, // 去掉底部内容
45
46
  noMask: { type: Boolean }, // 去掉遮罩
46
47
  noClose: { type: Boolean }, // 去掉关闭按钮
47
48
 
@@ -253,9 +254,9 @@ export const Dialog = designComponent({
253
254
  showing.start();
254
255
  if (!state.init) {
255
256
  state.init = true;
256
- await delay();
257
+ await delay(23);
257
258
  if (!refs.content) {
258
- await delay();
259
+ await delay(23);
259
260
  }
260
261
  } else {
261
262
  await nextTick();
@@ -417,7 +418,7 @@ export const Dialog = designComponent({
417
418
  <div className="dialog-body">
418
419
  {slots.default()}
419
420
  </div>
420
- {(!!props.confirmButton || !!props.cancelButton || slots.foot.isExist()) && (
421
+ {!props.noFoot && (!!props.confirmButton || !!props.cancelButton || slots.foot.isExist()) && (
421
422
  <div className="dialog-foot">
422
423
  {slots.foot()}
423
424
  {(() => {
@@ -1,4 +1,5 @@
1
1
  import {watchEffect} from "plain-design-composition";
2
+ import {ClientZoom} from "../..";
2
3
 
3
4
  export function useDialogMovable({ refs, movable }: { refs: { head: HTMLElement | undefined | null, content: HTMLElement | undefined | null }, movable: { value: boolean } }) {
4
5
 
@@ -20,9 +21,10 @@ export function useDialogMovable({ refs, movable }: { refs: { head: HTMLElement
20
21
 
21
22
  const handler = {
22
23
  mousedown: (e: MouseEvent) => {
24
+ const { clientX, clientY } = ClientZoom.getClientPosition(e);
23
25
  staticState.start = {
24
- x: e.clientX,
25
- y: e.clientY,
26
+ x: clientX,
27
+ y: clientY,
26
28
  left: staticState.move.left,
27
29
  top: staticState.move.top,
28
30
  };
@@ -30,8 +32,9 @@ export function useDialogMovable({ refs, movable }: { refs: { head: HTMLElement
30
32
  document.documentElement.addEventListener('mouseup', handler.mouseup);
31
33
  },
32
34
  mousemove: (e: MouseEvent) => {
33
- staticState.move.x = e.clientX;
34
- staticState.move.y = e.clientY;
35
+ const { clientX, clientY } = ClientZoom.getClientPosition(e);
36
+ staticState.move.x = clientX;
37
+ staticState.move.y = clientY;
35
38
 
36
39
  const durX = staticState.move.x - staticState.start.x;
37
40
  const durY = staticState.move.y - staticState.start.y;
@@ -1,12 +1,14 @@
1
1
  import {isSSR} from "../../../utils/isSSR";
2
+ import {ClientZoom} from "../../..";
2
3
 
3
4
  export const DialogMouse = (() => {
4
5
  const state = { x: 0, y: 0 };
5
6
 
6
7
  if (!isSSR()) {
7
8
  document.documentElement.addEventListener('mousedown', e => {
8
- state.x = e.clientX;
9
- state.y = e.clientY;
9
+ const { clientX, clientY } = ClientZoom.getClientPosition(e);
10
+ state.x = clientX;
11
+ state.y = clientY;
10
12
  }, true);
11
13
  }
12
14
 
@@ -1,4 +1,4 @@
1
- import {computed, designComponent, PropType} from "plain-design-composition";
1
+ import {computed, designComponent, iMouseEvent, PropType} from "plain-design-composition";
2
2
  import {DropdownContextProvider, DropdownOptionContextProvider, DropdownOptionTrigger, iDropdownOptionContext, renderDropdownOption} from "../Dropdown/dropdown.utils";
3
3
  import Icon from "../Icon";
4
4
  import {createCounter} from "plain-utils/utils/createCounter";
@@ -18,7 +18,7 @@ export const DropdownOption = designComponent({
18
18
  },
19
19
  slots: ['default', 'content'],
20
20
  emits: {
21
- onClick: (e: MouseEvent) => true,
21
+ onClick: (e: iMouseEvent) => true,
22
22
  },
23
23
  setup({ props, event: { emit }, slots }) {
24
24
 
@@ -38,7 +38,7 @@ export const DropdownOption = designComponent({
38
38
  };
39
39
 
40
40
  const handler = {
41
- onClick: (e: MouseEvent) => {
41
+ onClick: (e: iMouseEvent) => {
42
42
  if (props.disabled || props.readonly) {return;}
43
43
  emit.onClick(e);
44
44
  dropdown.handler.onClickOption(dropdownOptionContext);
@@ -6,7 +6,7 @@
6
6
  right: 0;
7
7
  bottom: 0;
8
8
  background-color: rgba(black, 0.85);
9
- color: white;
9
+ color: plv(pbfc);
10
10
  display: flex;
11
11
  align-items: center;
12
12
  justify-content: center;
@@ -213,7 +213,7 @@
213
213
  &.image-uploader-status-fail {
214
214
  .image-uploader-fail {
215
215
  background-color: rgba(black, 0.85);
216
- color: white;
216
+ color: plv(pbfc);
217
217
  }
218
218
  }
219
219
 
@@ -247,7 +247,7 @@
247
247
  }
248
248
 
249
249
  .#{componentName(icon)} {
250
- color: white;
250
+ color: plv(pbfc);
251
251
  }
252
252
  }
253
253
  }
@@ -6,6 +6,7 @@ import {getKey, KEY} from "../KeyboardService";
6
6
  import {delay} from "plain-utils/utils/delay";
7
7
  import {createEffectiveHandler} from "../../utils/createEffectiveHandler";
8
8
  import {createEffects} from "plain-utils/utils/createEffects";
9
+ import {ClientZoom} from "../..";
9
10
 
10
11
  /**
11
12
  * 渲染多值输入框
@@ -140,9 +141,10 @@ function useDragHorizontalScroll(getEl: () => HTMLElement | null | undefined) {
140
141
 
141
142
  const handler = {
142
143
  mousedown: (e: MouseEvent) => {
144
+ const { clientX } = ClientZoom.getClientPosition(e);
143
145
  staticState.isDragging = false;
144
146
  staticState.start = {
145
- x: e.clientX,
147
+ x: clientX,
146
148
  left: staticState.el!.scrollLeft,
147
149
  width: staticState.el!.scrollWidth,
148
150
  };
@@ -150,7 +152,8 @@ function useDragHorizontalScroll(getEl: () => HTMLElement | null | undefined) {
150
152
  document.documentElement.addEventListener('mouseup', handler.mouseup, true);
151
153
  },
152
154
  mousemove: (e: MouseEvent) => {
153
- staticState.move.x = e.clientX;
155
+ const { clientX } = ClientZoom.getClientPosition(e);
156
+ staticState.move.x = clientX;
154
157
  const durX = staticState.move.x - staticState.start.x;
155
158
  if (!staticState.isDragging) {
156
159
  if (Math.abs(durX) > 5) {
@@ -1,7 +1,10 @@
1
1
  import {iInputCompositionData} from "./input.utils";
2
- import {iKeyboardEvent, reactive, useClasses, useStyles} from "plain-design-composition";
2
+ import {fixInputCursor, iKeyboardEvent, reactive, useClasses, useStyles} from "plain-design-composition";
3
3
  import {unit} from "plain-utils/string/unit";
4
4
  import {createEffects} from "plain-utils/utils/createEffects";
5
+ import {ClientZoom} from "../ClientZoom";
6
+
7
+ const _Textarea = fixInputCursor('textarea')
5
8
 
6
9
  export function useTextareaInput(data: iInputCompositionData) {
7
10
 
@@ -61,7 +64,7 @@ export function useTextareaInput(data: iInputCompositionData) {
61
64
  ))}
62
65
  {!model.value && <>&nbsp;</>}
63
66
  </span>
64
- <textarea
67
+ <_Textarea
65
68
  ref={handler.onRef}
66
69
  value={model.value}
67
70
  onInput={handler.onInput}
@@ -95,8 +98,10 @@ function useTextareaResize({ hooks, onResize }: iInputCompositionData & { onResi
95
98
  const handler = {
96
99
  textarea: null as null | HTMLInputElement,
97
100
  mousedown: (e: MouseEvent) => {
98
- const { offsetX, offsetY, clientY, target: { offsetWidth, offsetHeight } } = e as any;
99
- if (!(offsetWidth - offsetX < 12 && offsetHeight - offsetY < 12)) {
101
+ const { offsetX, offsetY, clientY } = ClientZoom.getClientPosition(e);
102
+ let { offsetWidth, offsetHeight } = e.target as any;
103
+ const dragSize = 12
104
+ if (!(offsetWidth - offsetX < dragSize && offsetHeight - offsetY < dragSize)) {
100
105
  return;
101
106
  }
102
107
  staticState.isDragging = false;
@@ -108,7 +113,7 @@ function useTextareaResize({ hooks, onResize }: iInputCompositionData & { onResi
108
113
  document.documentElement.addEventListener('mouseup', handler.mouseup);
109
114
  },
110
115
  mousemove: (e: MouseEvent) => {
111
- const { clientY } = e;
116
+ const { clientY } = ClientZoom.getClientPosition(e);
112
117
  staticState.move = { y: clientY };
113
118
  const durY = staticState.move.y - staticState.start.y;
114
119
  if (!staticState.isDragging) {
@@ -3,18 +3,18 @@ import {iSelectOptionProps} from "../../Select/select.utils";
3
3
 
4
4
  export function useInputHooks() {
5
5
  return {
6
- onRenderDefault: createSyncHooks<(content: RenderNode) => void>(), // 渲染默认插槽
7
- onRenderSuffix: createSyncHooks<(content: RenderNode) => void>(), // 渲染suffix插槽
8
- onRefInput: createHooks<(el: HTMLInputElement | null) => void>(), // input dom对象引用
9
- onRefWrapper: createHooks<(el: HTMLElement | null) => void>(), // 容器节点dom对象引用
10
- onInputKeydown: createHooks<(e: iKeyboardEvent) => void>(), // input触发按键事件
11
- onInput: createHooks<(val: any) => void>(), // input的输入动作
12
- onClasses: createSyncHooks<(val: any[]) => void>(), // 计算根节点classes
6
+ onRenderDefault: createSyncHooks<(content: RenderNode) => void>(true), // 渲染默认插槽
7
+ onRenderSuffix: createSyncHooks<(content: RenderNode) => void>(true), // 渲染suffix插槽
8
+ onRefInput: createHooks<(el: HTMLInputElement | null) => void>(), // input dom对象引用
9
+ onRefWrapper: createHooks<(el: HTMLElement | null) => void>(), // 容器节点dom对象引用
10
+ onInputKeydown: createHooks<(e: iKeyboardEvent) => void>(), // input触发按键事件
11
+ onInput: createHooks<(val: any) => void>(), // input的输入动作
12
+ onClasses: createSyncHooks<(val: any[]) => void>(true), // 计算根节点classes
13
13
  onSuggestion: createHooks<(data: { val: string, optionProps: iSelectOptionProps }) => void>(),// 点击了某个推荐选项
14
- onTagChange: createHooks<() => void>(), // 多值输入的时候的变化动作
15
- onTriggerOpenSuggestion: createHooks<() => void>(), // 触发打开suggestion的动作
16
- onTriggerCloseSuggestion: createHooks<() => void>(), // 触发打开suggestion的动作
17
- onGetSuggestionIsShow: createSyncHooks<(flag: boolean) => void>(), // suggestion 面板是否已经打开
14
+ onTagChange: createHooks<() => void>(), // 多值输入的时候的变化动作
15
+ onTriggerOpenSuggestion: createHooks<() => void>(), // 触发打开suggestion的动作
16
+ onTriggerCloseSuggestion: createHooks<() => void>(), // 触发打开suggestion的动作
17
+ onGetSuggestionIsShow: createSyncHooks<(flag: boolean) => void>(true), // suggestion 面板是否已经打开
18
18
  };
19
19
  }
20
20
 
@@ -2,6 +2,8 @@ import {designComponent, getComponentCls, iHTMLDivElement, iMouseEvent, useRefs}
2
2
  import {Icon} from "../Icon";
3
3
  import {createEffects} from "plain-utils/utils/createEffects";
4
4
  import {addClass} from "plain-utils/dom/addClass";
5
+ import {ClientZoom} from "../ClientZoom";
6
+ import {roundFixed} from "plain-utils/utils/roundFixed";
5
7
 
6
8
  export const NumberResize = designComponent({
7
9
  name: "number-resize",
@@ -9,6 +11,9 @@ export const NumberResize = designComponent({
9
11
  props: {
10
12
  step: { type: Number, default: 1 },
11
13
  value: { type: Number },
14
+ precision: { type: Number },
15
+ max: { type: Number },
16
+ min: { type: Number }
12
17
  },
13
18
  emits: {
14
19
  onChange: (val: number) => true,
@@ -35,6 +40,8 @@ export const NumberResize = designComponent({
35
40
 
36
41
  const handler = {
37
42
  onMousedown: (e: iMouseEvent) => {
43
+ const { clientY } = ClientZoom.getClientPosition(e);
44
+
38
45
  event.emit.onMouseDown(e);
39
46
  const el = refs.el!.cloneNode(true) as HTMLDivElement;
40
47
  const { top, left, height, width } = refs.el!.getBoundingClientRect();
@@ -50,7 +57,7 @@ export const NumberResize = designComponent({
50
57
  addClass(el, 'number-resize-dragging');
51
58
 
52
59
  staticState = {
53
- startY: e.clientY,
60
+ startY: clientY,
54
61
  startValue: props.value == null ? 0 : props.value,
55
62
  el,
56
63
  startTop: top,
@@ -71,10 +78,20 @@ export const NumberResize = designComponent({
71
78
  },
72
79
  onMousemove: (e: MouseEvent) => {
73
80
  if (!staticState) {return;}
74
- const durY = (e.clientY - staticState.startY);
81
+ const { clientY } = ClientZoom.getClientPosition(e);
82
+ const durY = (clientY - staticState.startY);
75
83
  const elMoveTop = staticState.startTop + durY;
76
84
  staticState.el.style.transform = `translate3d(${staticState.startLeft}px,${elMoveTop}px,0)`;
77
- const newValue = Math.ceil(staticState.startValue + (durY * -1) / unit) * props.step;
85
+ let newValue = Math.ceil(staticState.startValue + (durY * -1) / unit) * props.step;
86
+ if (props.precision != null) {
87
+ newValue = roundFixed(newValue, props.precision)!;
88
+ }
89
+ if (props.max != null && newValue > props.max) {
90
+ newValue = props.max;
91
+ }
92
+ if (props.min != null && newValue < props.min) {
93
+ newValue = props.min;
94
+ }
78
95
  event.emit.onChange(newValue);
79
96
  // console.log(newValue);
80
97
  },
@@ -12,13 +12,15 @@ export const InputNumberPropsOption = {
12
12
  min: { type: [String, Number] }, // 最小值
13
13
  max: { type: [String, Number] }, // 最大值
14
14
  step: { type: [String, Number], default: 1 }, // 计数器步长
15
- stepStrictly: { type: Boolean }, // 是否只能输入 step 的倍数
15
+ stepStrictly: { type: Boolean }, // 是否只能输入 step 的倍数
16
16
  precision: { type: [Number, String] }, // 数值精度
17
17
  button: { type: [String, Boolean] as PropType<boolean | typeof NumberButtonTypes.TYPE | null>, default: NumberButtonTypes.right },// 按钮模式 false, 'none','button','right'
18
- availableUnits: { type: Array as PropType<string[]> }, // 允许输入的数字单位
19
- defaultUnit: { type: String }, // 默认的数字单位,当没有值的时候点击加减号默认给的单位
20
- addIcon: { type: String }, // add按钮图标
21
- subIcon: { type: String }, // sub按钮图标
18
+ availableUnits: { type: Array as PropType<string[]> }, // 允许输入的数字单位
19
+ defaultUnit: { type: String }, // 默认的数字单位,当没有值的时候点击加减号默认给的单位
20
+ addIcon: { type: String }, // add按钮图标
21
+ subIcon: { type: String }, // sub按钮图标
22
+ requireUnit: { type: Boolean }, // 输入的值必须带单位,否则视为无效输入(不会触发change,并且失焦之后恢复上一次有效值)
23
+ isValueEffective: { type: Function as PropType<(val: string | number, unit?: string | null) => boolean> }, // 判断值是否有效,否则视为无效输入
22
24
 
23
25
  /*---------------------------------------input-------------------------------------------*/
24
26
  inputAttrs: { type: Object }, // input属性配置对象