shineout 3.5.4-beta.4 → 3.5.4-beta.6

package/cjs/index.js

@@ -500,5 +500,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.5.4-beta.4'
+  version: '3.5.4-beta.6'
 };

package/dist/shineout.js

@@ -12030,7 +12030,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.5.4-beta.4');
+/* harmony default export */ var version = ('3.5.4-beta.6');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -42532,13 +42532,17 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     _useState8 = slicedToArray_default()(_useState7, 2),
     targetArr = _useState8[0],
     setTargetArr = _useState8[1];
-  var _useState9 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)({
+  var _useState9 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)([]),
+    _useState10 = slicedToArray_default()(_useState9, 2),
+    inputArr = _useState10[0],
+    setInputArr = _useState10[1];
+  var _useState11 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)({
       type: undefined,
       quick: undefined
     }),
-    _useState10 = slicedToArray_default()(_useState9, 2),
-    params = _useState10[0],
-    setParams = _useState10[1];
+    _useState12 = slicedToArray_default()(_useState11, 2),
+    params = _useState12[0],
+    setParams = _useState12[1];
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       cachedDateArr: convertValueToDateArr(value, format, options),
       modeDisabledStart: {},
@@ -42546,14 +42550,14 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     }),
     context = _useRef.current;
   // 当edit 为true时，stateDate 否则返回 props date
-  var _useState11 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(context.cachedDateArr),
-    _useState12 = slicedToArray_default()(_useState11, 2),
-    stateDate = _useState12[0],
-    setStateDate = _useState12[1];
-  var _useState13 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
+  var _useState13 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(context.cachedDateArr),
     _useState14 = slicedToArray_default()(_useState13, 2),
-    edit = _useState14[0],
-    setEdit = _useState14[1];
+    stateDate = _useState14[0],
+    setStateDate = _useState14[1];
+  var _useState15 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
+    _useState16 = slicedToArray_default()(_useState15, 2),
+    edit = _useState16[0],
+    setEdit = _useState16[1];
 
   // 收集所有的disabled
   var registerModeDisabled = usePersistFn(function (position, mode, fn) {
@@ -42571,6 +42575,39 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
       quick: quick
     });
   });
+  var isDisabledInputDate = function isDisabledInputDate(rangeData) {
+    var start = rangeData[0];
+    var end = rangeData[1];
+    var isDis = false;
+    if (disabled && typeof disabled === 'function') {
+      if (start && disabled(start)) isDis = true;
+      if (end && disabled(end)) isDis = true;
+      if (isDis) return isDis;
+    }
+    if (start && end) {
+      if (util.compareAsc(start, end) > 0) {
+        isDis = true;
+        return isDis;
+      }
+    }
+    if (range && typeof range === 'number') {
+      if (start) {
+        if (!end) return isDis;
+        var rangeDate = util.addSeconds(start, range, options);
+        if (util.compareAsc(end, rangeDate) > 0) {
+          isDis = true;
+        }
+      }
+      if (end) {
+        if (!start) return isDis;
+        var _rangeDate = util.addSeconds(end, -range, options);
+        if (util.compareAsc(start, _rangeDate) < 0) {
+          isDis = true;
+        }
+      }
+    }
+    return isDis;
+  };
   var isDisabledDate = usePersistFn(function (date, position, triggerType) {
     var mode = getTypeMode(type);
     var disabled = position === 'end' ? context.modeDisabledEnd[mode] : context.modeDisabledStart[mode];
@@ -42627,6 +42664,19 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
   var finishEdit = function finishEdit() {
     setEdit(false);
     var formatValue = getFormatValueArr(stateDate);
+    if (inputArr.length && inputArr.some(function (i) {
+      return i;
+    })) {
+      var inputValue = inputArr.map(function (item, index) {
+        if (item) return item;
+        return stateDate[index];
+      });
+      var isDis = isDisabledInputDate(inputValue);
+      if (!isDis) {
+        formatValue = getFormatValueArr(inputValue);
+      }
+    }
+    // const formatValue = getFormatValueArr(stateDate);
     var v = range ? formatValue : formatValue[0];
     if (range && (!stateDate[0] || !stateDate[1]) && !props.allowSingle) {
       return;
@@ -42641,6 +42691,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     if (!clearable) return;
     e === null || e === void 0 || e.stopPropagation();
     if (disabledStatus === 'all') return;
+    setInputArr([]);
     if (edit) {
       if (range) {
         if (disabledStatus === 'left') setStateDate(function (arr) {
@@ -42676,6 +42727,12 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     var isValid = util.isValidString(str, format);
     if (!isValid) return;
     var date = util.toDateWithFormat(str, format, undefined, options);
+    setInputArr(function (prev) {
+      var arr = toConsumableArray_default()(prev);
+      arr[index] = date;
+      return arr;
+    });
+
     // 此次校验是由输入触发的
     if (date && isDisabledDate(date, index === 1 ? 'end' : 'start', 'input')) {
       return;
@@ -42691,6 +42748,17 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
       return arr;
     });
   });
+  var handleClearInputArr = usePersistFn(function (index) {
+    if (index !== undefined) {
+      setInputArr(function (prev) {
+        var arr = toConsumableArray_default()(prev);
+        arr[index] = undefined;
+        return arr;
+      });
+      return;
+    }
+    setInputArr([]);
+  });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     handlePropsValueChange(value);
   }, [value]);
@@ -42721,12 +42789,14 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     setCurrentArr: setCurrentArr,
     setTargetArr: setTargetArr,
     handleClear: handleClear,
+    handleClearInputArr: handleClearInputArr,
     handleInputChange: handleInputChange,
     registerModeDisabled: registerModeDisabled,
     setCurrentArrWithParams: setCurrentArrWithParams,
     isDisabledDate: isDisabledDate
   });
   return {
+    inputArr: inputArr,
     resultArr: resultArr,
     targetResultArr: targetResultArr,
     dateArr: dateArr,
@@ -42748,6 +42818,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
 
 var useDate = function useDate(props) {
   var options = props.options,
+    position = props.position,
     type = props.type;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(props.defaultCurrent || new Date()),
     _useState2 = slicedToArray_default()(_useState, 2),
@@ -42840,6 +42911,7 @@ var useDate = function useDate(props) {
     var _props$onChange;
     if (isDisabled(date)) return;
     var newDate = getDateWithTime(date);
+    props === null || props === void 0 || props.onClearInputArr(position === 'start' ? 0 : 1);
     (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, newDate, noClose);
     setCurrent(newDate);
   };
@@ -43389,7 +43461,10 @@ var Day = function Day(props) {
       current: props.current,
       onCurrentChange: setCurrent,
       value: props.value,
+      range: props.range,
       onChange: onChange,
+      onClearInputArr: props.onClearInputArr,
+      position: props.position,
       min: props.min,
       max: props.max,
       type: props.type,
@@ -44639,6 +44714,7 @@ var Picker = function Picker(props) {
       type: props.type,
       defaultTime: props.defaultTime,
       range: props.range,
+      inputArr: props.inputArr,
       dateArr: props.dateArr,
       setDateArr: props.setDateArr,
       currentArr: props.currentArr,
@@ -44682,6 +44758,7 @@ var Picker = function Picker(props) {
       setMode: position === 'end' ? func.setModeEnd : func.setModeStart,
       onChange: position === 'end' ? func.setDateEnd : func.setDateStart,
       setCurrent: position === 'end' ? func.setCurrentEnd : func.setCurrentStart,
+      onClearInputArr: props.onClearInputArr,
       type: props.type,
       format: props.format,
       disabled: position === 'end' ? func.endDisabled : func.startDisabled,
@@ -44889,6 +44966,7 @@ var DatePicker = function DatePicker(props0) {
       formatResult: props.formatResult,
       onPickerChange: props.onPickerChange
     }),
+    inputArr = _useDatePickerFormat.inputArr,
     resultArr = _useDatePickerFormat.resultArr,
     targetResultArr = _useDatePickerFormat.targetResultArr,
     dateArr = _useDatePickerFormat.dateArr,
@@ -45055,7 +45133,9 @@ var DatePicker = function DatePicker(props0) {
         children: /*#__PURE__*/(0,jsx_runtime.jsx)(picker, {
           setTargetArr: func.setTargetArr,
           dateArr: dateArr,
+          inputArr: inputArr,
           setDateArr: func.setDateArr,
+          onClearInputArr: func.handleClearInputArr,
           currentArr: currentArr,
           range: range,
           setCurrentArr: func.setCurrentArrWithParams,
@@ -48043,12 +48123,14 @@ function useFormInstance() {
 ;// CONCATENATED MODULE: ../base/src/form/form.tsx
 
 
+
 var form_excluded = ["jssStyle", "className", "style", "children", "formRef"];
 
 
 
 
 
+
 var Form = function Form(props) {
   var _jssStyle$form;
   var jssStyle = props.jssStyle,
@@ -48089,6 +48171,16 @@ var Form = function Form(props) {
       type: 'withValue'
     });
   });
+  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(0),
+    _useState2 = slicedToArray_default()(_useState, 2),
+    renderKey = _useState2[0],
+    setRenderKey = _useState2[1];
+  var handleOuterSet = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useCallback)(function (vals) {
+    formFunc.setValue(vals);
+    setRenderKey(function (prev) {
+      return prev + 1;
+    });
+  }, [formFunc]);
   var formRefObj = useLatestObj({
     clearValidate: formFunc.clearValidate,
     getValue: formFunc.getValue,
@@ -48098,7 +48190,7 @@ var Form = function Form(props) {
     validateFields: validateFields,
     validateFieldsWithValue: validateFieldsWithValue,
     validateFieldsWithError: formFunc.validateFields,
-    set: formFunc.setValue,
+    set: handleOuterSet,
     scrollToField: formFunc.scrollToField
   });
   external_root_React_commonjs2_react_commonjs_react_amd_react_default().useEffect(function () {
@@ -48147,17 +48239,17 @@ var Form = function Form(props) {
       }
     };
   }, [formProps.onSubmit]);
-  return /*#__PURE__*/(0,jsx_runtime.jsx)("form", objectSpread2_default()(objectSpread2_default()({}, removeProps(formProps, {
+  return /*#__PURE__*/(0,external_root_React_commonjs2_react_commonjs_react_amd_react_.createElement)("form", objectSpread2_default()(objectSpread2_default()({}, removeProps(formProps, {
     onSubmit: true
   })), {}, {
     ref: formElRef,
-    children: /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, objectSpread2_default()(objectSpread2_default()({}, ProviderProps), {}, {
-      children: /*#__PURE__*/(0,jsx_runtime.jsx)(FormContext.Provider, {
-        value: formRefObj,
-        children: children
-      })
-    }))
-  }));
+    key: renderKey
+  }), /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, objectSpread2_default()(objectSpread2_default()({}, ProviderProps), {}, {
+    children: /*#__PURE__*/(0,jsx_runtime.jsx)(FormContext.Provider, {
+      value: formRefObj,
+      children: children
+    })
+  })));
 };
 /* harmony default export */ var base_src_form_form = (Form);
 ;// CONCATENATED MODULE: ./src/form/form.tsx
@@ -48589,8 +48681,7 @@ var FormFieldSet = function FormFieldSet(props) {
     });
   }
   valueArr.forEach(function (v, i) {
-    var _context$ids$i;
-    if (context.lastValues[i] !== v) {
+    if (context.lastValues.length !== valueArr.length) {
       context.ids[i] = generateUUID();
     }
     result.push( /*#__PURE__*/(0,jsx_runtime.jsx)(Provider, {
@@ -48639,7 +48730,7 @@ var FormFieldSet = function FormFieldSet(props) {
           formFunc === null || formFunc === void 0 || formFunc.spliceError(name, i);
         }
       })
-    }, (_context$ids$i = context.ids[i]) !== null && _context$ids$i !== void 0 ? _context$ids$i : i));
+    }, context.ids[i]));
   });
 
   // 更新 lastValues
@@ -58492,6 +58583,7 @@ var useTableSort = function useTableSort(props) {
 
 
 
+
 var getExpandData = function getExpandData(_treeData, keys, keygen, treeColumnsName) {
   var expandKeys = keys;
   var expandSet = new Set(expandKeys);
@@ -58592,6 +58684,9 @@ var useTableTree = function useTableTree(props) {
     var newExpandKeys = expandKeysState.filter(function (key) {
       return !unmatchExpandKeys.includes(key);
     });
+    if (shallowEqual(newExpandKeys, expandKeysState)) {
+      return;
+    }
     setExpandKeysState(newExpandKeys);
   }, [unmatchExpandKeys, expandKeysState]);
   return {
@@ -58960,10 +59055,6 @@ var useTableVirtual = function useTableVirtual(props) {
   }, [scrollHeight]);
   var finalRowsInView = rowsInView + context.rowSpanRows + context.autoAddRows;
   var renderData = props.disabled ? props.data : toConsumableArray_default()(props.data).slice(startIndex, startIndex + finalRowsInView);
-  console.log('======================');
-  console.log('startIndex: >>', startIndex);
-  console.log('finalRowsInView: >>', finalRowsInView);
-  console.log('======================');
   return {
     scrollHeight: scrollHeight,
     startIndex: startIndex,
@@ -67001,7 +67092,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.5.4-beta.4'
+  version: '3.5.4-beta.6'
 });
 }();
 /******/ 	return __webpack_exports__;