@sheinx/base 3.3.0-beta.2 → 3.3.0-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/cjs/form/form-fieldset.d.ts.map +1 -1
  2. package/cjs/form/form-fieldset.js +17 -7
  3. package/cjs/menu/item.js +1 -1
  4. package/cjs/select/select.js +1 -1
  5. package/esm/form/form-fieldset.d.ts.map +1 -1
  6. package/esm/form/form-fieldset.js +18 -8
  7. package/esm/menu/item.js +1 -1
  8. package/esm/select/select.js +1 -1
  9. package/package.json +2 -2
package/cjs/form/form-fieldset.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"form-fieldset.d.ts","sourceRoot":"","sources":["form-fieldset.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,QAAA,MAAM,YAAY,iDA+EjB,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"form-fieldset.d.ts","sourceRoot":"","sources":["form-fieldset.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,QAAA,MAAM,YAAY,iDA0FjB,CAAC;AAEF,eAAe,YAAY,CAAC"}
package/cjs/form/form-fieldset.js CHANGED
@@ -16,6 +16,7 @@ var FormFieldSet = function FormFieldSet(props) {
16
16
  ids: []
17
17
  }),
18
18
  context = _React$useRef.current;
19
+ var formFunc = (0, _hooks.useFormFunc)();
19
20
  var getValidateProps = (0, _hooks.usePersistFn)(function () {
20
21
  return props;
21
22
  });
@@ -29,16 +30,16 @@ var FormFieldSet = function FormFieldSet(props) {
29
30
  }),
30
31
  Provider = _useFormFieldSet.Provider,
31
32
  ProviderValue = _useFormFieldSet.ProviderValue,
32
- value = _useFormFieldSet.value,
33
33
  error = _useFormFieldSet.error,
34
- _onChange = _useFormFieldSet.onChange;
34
+ _onChange = _useFormFieldSet.onChange,
35
+ name = _useFormFieldSet.name;
35
36
  if (typeof children !== 'function') {
36
37
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Provider, {
37
38
  value: ProviderValue,
38
39
  children: children
39
40
  });
40
41
  }
41
- var valueArr = value || [];
42
+ var valueArr = (formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name)) || [];
42
43
  valueArr = Array.isArray(valueArr) ? valueArr : [valueArr];
43
44
  var result = [];
44
45
  if (valueArr.length === 0 && valueArr && empty) {
@@ -49,6 +50,7 @@ var FormFieldSet = function FormFieldSet(props) {
49
50
  });
50
51
  _onChange(newValue);
51
52
  context.ids.push(_hooks.util.generateUUID());
53
+ formFunc === null || formFunc === void 0 || formFunc.insertError(name, 0);
52
54
  })
53
55
  }, 'empty'));
54
56
  }
@@ -70,31 +72,39 @@ var FormFieldSet = function FormFieldSet(props) {
70
72
  index: i,
71
73
  error: errorList,
72
74
  onChange: function onChange(val) {
73
- var newValue = produce(valueArr, function (draft) {
75
+ var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
76
+ var newValue = produce(oldValue, function (draft) {
74
77
  draft[i] = val;
75
78
  });
76
79
  _onChange(newValue);
80
+ formFunc === null || formFunc === void 0 || formFunc.validateFieldset("".concat(name, "[").concat(i, "]"));
77
81
  },
78
82
  onInsert: function onInsert(val) {
79
- var newValue = produce(valueArr, function (draft) {
83
+ var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
84
+ var newValue = produce(oldValue, function (draft) {
80
85
  draft.splice(i, 0, val);
81
86
  });
82
87
  _onChange(newValue);
83
88
  context.ids.splice(i, 0, _hooks.util.generateUUID());
89
+ formFunc === null || formFunc === void 0 || formFunc.insertError(name, i);
84
90
  },
85
91
  onAppend: function onAppend(val) {
86
- var newValue = produce(valueArr, function (draft) {
92
+ var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
93
+ var newValue = produce(oldValue, function (draft) {
87
94
  draft.splice(i + 1, 0, val);
88
95
  });
89
96
  _onChange(newValue);
90
97
  context.ids.splice(i + 1, 0, _hooks.util.generateUUID());
98
+ formFunc === null || formFunc === void 0 || formFunc.insertError(name, i + 1);
91
99
  },
92
100
  onRemove: function onRemove() {
93
- var newValue = produce(valueArr, function (draft) {
101
+ var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
102
+ var newValue = produce(oldValue, function (draft) {
94
103
  draft.splice(i, 1);
95
104
  });
96
105
  _onChange(newValue);
97
106
  context.ids.splice(i, 1);
107
+ formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
98
108
  }
99
109
  })
100
110
  }, ids[i]));
package/cjs/menu/item.js CHANGED
@@ -150,7 +150,7 @@ var MenuItem = function MenuItem(props) {
150
150
  }
151
151
  }) : null;
152
152
  var item = _hooks.util.render(props.renderItem, props.dataItem, props.index);
153
- var link = props.linkKey ? _hooks.util.getKey(props.linkKey, props.dataItem, props.index) : undefined;
153
+ var link = props.linkKey ? _hooks.util.getKey(props.linkKey, props.dataItem, props.index, true) : undefined;
154
154
  var title = null;
155
155
  if (_hooks.util.isLink(item)) {
156
156
  var mergeClass = (0, _classnames.default)(classes === null || classes === void 0 ? void 0 : classes.title, item.props && item.props.className);
package/cjs/select/select.js CHANGED
@@ -561,7 +561,7 @@ function Select(props0) {
561
561
  optionListRef: optionListRef,
562
562
  onOptionClick: handleOptionClick
563
563
  };
564
- console.log('lineHeight2333', lineHeight);
564
+
565
565
  // 自定义列
566
566
  if ('columns' in props && typeof columns === 'number' && columns >= 1 || columns === -1) {
567
567
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_listColumns.default, _objectSpread({
package/esm/form/form-fieldset.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"form-fieldset.d.ts","sourceRoot":"","sources":["form-fieldset.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,QAAA,MAAM,YAAY,iDA+EjB,CAAC;AAEF,eAAe,YAAY,CAAC"}
1
+ {"version":3,"file":"form-fieldset.d.ts","sourceRoot":"","sources":["form-fieldset.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,QAAA,MAAM,YAAY,iDA0FjB,CAAC;AAEF,eAAe,YAAY,CAAC"}
package/esm/form/form-fieldset.js CHANGED
@@ -1,4 +1,4 @@
1
- import { useFormFieldSet, util, usePersistFn } from '@sheinx/hooks';
1
+ import { useFormFieldSet, util, usePersistFn, useFormFunc } from '@sheinx/hooks';
2
2
  import React from 'react';
3
3
  import { jsx as _jsx } from "react/jsx-runtime";
4
4
  import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -10,6 +10,7 @@ var FormFieldSet = function FormFieldSet(props) {
10
10
  ids: []
11
11
  }),
12
12
  context = _React$useRef.current;
13
+ var formFunc = useFormFunc();
13
14
  var getValidateProps = usePersistFn(function () {
14
15
  return props;
15
16
  });
@@ -23,16 +24,16 @@ var FormFieldSet = function FormFieldSet(props) {
23
24
  }),
24
25
  Provider = _useFormFieldSet.Provider,
25
26
  ProviderValue = _useFormFieldSet.ProviderValue,
26
- value = _useFormFieldSet.value,
27
27
  error = _useFormFieldSet.error,
28
- _onChange = _useFormFieldSet.onChange;
28
+ _onChange = _useFormFieldSet.onChange,
29
+ name = _useFormFieldSet.name;
29
30
  if (typeof children !== 'function') {
30
31
  return /*#__PURE__*/_jsx(Provider, {
31
32
  value: ProviderValue,
32
33
  children: children
33
34
  });
34
35
  }
35
- var valueArr = value || [];
36
+ var valueArr = (formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name)) || [];
36
37
  valueArr = Array.isArray(valueArr) ? valueArr : [valueArr];
37
38
  var result = [];
38
39
  if (valueArr.length === 0 && valueArr && empty) {
@@ -43,6 +44,7 @@ var FormFieldSet = function FormFieldSet(props) {
43
44
  });
44
45
  _onChange(newValue);
45
46
  context.ids.push(util.generateUUID());
47
+ formFunc === null || formFunc === void 0 || formFunc.insertError(name, 0);
46
48
  })
47
49
  }, 'empty'));
48
50
  }
@@ -64,31 +66,39 @@ var FormFieldSet = function FormFieldSet(props) {
64
66
  index: i,
65
67
  error: errorList,
66
68
  onChange: function onChange(val) {
67
- var newValue = produce(valueArr, function (draft) {
69
+ var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
70
+ var newValue = produce(oldValue, function (draft) {
68
71
  draft[i] = val;
69
72
  });
70
73
  _onChange(newValue);
74
+ formFunc === null || formFunc === void 0 || formFunc.validateFieldset("".concat(name, "[").concat(i, "]"));
71
75
  },
72
76
  onInsert: function onInsert(val) {
73
- var newValue = produce(valueArr, function (draft) {
77
+ var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
78
+ var newValue = produce(oldValue, function (draft) {
74
79
  draft.splice(i, 0, val);
75
80
  });
76
81
  _onChange(newValue);
77
82
  context.ids.splice(i, 0, util.generateUUID());
83
+ formFunc === null || formFunc === void 0 || formFunc.insertError(name, i);
78
84
  },
79
85
  onAppend: function onAppend(val) {
80
- var newValue = produce(valueArr, function (draft) {
86
+ var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
87
+ var newValue = produce(oldValue, function (draft) {
81
88
  draft.splice(i + 1, 0, val);
82
89
  });
83
90
  _onChange(newValue);
84
91
  context.ids.splice(i + 1, 0, util.generateUUID());
92
+ formFunc === null || formFunc === void 0 || formFunc.insertError(name, i + 1);
85
93
  },
86
94
  onRemove: function onRemove() {
87
- var newValue = produce(valueArr, function (draft) {
95
+ var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
96
+ var newValue = produce(oldValue, function (draft) {
88
97
  draft.splice(i, 1);
89
98
  });
90
99
  _onChange(newValue);
91
100
  context.ids.splice(i, 1);
101
+ formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
92
102
  }
93
103
  })
94
104
  }, ids[i]));
package/esm/menu/item.js CHANGED
@@ -144,7 +144,7 @@ var MenuItem = function MenuItem(props) {
144
144
  }
145
145
  }) : null;
146
146
  var item = util.render(props.renderItem, props.dataItem, props.index);
147
- var link = props.linkKey ? util.getKey(props.linkKey, props.dataItem, props.index) : undefined;
147
+ var link = props.linkKey ? util.getKey(props.linkKey, props.dataItem, props.index, true) : undefined;
148
148
  var title = null;
149
149
  if (util.isLink(item)) {
150
150
  var mergeClass = classNames(classes === null || classes === void 0 ? void 0 : classes.title, item.props && item.props.className);
package/esm/select/select.js CHANGED
@@ -554,7 +554,7 @@ function Select(props0) {
554
554
  optionListRef: optionListRef,
555
555
  onOptionClick: handleOptionClick
556
556
  };
557
- console.log('lineHeight2333', lineHeight);
557
+
558
558
  // 自定义列
559
559
  if ('columns' in props && typeof columns === 'number' && columns >= 1 || columns === -1) {
560
560
  return /*#__PURE__*/_jsx(ColumnsList, _objectSpread({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sheinx/base",
3
- "version": "3.3.0-beta.2",
3
+ "version": "3.3.0-beta.3",
4
4
  "description": "",
5
5
  "keywords": [],
6
6
  "license": "MIT",
@@ -10,7 +10,7 @@
10
10
  "module": "./esm/index.js",
11
11
  "typings": "./cjs/index.d.ts",
12
12
  "dependencies": {
13
- "@sheinx/hooks": "3.3.0-beta.2",
13
+ "@sheinx/hooks": "3.3.0-beta.3",
14
14
  "immer": "^10.0.0",
15
15
  "classnames": "^2.0.0",
16
16
  "@shined/reactive": "^0.1.3-alpha.0"