shineout 3.3.0-beta.2 → 3.3.0-beta.3

package/cjs/index.js

@@ -476,5 +476,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.3.0-beta.2'
+  version: '3.3.0-beta.3'
 };

package/dist/shineout.js

@@ -6439,16 +6439,16 @@ __webpack_require__.d(color_namespaceObject, {
 });
 
 // NAMESPACE OBJECT: ./src/utils/flat.ts
-var flat_namespaceObject = {};
-__webpack_require__.r(flat_namespaceObject);
-__webpack_require__.d(flat_namespaceObject, {
-  flatten: function() { return flatten; },
+var utils_flat_namespaceObject = {};
+__webpack_require__.r(utils_flat_namespaceObject);
+__webpack_require__.d(utils_flat_namespaceObject, {
+  flatten: function() { return flat_flatten; },
   flattenArray: function() { return flat_flattenArray; },
   getSthByName: function() { return getSthByName; },
-  insertPoint: function() { return flat_insertPoint; },
-  insertValue: function() { return insertValue; },
+  insertPoint: function() { return utils_flat_insertPoint; },
+  insertValue: function() { return flat_insertValue; },
   removeSthByName: function() { return removeSthByName; },
-  spliceValue: function() { return spliceValue; },
+  spliceValue: function() { return flat_spliceValue; },
   unflatten: function() { return unflatten; }
 });
 
@@ -6555,7 +6555,7 @@ __webpack_require__.d(src_utils_namespaceObject, {
   detect: function() { return detect_namespaceObject; },
   doc: function() { return dom_document_namespaceObject; },
   element: function() { return dom_element_namespaceObject; },
-  flat: function() { return flat_namespaceObject; },
+  flat: function() { return utils_flat_namespaceObject; },
   func: function() { return utils_func_namespaceObject; },
   hash: function() { return hash_createHash; },
   is: function() { return utils_is_namespaceObject; },
@@ -11960,7 +11960,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.3.0-beta.2');
+/* harmony default export */ var version = ('3.3.0-beta.3');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -22442,7 +22442,7 @@ var sliderStyle = {
     '&::before': {
       content: '""',
       display: 'block',
-      backgroundColor: '#ccc'
+      backgroundColor: src.sliderScaleLineBackgroundColor
     },
     '$wrapper:not($vertical) &': {
       marginTop: src.sliderScaleMarginY,
@@ -27467,9 +27467,9 @@ function $getKey(gen, d, index) {
   if (typeof gen === 'function') return gen(d, index);
   return index;
 }
-function getKey(gen, d, index) {
+function getKey(gen, d, index, ignoreError) {
   var key = $getKey(gen, d, index);
-  if (typeof key !== 'string' && typeof key !== 'number') {
+  if (typeof key !== 'string' && typeof key !== 'number' && !ignoreError) {
     console.error(new Error("keygen result expect a string or a number, get '".concat(typeof_default()(key), "'")));
   }
   return key;
@@ -44649,6 +44649,90 @@ var Provider = function Provider(props) {
     })
   });
 };
+;// CONCATENATED MODULE: ../hooks/src/utils/flat.ts
+
+
+
+function flat_insertPoint(name) {
+  var reg = /(\[\d+\])/gi;
+  return name.replace(reg, function (s, m, i) {
+    return s.replace(m, i === 0 ? m : ".".concat(m));
+  });
+}
+function flatten(data, skipArray) {
+  if (is_isEmpty(data)) return data;
+  var result = {};
+  function recurse(cur, prop) {
+    if (Object(cur) !== cur || typeof cur === 'function' || cur instanceof Date || cur instanceof Error || skipArray && Array.isArray(cur)) {
+      if (!(cur === undefined && /\[\d+\]$/.test(prop))) {
+        result[prop] = cur;
+      }
+    } else if (Array.isArray(cur)) {
+      if (cur.length === 0) {
+        result[prop] = [];
+      } else {
+        for (var i = 0, l = cur.length; i < l; i++) {
+          recurse(cur[i], prop ? "".concat(prop, "[").concat(i, "]") : "[".concat(i, "]"));
+        }
+      }
+    } else {
+      var empty = true;
+      if (typeof_default()(cur) === 'object') {
+        // eslint-disable-next-line
+        for (var p in cur) {
+          empty = false;
+          recurse(cur[p], prop ? "".concat(prop, ".").concat(p) : p);
+        }
+        if (empty) {
+          result[prop] = {};
+        }
+      }
+    }
+  }
+  recurse(data, '');
+  return result;
+}
+function insertValue(obj, name, index, value) {
+  Object.keys(obj).filter(function (n) {
+    return n.indexOf("".concat(name, "[")) === 0;
+  }).sort().reverse().forEach(function (n) {
+    // const reg = new RegExp(`${name}\\[(\\d+)\\]`)
+    var reg = new RegExp("".concat(name.replace(/\[/g, '\\[').replace(/\]/g, '\\]'), "\\[(\\d+)\\]"));
+    var match = reg.exec(n);
+    var i = parseInt(match[1], 10);
+    if (i < index) return;
+    var newName = n.replace(reg, "".concat(name, "[").concat(i + 1, "]"));
+    if (obj[n]) obj[newName] = obj[n];
+    delete obj[n];
+  });
+  var newValue = flatten(defineProperty_default()({}, "".concat(name, "[").concat(index, "]"), value));
+  Object.keys(newValue).forEach(function (k) {
+    if (newValue[k] !== undefined) obj[k] = newValue[k];
+  });
+}
+function spliceValue(obj, name, index) {
+  var names = Object.keys(obj).filter(function (n) {
+    return n === name || n.indexOf("".concat(name, "[")) === 0;
+  }).sort();
+  names.forEach(function (n) {
+    if (n === name && !Array.isArray(obj[name])) return;
+    if (n === name && Array.isArray(obj[name])) {
+      obj[name].splice(index, 1);
+      return;
+    }
+    var reg = new RegExp("".concat(name.replace(/\[/g, '\\[').replace(/\]/g, '\\]'), "\\[(\\d+)\\]"));
+    var match = reg.exec(n);
+    var i = parseInt(match[1], 10);
+    if (i < index) return;
+    if (i === index) {
+      delete obj[n];
+      return;
+    }
+    var newName = n.replace(reg, "".concat(name, "[").concat(i - 1, "]"));
+    obj[newName] = obj[n];
+    delete obj[n];
+  });
+}
 ;// CONCATENATED MODULE: ../hooks/src/components/use-form/use-form.ts
 
 
@@ -44659,6 +44743,7 @@ var Provider = function Provider(props) {
 
 
 
+
 var globalKey = '__global__&&@@';
 
 
@@ -44731,6 +44816,15 @@ var useForm = function useForm(props) {
       update();
     });
   };
+  var updateFieldsets = use_persist_fn(function (name) {
+    var na = "".concat(name, "[");
+    var no = "".concat(name, ".");
+    context.names.forEach(function (key) {
+      if (key.startsWith(na) || key.startsWith(no)) {
+        update(key);
+      }
+    });
+  });
   var handleSubmitError = function handleSubmitError(err) {
     onError === null || onError === void 0 || onError(err);
     if (!props.scrollToError) return;
@@ -44848,6 +44942,14 @@ var useForm = function useForm(props) {
     context.errors[name] = e;
     update(name);
   });
+  var insertError = use_persist_fn(function (name, index, error) {
+    insertValue(context.errors, name, index, error);
+    updateFieldsets(name);
+  });
+  var spliceError = use_persist_fn(function (name, index) {
+    spliceValue(context.errors, name, index);
+    updateFieldsets(name);
+  });
   var submit = use_persist_fn(function () {
     var withValidate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     if (disabled) return;
@@ -44904,6 +45006,17 @@ var useForm = function useForm(props) {
       other === null || other === void 0 || (_other$onSubmit = other.onSubmit) === null || _other$onSubmit === void 0 || _other$onSubmit.call(other, e);
     };
   };
+  var validateFieldset = function validateFieldset(name) {
+    var na = "".concat(name, "[");
+    var no = "".concat(name, ".");
+    var fields = [];
+    context.names.forEach(function (key) {
+      if (key.startsWith(na) || key.startsWith(no)) {
+        fields.push(key);
+      }
+    });
+    validateFields(fields).catch(function () {});
+  };
   var getDefaultValue = function getDefaultValue() {
     var v = utils_immer_produce(defaultValue, function (draft) {
       Object.keys(context.defaultValues).forEach(function (key) {
@@ -45009,7 +45122,10 @@ var useForm = function useForm(props) {
     setError: setError,
     getErrors: getErrors,
     clearValidate: clearValidate,
-    validateFields: validateFields
+    validateFields: validateFields,
+    validateFieldset: validateFieldset,
+    insertError: insertError,
+    spliceError: spliceError
   });
   var formConfig = external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo(function () {
     return {
@@ -45355,7 +45471,8 @@ var useFormFieldSet = function useFormFieldSet(props) {
     ProviderValue: ProviderValue,
     error: error,
     value: value,
-    onChange: onChange
+    onChange: onChange,
+    name: name
   };
 };
 /* harmony default export */ var use_form_fieldset = (useFormFieldSet);
@@ -45372,6 +45489,7 @@ var FormFieldSet = function FormFieldSet(props) {
       ids: []
     }),
     context = _React$useRef.current;
+  var formFunc = useFormFunc();
   var getValidateProps = usePersistFn(function () {
     return props;
   });
@@ -45385,16 +45503,16 @@ var FormFieldSet = function FormFieldSet(props) {
     }),
     Provider = _useFormFieldSet.Provider,
     ProviderValue = _useFormFieldSet.ProviderValue,
-    value = _useFormFieldSet.value,
     error = _useFormFieldSet.error,
-    _onChange = _useFormFieldSet.onChange;
+    _onChange = _useFormFieldSet.onChange,
+    name = _useFormFieldSet.name;
   if (typeof children !== 'function') {
     return /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
       value: ProviderValue,
       children: children
     });
   }
-  var valueArr = value || [];
+  var valueArr = (formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name)) || [];
   valueArr = Array.isArray(valueArr) ? valueArr : [valueArr];
   var result = [];
   if (valueArr.length === 0 && valueArr && empty) {
@@ -45405,6 +45523,7 @@ var FormFieldSet = function FormFieldSet(props) {
         });
         _onChange(newValue);
         context.ids.push(generateUUID());
+        formFunc === null || formFunc === void 0 || formFunc.insertError(name, 0);
       })
     }, 'empty'));
   }
@@ -45426,31 +45545,39 @@ var FormFieldSet = function FormFieldSet(props) {
         index: i,
         error: errorList,
         onChange: function onChange(val) {
-          var newValue = form_fieldset_produce(valueArr, function (draft) {
+          var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var newValue = form_fieldset_produce(oldValue, function (draft) {
             draft[i] = val;
           });
           _onChange(newValue);
+          formFunc === null || formFunc === void 0 || formFunc.validateFieldset("".concat(name, "[").concat(i, "]"));
         },
         onInsert: function onInsert(val) {
-          var newValue = form_fieldset_produce(valueArr, function (draft) {
+          var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var newValue = form_fieldset_produce(oldValue, function (draft) {
             draft.splice(i, 0, val);
           });
           _onChange(newValue);
           context.ids.splice(i, 0, generateUUID());
+          formFunc === null || formFunc === void 0 || formFunc.insertError(name, i);
         },
         onAppend: function onAppend(val) {
-          var newValue = form_fieldset_produce(valueArr, function (draft) {
+          var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var newValue = form_fieldset_produce(oldValue, function (draft) {
             draft.splice(i + 1, 0, val);
           });
           _onChange(newValue);
           context.ids.splice(i + 1, 0, generateUUID());
+          formFunc === null || formFunc === void 0 || formFunc.insertError(name, i + 1);
         },
         onRemove: function onRemove() {
-          var newValue = form_fieldset_produce(valueArr, function (draft) {
+          var oldValue = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+          var newValue = form_fieldset_produce(oldValue, function (draft) {
             draft.splice(i, 1);
           });
           _onChange(newValue);
           context.ids.splice(i, 1);
+          formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
         }
       })
     }, ids[i]));
@@ -50075,7 +50202,7 @@ function Select(props0) {
       optionListRef: optionListRef,
       onOptionClick: handleOptionClick
     };
-    console.log('lineHeight2333', lineHeight);
+
     // 自定义列
     if ('columns' in props && typeof columns === 'number' && columns >= 1 || columns === -1) {
       return /*#__PURE__*/(0,jsx_runtime.jsx)(list_columns, objectSpread2_default()({
@@ -51639,7 +51766,7 @@ var MenuItem = function MenuItem(props) {
       }
     }) : null;
     var item = render_render(props.renderItem, props.dataItem, props.index);
-    var link = props.linkKey ? getKey(props.linkKey, props.dataItem, props.index) : undefined;
+    var link = props.linkKey ? getKey(props.linkKey, props.dataItem, props.index, true) : undefined;
     var title = null;
     if (isLink(item)) {
       var mergeClass = classnames_default()(classes === null || classes === void 0 ? void 0 : classes.title, item.props && item.props.className);
@@ -61620,13 +61747,13 @@ function fade(color) {
 
 
 
-function flat_insertPoint(name) {
+function utils_flat_insertPoint(name) {
   var reg = /(\[\d+\])/gi;
   return name.replace(reg, function (s, m, i) {
     return s.replace(m, i === 0 ? m : ".".concat(m));
   });
 }
-function flatten(data, skipArray) {
+function flat_flatten(data, skipArray) {
   if (utils_is_isEmpty(data)) return data;
   var result = {};
   function recurse(cur, prop) {
@@ -61675,7 +61802,7 @@ function unflatten(rawdata) {
 
   // eslint-disable-next-line
   Object.keys(data).sort().forEach(function (p) {
-    var pathWithPoint = flat_insertPoint(p);
+    var pathWithPoint = utils_flat_insertPoint(p);
     cur = result;
     prop = '';
     last = 0;
@@ -61691,7 +61818,7 @@ function unflatten(rawdata) {
   });
   return result[''];
 }
-function insertValue(obj, name, index, value) {
+function flat_insertValue(obj, name, index, value) {
   Object.keys(obj).filter(function (n) {
     return n.indexOf("".concat(name, "[")) === 0;
   }).sort().reverse().forEach(function (n) {
@@ -61704,12 +61831,12 @@ function insertValue(obj, name, index, value) {
     if (obj[n]) obj[newName] = obj[n];
     delete obj[n];
   });
-  var newValue = flatten(defineProperty_default()({}, "".concat(name, "[").concat(index, "]"), value));
+  var newValue = flat_flatten(defineProperty_default()({}, "".concat(name, "[").concat(index, "]"), value));
   Object.keys(newValue).forEach(function (k) {
     if (newValue[k] !== undefined) obj[k] = newValue[k];
   });
 }
-function spliceValue(obj, name, index) {
+function flat_spliceValue(obj, name, index) {
   var names = Object.keys(obj).filter(function (n) {
     return n === name || n.indexOf("".concat(name, "[")) === 0;
   }).sort();
@@ -61740,7 +61867,7 @@ var isNameWithPath = function isNameWithPath(name, path) {
 var getSthByName = function getSthByName(name, source) {
   if (source[name]) return source[name];
   var result = unflatten(source);
-  name = flat_insertPoint(name);
+  name = utils_flat_insertPoint(name);
   name.split('.').forEach(function (n) {
     var match = /^\[(\d+)\]$/.exec(n);
     // eslint-disable-next-line
@@ -61755,7 +61882,7 @@ var getSthByName = function getSthByName(name, source) {
 var removeSthByName = function removeSthByName(name, source) {
   var match = /(.*)\[(\d+)\]$/.exec(name);
   if (match) {
-    spliceValue(source, match[1], parseInt(match[2], 10));
+    flat_spliceValue(source, match[1], parseInt(match[2], 10));
   } else {
     Object.keys(source).forEach(function (n) {
       if (isNameWithPath(n, name)) delete source[n];
@@ -61947,7 +62074,7 @@ var objects_deepMerge = function deepMerge() {
   return dest;
 };
 function objects_pathGenerator(raw) {
-  var path = flat_insertPoint(raw);
+  var path = utils_flat_insertPoint(raw);
   var reg = /^\[(\d+)\]$/;
   var pathModeValues = objects_objectValues(objects_PATH_MODE);
   var index = 0;
@@ -63173,7 +63300,7 @@ var upload_interface = __webpack_require__(4412);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.3.0-beta.2'
+  version: '3.3.0-beta.3'
 });
 }();
 /******/ 	return __webpack_exports__;