shineout 3.0.7 → 3.0.9

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.0.7'
+  version: '3.0.9'
 };

package/dist/shineout.js

@@ -12019,7 +12019,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.0.7');
+/* harmony default export */ var version = ('3.0.9');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -33706,7 +33706,8 @@ var useTree = function useTree(props) {
     disabledProps = props.disabled,
     unmatch = props.unmatch,
     isControlled = props.isControlled,
-    onExpandProp = props.onExpand;
+    onExpandProp = props.onExpand,
+    keepCache = props.keepCache;
   var _useInputAble = useInputAble({
       value: expandedProp,
       defaultValue: defaultExpanded,
@@ -33725,7 +33726,8 @@ var useTree = function useTree(props) {
       disabled: false,
       value: undefined,
       data: [],
-      cachedValue: []
+      cachedValue: [],
+      valueDataCache: new Map()
     }),
     context = _useRef.current;
 
@@ -33818,8 +33820,18 @@ var useTree = function useTree(props) {
     return checked;
   };
   var getDataById = function getDataById(id) {
+    if (keepCache) {
+      if (!context.valueDataCache) {
+        context.valueDataCache = new Map();
+      }
+      var cache = context.valueDataCache.get(id);
+      if (cache !== undefined) return cache;
+    }
     var oroginData = context.dataMap.get(id);
-    if (oroginData) return oroginData;
+    if (oroginData) {
+      if (keepCache) context.valueDataCache.set(id, oroginData);
+      return oroginData;
+    }
     if (!unmatch) return null;
     return {
       IS_NOT_MATCHED_VALUE: true,
@@ -35148,14 +35160,18 @@ var result_Result = function Result(props) {
     getDataByValues = props.getDataByValues,
     checkUnMatched = props.checkUnMatched,
     onRemove = props.onRemove,
-    onResultItemClick = props.onResultItemClick;
+    onResultItemClick = props.onResultItemClick,
+    data = props.data;
   var value = [null, undefined, ''].includes(valueProp) ? [] : multiple ? valueProp : [valueProp];
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(-1),
     _useState2 = slicedToArray_default()(_useState, 2),
     more = _useState2[0],
     setMore = _useState2[1];
+  var _useState3 = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
+    _useState4 = slicedToArray_default()(_useState3, 2),
+    shouldResetMore = _useState4[0],
+    setShouldResetMore = _useState4[1];
   var resultRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(null);
-  var shouldResetMore = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
   var prevMore = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(more);
   var showInput = allowOnFilter;
   var mounted = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
@@ -35227,6 +35243,7 @@ var result_Result = function Result(props) {
     if (result_isUnMatchedData(item)) {
       if (result_isFunc(keygen)) {
         key = keygen(item.value, index);
+        if (key === undefined) key = index;
       } else {
         key = item.value;
       }
@@ -35370,7 +35387,9 @@ var result_Result = function Result(props) {
   };
   var handleResetMore = function handleResetMore() {
     if (!compressed) return;
-    shouldResetMore.current = true;
+    if (isCompressedBound()) return;
+    setMore(-1);
+    setShouldResetMore(true);
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (!focus && mounted.current) {
@@ -35382,35 +35401,27 @@ var result_Result = function Result(props) {
     mounted.current = true;
   }, [focus]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (!focus) return;
-    if (!resultRef.current) return;
-    if (!compressed) return;
-    if (isCompressedBound()) return;
     handleResetMore();
-  }, [valueProp, focus]);
+  }, [valueProp, data]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (!compressed) return;
-    if (!resultRef.current) return;
-    if (more === -1) {
+    if (shouldResetMore && more === -1 && compressed && resultRef.current && (props.value || [].length)) {
       var tagClassName = ".".concat(styles.tag.split(' ')[0]);
-      if (shouldResetMore.current && result_isArray(value) && (value || []).length) {
-        shouldResetMore.current = false;
+      if (shouldResetMore && result_isArray(value) && (value || []).length) {
         var newMore = getResetMore(showInput, resultRef.current, resultRef.current.querySelectorAll(tagClassName));
-
-        // 下次触发折叠逻辑的时候，将多余的 tag 隐藏，避免视图闪断
-        if (newMore !== prevMore.current && prevMore.current === -1 && newMore > prevMore.current) {
-          var tags = resultRef.current.querySelectorAll(tagClassName);
-          tags.forEach(function (tag, index) {
-            if (index >= newMore) tag.setAttribute('style', 'opacity: 0');
-          });
-        }
         prevMore.current = newMore;
         setMore(newMore);
+        setShouldResetMore(false);
+      } else {
+        setShouldResetMore(false);
       }
+    } else {
+      setShouldResetMore(false);
     }
-  }, [valueProp, more]);
+  }, [shouldResetMore]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (!resultRef.current) return;
+    if (!compressed) return;
+    if (isCompressedBound()) return;
     var cancelObserver = addResizeObserver(resultRef.current, handleResetMore, {
       direction: 'x'
     });
@@ -36485,6 +36496,7 @@ var validate = function validate(value, formData, rules, p) {
 
 
 
+
 var getValue = function getValue(name, formValue) {
   if (!name) return undefined;
   if (isArray(name)) {
@@ -36539,6 +36551,9 @@ function useFormControl(props) {
     _React$useState4 = slicedToArray_default()(_React$useState3, 2),
     valueState = _React$useState4[0],
     setValueState = _React$useState4[1];
+  var latestInfo = use_latest_obj({
+    valueState: valueState
+  });
   if (name && formFunc) {
     inForm = true;
     value = valueState;
@@ -36556,8 +36571,9 @@ function useFormControl(props) {
     if (error !== errorState) {
       setErrorState(error);
     }
-    if (!shallowEqual(value, valueState)) {
+    if (!shallowEqual(value, latestInfo.valueState)) {
       setValueState(value);
+      latestInfo.valueState = value;
     }
   });
   var validateFiled = use_persist_fn(function (name, v, formV) {
@@ -36646,9 +36662,11 @@ function useFormControl(props) {
         if (isArray(name)) {
           name.forEach(function (n) {
             controlFunc.unbind(n, reserveAble);
+            updateError(n, undefined);
           });
         } else {
           controlFunc.unbind(name, reserveAble);
+          updateError(name, undefined);
         }
       }
     };
@@ -36833,7 +36851,8 @@ var useListSelectMultiple = function useListSelectMultiple(props) {
       valueMap: new Map(),
       lastData: [],
       dataMap: new Map(),
-      flatDataCache: new Map()
+      flatDataCache: new Map(),
+      valueDataCache: new Map()
     }),
     context = _React$useRef.current;
   var disabledCheck = use_persist_fn(function (data) {
@@ -36983,11 +37002,22 @@ var useListSelectMultiple = function useListSelectMultiple(props) {
     var info = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var map = getDataMap(info.childrenKey);
     var result = [];
+    if (props.keepCache && !context.valueDataCache) {
+      context.valueDataCache = new Map();
+    }
     if (!props.prediction) {
       if (!values || !values.length) return [];
       for (var i = 0; i < values.length; i++) {
+        if (props.keepCache) {
+          var _item = context.valueDataCache.get(values[i]);
+          if (_item !== undefined) {
+            result.push(_item);
+            continue;
+          }
+        }
         var item = map.get(values[i]);
         if (item) {
+          if (props.keepCache) context.valueDataCache.set(values[i], item);
           result.push(item);
         } else {
           result.push({
@@ -37001,9 +37031,9 @@ var useListSelectMultiple = function useListSelectMultiple(props) {
       var raws = Array.from(map.values());
       outer: for (var _i = 0; _i < values.length; _i++) {
         for (var j = 0; j < raws.length; j++) {
-          var _item = raws[j];
-          if (props.prediction(values[_i], _item)) {
-            result.push(_item);
+          var _item2 = raws[j];
+          if (props.prediction(values[_i], _item2)) {
+            result.push(_item2);
             raws.splice(j, 1);
             continue outer;
           }
@@ -38717,7 +38747,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
       quick: quick
     });
   });
-  var isDisabledDate = function isDisabledDate(date, position) {
+  var isDisabledDate = usePersistFn(function (date, position) {
     var mode = getTypeMode(type);
     var disabled = position === 'end' ? context.modeDisabledEnd[mode] : context.modeDisabledStart[mode];
     var isDisabled = disabled ? disabled(date) : false;
@@ -38726,7 +38756,7 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
       isDisabled = disabledTime ? disabledTime(date) : false;
     }
     return isDisabled;
-  };
+  });
   var getFormatValueArr = function getFormatValueArr(dateArr, fmt) {
     return dateArr.map(function (item) {
       if (!item) return props.clearWithUndefined ? undefined : '';
@@ -38864,7 +38894,8 @@ var useDatePickerFormat = function useDatePickerFormat(props) {
     handleClear: handleClear,
     handleInputChange: handleInputChange,
     registerModeDisabled: registerModeDisabled,
-    setCurrentArrWithParams: setCurrentArrWithParams
+    setCurrentArrWithParams: setCurrentArrWithParams,
+    isDisabledDate: isDisabledDate
   });
   return {
     resultArr: resultArr,
@@ -40585,7 +40616,8 @@ var Picker = function Picker(props) {
     currentArr = props.currentArr,
     dateArr = props.dateArr,
     options = props.options,
-    jssStyle = props.jssStyle;
+    jssStyle = props.jssStyle,
+    isDisabledDate = props.isDisabledDate;
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$datePicker = jssStyle.datePicker) === null || _jssStyle$datePicker === void 0 ? void 0 : _jssStyle$datePicker.call(jssStyle);
   var _useDatePickerRange = use_datepicker_range({
       type: props.type,
@@ -40669,10 +40701,10 @@ var Picker = function Picker(props) {
         onDoubleClick: function onDoubleClick(item, type) {
           // 双击同时设置开始和结束日期
           if (props.range && props.type === 'datetime') {
-            if (position === 'start') {
+            if (position === 'start' && !isDisabledDate(item, 'end')) {
               func.setCurrentEnd(item, type);
               func.setDateEnd(item, true);
-            } else {
+            } else if (!isDisabledDate(item, 'start')) {
               func.setCurrentStart(item, type);
               func.setDateStart(item, true);
             }
@@ -40951,6 +40983,7 @@ var DatePicker = function DatePicker(props0) {
           minuteStep: props.minuteStep,
           secondStep: props.secondStep,
           registerModeDisabled: func.registerModeDisabled,
+          isDisabledDate: func.isDisabledDate,
           children: props.children
         })
       })
@@ -46283,7 +46316,8 @@ var useSelect = function useSelect(props) {
     prediction = props.prediction,
     valueProp = props.value,
     onChangeProp = props.onChange,
-    filterSameChange = props.filterSameChange;
+    filterSameChange = props.filterSameChange,
+    noCache = props.noCache;
   var _useInputAble = useInputAble({
       value: valueProp,
       control: control,
@@ -46302,7 +46336,8 @@ var useSelect = function useSelect(props) {
     multiple: multiple,
     disabled: disabled,
     onChange: onChange,
-    prediction: prediction
+    prediction: prediction,
+    keepCache: !noCache
   });
   return {
     value: value,
@@ -47281,7 +47316,7 @@ var Root = function Root(props) {
 
 
 
-var tree_excluded = ["jssStyle", "line", "childrenKey", "data", "value", "mode", "keygen", "expanded", "expandIcons", "iconClass", "leafClass", "nodeClass", "contentClass", "renderItem", "defaultValue", "dataUpdate", "childrenClass", "defaultExpandAll", "defaultExpanded", "parentClickExpand", "doubleClickExpand", "dragImageSelector", "dragImageStyle", "dragSibling", "unmatch", "dragHoverExpand", "active", "disabled", "inlineNode", "highlight", "className", "onClick", "loader", "getDatum", "onDrop", "onExpand", "onChange", "onDragEnd", "onDragLeave", "onDragOver", "onDragStart"];
+var tree_excluded = ["jssStyle", "line", "childrenKey", "data", "value", "mode", "keygen", "expanded", "expandIcons", "iconClass", "leafClass", "nodeClass", "contentClass", "renderItem", "defaultValue", "dataUpdate", "childrenClass", "defaultExpandAll", "defaultExpanded", "parentClickExpand", "doubleClickExpand", "dragImageSelector", "dragImageStyle", "dragSibling", "unmatch", "dragHoverExpand", "active", "disabled", "inlineNode", "highlight", "className", "onClick", "loader", "getDatum", "onDrop", "onExpand", "onChange", "onDragEnd", "onDragLeave", "onDragOver", "onDragStart", "keepCache"];
 
 
 
@@ -47335,6 +47370,7 @@ var Tree = function Tree(props) {
     onDragLeave = props.onDragLeave,
     onDragOver = props.onDragOver,
     onDragStart = props.onDragStart,
+    keepCache = props.keepCache,
     rest = objectWithoutProperties_default()(props, tree_excluded);
   var prevData = usePrevious(data);
   var _useTree = use_tree({
@@ -47352,7 +47388,8 @@ var Tree = function Tree(props) {
       defaultExpanded: defaultExpanded,
       childrenKey: childrenKey,
       keygen: keygen,
-      onExpand: onExpandProp
+      onExpand: onExpandProp,
+      keepCache: keepCache
     }),
     datum = _useTree.datum,
     expanded = _useTree.expanded,
@@ -47998,9 +48035,10 @@ function Select(props0) {
     onFocus = props.onFocus,
     onCollapseProp = props.onCollapse,
     onEnterExpand = props.onEnterExpand,
-    filterSameChange = props.filterSameChange;
+    filterSameChange = props.filterSameChange,
+    noCache = props.noCache;
   var hasFilter = isFunc(props.onAdvancedFilter || onFilterProp);
-  var showInput = hasFilter || isFunc(onCreateProp);
+  var showInput = hasFilter || isFunc(onCreateProp) || onCreateProp === true;
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$select = jssStyle.select) === null || _jssStyle$select === void 0 ? void 0 : _jssStyle$select.call(jssStyle);
   var rootStyle = Object.assign({
     width: width
@@ -48115,7 +48153,8 @@ function Select(props0) {
       prediction: prediction,
       beforeChange: beforeChange,
       onChange: handleSelectChange,
-      filterSameChange: filterSameChange
+      filterSameChange: filterSameChange,
+      noCache: noCache
     }),
     datum = _useSelect.datum,
     value = _useSelect.value;
@@ -57591,8 +57630,8 @@ var TreeSelect = function TreeSelect(props0) {
         getDatum: bindTreeDatum,
         renderItem: renderItem
       }, treeProps), {}, {
+        keepCache: !props.noCache,
         line: line,
-        datum: datum.current,
         mode: mode,
         data: tiledData,
         keygen: keygen,
@@ -61229,7 +61268,7 @@ var upload_interface = __webpack_require__(4412);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.0.7'
+  version: '3.0.9'
 });
 }();
 /******/ 	return __webpack_exports__;