shineout 3.0.8 → 3.0.10

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.8'
+  version: '3.0.10'
 };

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.8');
+/* harmony default export */ var version = ('3.0.10');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -17029,6 +17029,7 @@ var datePickerStyle = objectSpread2_default()(objectSpread2_default()({
   resultText: {
     lineHeight: src.lineHeightDynamic,
     position: 'relative',
+    zIndex: 0,
     flex: '1',
     minWidth: 0,
     '&::before': {
@@ -17037,7 +17038,25 @@ var datePickerStyle = objectSpread2_default()(objectSpread2_default()({
     }
   },
   resultTextPadding: {
+    position: 'relative',
+    zIndex: 2,
+    '& > input': {
+      color: 'inherit',
+      padding: '0',
+      border: '0',
+      outline: '0',
+      fontSize: 'inherit',
+      lineHeight: src.lineHeightDynamic,
+      backgroundColor: 'transparent',
+      width: '100%',
+      '&::placeholder': {
+        color: src.datePickerPlaceholderColor
+      }
+    }
+  },
+  resultTextBg: {
     position: 'absolute',
+    zIndex: 1,
     padding: "0 ".concat(src.datePickerResultTextPaddingX),
     left: "calc(-1 * ".concat(src.datePickerResultTextPaddingX, ")"),
     right: "calc(-1 * ".concat(src.datePickerResultTextPaddingX, ")"),
@@ -17059,7 +17078,7 @@ var datePickerStyle = objectSpread2_default()(objectSpread2_default()({
     }
   },
   resultTextActive: {
-    '& $resultTextPadding': {
+    '& $resultTextBg': {
       backgroundColor: src.datePickerResultTextActiveBackgroundColor
     }
   },
@@ -33666,6 +33685,7 @@ var useFilter = function useFilter(props) {
 
 
 
+
 var MODE = {
   /**
    * 返回全选数据，包含父节点和子节点
@@ -33720,6 +33740,7 @@ var useTree = function useTree(props) {
   var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
       pathMap: new Map(),
       dataMap: new Map(),
+      forceUpdateMap: new Map(),
       valueMap: new Map(),
       updateMap: new Map(),
       unmatchedValueMap: new Map(),
@@ -33731,6 +33752,14 @@ var useTree = function useTree(props) {
     }),
     context = _useRef.current;
 
+  // 注册刷新方法
+  var bindUpdate = usePersistFn(function (id, update) {
+    context.forceUpdateMap.set(id, update);
+  });
+  var unBindUpdate = usePersistFn(function (id) {
+    context.forceUpdateMap.delete(id);
+  });
+
   // 注册节点
   var bindNode = function bindNode(id, update) {
     context.updateMap.set(id, update);
@@ -33846,6 +33875,8 @@ var useTree = function useTree(props) {
   };
   var setValueMap = function setValueMap(id, checked) {
     context.valueMap.set(id, checked);
+    var update = context.forceUpdateMap.get(id);
+    if (update) update();
   };
   var setUnmatedValue = function setUnmatedValue() {
     context.unmatchedValueMap = new Map();
@@ -34052,6 +34083,8 @@ var useTree = function useTree(props) {
     isDisabled: isDisabled,
     bindNode: bindNode,
     getDataById: getDataById,
+    bindUpdate: bindUpdate,
+    unBindUpdate: unBindUpdate,
     pathMap: context.pathMap,
     dataMap: context.dataMap,
     valueMap: context.valueMap,
@@ -34540,9 +34573,9 @@ var Result = function Result(props) {
   var renderItem = function renderItem(info) {
     var dis = info.index === 1 ? disabledRight : disabledLeft;
     var className = classnames_default()(styles === null || styles === void 0 ? void 0 : styles.resultText, info.target && (styles === null || styles === void 0 ? void 0 : styles.placeholder), dis && (styles === null || styles === void 0 ? void 0 : styles.resultTextDisabled), info.index === activeIndex && (styles === null || styles === void 0 ? void 0 : styles.resultTextActive));
-    return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+    return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: className,
-      children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
         className: styles === null || styles === void 0 ? void 0 : styles.resultTextPadding,
         children: info.inputable ? /*#__PURE__*/(0,jsx_runtime.jsx)(result_Input, {
           onRef: function onRef(el) {
@@ -34577,7 +34610,9 @@ var Result = function Result(props) {
           className: styles === null || styles === void 0 ? void 0 : styles.placeholder,
           children: info.place
         })
-      })
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        className: styles === null || styles === void 0 ? void 0 : styles.resultTextBg
+      })]
     });
   };
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
@@ -34626,10 +34661,7 @@ var ResultInput = function ResultInput(props) {
   var bindInputRef = function bindInputRef(ref) {
     inputRef.current = ref;
   };
-  var handleBlur = function handleBlur(e) {
-    if (e.target.value === inputText) {
-      return;
-    }
+  var handleBlur = function handleBlur() {
     if (trim) {
       return onInputBlur === null || onInputBlur === void 0 ? void 0 : onInputBlur(inputText === null || inputText === void 0 ? void 0 : inputText.trim());
     }
@@ -35160,14 +35192,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);
@@ -35239,6 +35275,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;
       }
@@ -35382,7 +35419,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) {
@@ -35394,34 +35433,27 @@ var result_Result = function Result(props) {
     mounted.current = true;
   }, [focus]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (!resultRef.current) return;
-    if (!compressed) return;
-    if (isCompressedBound()) return;
     handleResetMore();
-  }, [valueProp]);
+  }, [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'
     });
@@ -36496,6 +36528,7 @@ var validate = function validate(value, formData, rules, p) {
 
 
 
+
 var getValue = function getValue(name, formValue) {
   if (!name) return undefined;
   if (isArray(name)) {
@@ -36550,6 +36583,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;
@@ -36567,8 +36603,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) {
@@ -36657,9 +36694,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);
         }
       }
     };
@@ -42495,6 +42534,7 @@ var useAutoSize = function useAutoSize(props) {
     if (!shadowRef.current) return;
     var v = value || '';
     if (shadowRef.current.value !== v) shadowRef.current.value = v;
+    if (shadowRef.current.scrollHeight === 0) return;
     setHeight(shadowRef.current.scrollHeight);
   };
   external_root_React_commonjs2_react_commonjs_react_amd_react_default().useEffect(function () {
@@ -46405,6 +46445,7 @@ var ListOption = function ListOption(props) {
     onHover(index);
   };
   var handleClick = function handleClick() {
+    if (datum.disabledCheck(data)) return;
     if (isChecked && multiple) {
       datum.remove(data);
     } else {
@@ -46645,6 +46686,7 @@ var useTreeContext = function useTreeContext() {
 
 
 
+
 var TreeCheckbox = function TreeCheckbox(props) {
   var jssStyle = props.jssStyle,
     className = props.className,
@@ -46654,7 +46696,8 @@ var TreeCheckbox = function TreeCheckbox(props) {
   var _useTreeContext = useTreeContext(),
     getValue = _useTreeContext.getValue,
     set = _useTreeContext.set,
-    getChecked = _useTreeContext.getChecked;
+    getChecked = _useTreeContext.getChecked,
+    unBindUpdate = _useTreeContext.unBindUpdate;
   var handleChange = function handleChange(_, checked) {
     set(id, checked ? 1 : 0);
     if (onChange) {
@@ -46662,6 +46705,11 @@ var TreeCheckbox = function TreeCheckbox(props) {
     }
   };
   var checked = getChecked(id);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    return function () {
+      unBindUpdate(id);
+    };
+  }, []);
   return /*#__PURE__*/(0,jsx_runtime.jsx)(base_src_checkbox_checkbox
   //@ts-ignore
   , {
@@ -46709,9 +46757,12 @@ var NodeContent = function NodeContent(props) {
     onToggle = props.onToggle,
     onDragOver = props.onDragOver,
     onNodeClick = props.onNodeClick;
+  var forceUpdate = useRender();
   var _useTreeContext = useTreeContext(),
-    isDisabled = _useTreeContext.isDisabled;
+    isDisabled = _useTreeContext.isDisabled,
+    bindUpdate = _useTreeContext.bindUpdate;
   var disabled = isDisabled(id);
+  bindUpdate(id, forceUpdate);
   var contentStyle = (jssStyle === null || jssStyle === void 0 ? void 0 : jssStyle.tree()) || {};
   var rootClass = classnames_default()(contentStyle.contentWrapper, defineProperty_default()(defineProperty_default()({}, contentStyle.childnode, data[childrenKey] && data[childrenKey].length > 0), contentStyle.inlineContent, inlineNode));
   var contentClass = classnames_default()(contentStyle.content, isString(contentClassProp) && contentClassProp, isFunc(contentClassProp) && contentClassProp(data));
@@ -48031,7 +48082,7 @@ function Select(props0) {
     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
@@ -48044,8 +48095,6 @@ function Select(props0) {
     _useState4 = slicedToArray_default()(_useState3, 2),
     focused = _useState4[0],
     setFocused = _useState4[1];
-  var isPreventBlur = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)(false);
-  var blurEvent = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
   var inputRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
   var optionListRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
   var _useFilter = use_filter({
@@ -48074,14 +48123,6 @@ function Select(props0) {
     rawData = _useFilter.rawData;
   var onCollapse = usePersistFn(function (collapse) {
     onCollapseProp === null || onCollapseProp === void 0 || onCollapseProp(collapse);
-    if (isPreventBlur.current) {
-      isPreventBlur.current = false;
-      return;
-    }
-    if (blurEvent.current && !collapse) {
-      blurEvent.current();
-      blurEvent.current = null;
-    }
     onClearCreatedData();
   });
   var renderMoreIcon = function renderMoreIcon() {
@@ -48265,12 +48306,12 @@ function Select(props0) {
     if (!onCreate) return;
     if (multiple && !text) return;
     // 防止点击 option 后触发 blur 事件，先把要做的事情存起来，后面再看要不要执行
-    blurEvent.current = function () {
-      if (createdData) {
-        handleChange(createdData);
+    if (createdData) {
+      if (!datum.check(createdData)) {
+        datum.add(createdData);
       }
       onClearCreatedData();
-    };
+    }
   };
   var handleFilter = function handleFilter(text, from) {
     var hideCreate = onCreate && hideCreateOption;
@@ -48287,7 +48328,6 @@ function Select(props0) {
     onFilter === null || onFilter === void 0 || onFilter(trim ? text.trim() : text, from);
   };
   var handleOptionClick = function handleOptionClick() {
-    isPreventBlur.current = true;
     if (multiple) return;
     // 单选结束后需要清除创建项
     onClearCreatedData();
@@ -53094,19 +53134,52 @@ var useTableLayout = function useTableLayout(props) {
   var getColgroup = use_persist_fn(function (fromDrag) {
     var _props$data, _target$current;
     var target = props !== null && props !== void 0 && (_props$data = props.data) !== null && _props$data !== void 0 && _props$data.length ? tbodyRef : theadRef;
-    var group = (_target$current = target.current) === null || _target$current === void 0 ? void 0 : _target$current.querySelector('colgroup');
-    if (!group) return;
-    var cols = group.querySelectorAll('col');
+    var tr = (_target$current = target.current) === null || _target$current === void 0 ? void 0 : _target$current.querySelector('tr');
+    if (!tr) return;
+    var items = tr.children;
     var newCols = [];
     var sum = 0;
-    for (var i = 0, count = cols.length; i < count; i++) {
-      var _cols$i$getBoundingCl = cols[i].getBoundingClientRect(),
-        width = _cols$i$getBoundingCl.width;
+    var _loop = function _loop() {
+      var _items$i$getBoundingC = items[i].getBoundingClientRect(),
+        width = _items$i$getBoundingC.width;
       sum += width;
-      newCols.push(width);
+      var colspan = items[i].getAttribute('colspan');
+      var dfWidth = props.columns.slice(i, i + (colspan ? parseInt(colspan, 10) : 1)).map(function (v) {
+        return v.width;
+      });
+      var tempcols = [];
+      var emptyNum = dfWidth.filter(function (v) {
+        return v === undefined;
+      }).length;
+      if (dfWidth.length === 1) {
+        // colspan = 1
+        tempcols = [width];
+      } else if (emptyNum === 0) {
+        // 都有宽度按照比例分
+        var all = dfWidth.reduce(function (a, b) {
+          return a + b;
+        }, 0);
+        tempcols = dfWidth.map(function (v) {
+          return v / all * width;
+        });
+      } else {
+        // 多余的平分
+        var _all = dfWidth.reduce(function (a, b) {
+          return (a || 0) + (b || 0);
+        }, 0);
+        var rest = width - _all;
+        var agv = rest > 0 ? rest / emptyNum : 0;
+        tempcols = dfWidth.map(function (v) {
+          return v ? v : agv;
+        });
+      }
+      newCols = [].concat(toConsumableArray_default()(newCols), toConsumableArray_default()(tempcols));
+    };
+    for (var i = 0, count = items.length; i < count; i++) {
+      _loop();
     }
     if (fromDrag && props.columnResizable) {
-      var widthArr = [].concat(newCols);
+      var widthArr = toConsumableArray_default()(newCols);
       if (typeof props.width === 'number') {
         var maxWidth = Math.max(context.clientWidth, props.width + deltaXSum);
 
@@ -61261,7 +61334,7 @@ var upload_interface = __webpack_require__(4412);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.0.8'
+  version: '3.0.10'
 });
 }();
 /******/ 	return __webpack_exports__;