shineout 3.9.12-beta.6 → 3.9.12-beta.8

package/cjs/index.js

@@ -522,5 +522,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.9.12-beta.6'
+  version: '3.9.12-beta.8'
 };

package/dist/shineout.js

@@ -12408,7 +12408,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.9.12-beta.6');
+/* harmony default export */ var version = ('3.9.12-beta.8');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -19959,7 +19959,7 @@ var formItemStyle = objectSpread2_default()(objectSpread2_default()({
     }
   },
   wrapperHideRequired: {
-    '& $label::before': {
+    '& > $label::before': {
       display: 'none'
     }
   },
@@ -40855,7 +40855,8 @@ var useTree = function useTree(props) {
     defaultExpandAll = props.defaultExpandAll,
     unmatch = props.unmatch,
     isControlled = props.isControlled,
-    onExpandProp = props.onExpand;
+    onExpandProp = props.onExpand,
+    sortBySelect = props.sortBySelect;
   var disabledProps = isOptionalDisabled(props.disabled) ? props.disabled.disabled : props.disabled;
   var isRealtime = isOptionalDisabled(props.disabled) ? props.disabled.isRealtime : false;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)([]),
@@ -40883,7 +40884,8 @@ var useTree = function useTree(props) {
       value: undefined,
       data: [],
       cachedValue: [],
-      valueDataCache: new Map()
+      valueDataCache: new Map(),
+      selectOrder: []
     }),
     context = _useRef.current;
 
@@ -40983,6 +40985,16 @@ var useTree = function useTree(props) {
     context.unmatchedValueMap.forEach(function (unmatch, id) {
       if (unmatch) values.push(id);
     });
+    if (sortBySelect && context.selectOrder.length > 0) {
+      var orderMap = new Map();
+      context.selectOrder.forEach(function (id, index) {
+        orderMap.set(id, index);
+      });
+      values.sort(function (a, b) {
+        var _orderMap$get, _orderMap$get2;
+        return ((_orderMap$get = orderMap.get(a)) !== null && _orderMap$get !== void 0 ? _orderMap$get : Infinity) - ((_orderMap$get2 = orderMap.get(b)) !== null && _orderMap$get2 !== void 0 ? _orderMap$get2 : Infinity);
+      });
+    }
     context.cachedValue = values;
     // why deep clone: 外部可能对数组做splice等操作，影响context.cachedValue在内部的判断逻辑
     // 表现出来的bug现象是：外部删除了某个叶子结点，但是Tree的勾选情况没有同步更新; 另外是为了对齐老版本的表现
@@ -41028,6 +41040,21 @@ var useTree = function useTree(props) {
     return isUnMatchedData(data);
   });
   var setValueMap = function setValueMap(id, checked) {
+    if (sortBySelect) {
+      var prevChecked = context.valueMap.get(id);
+      var wasChecked = prevChecked === 1 || prevChecked === 2;
+      var isChecked = checked === 1 || checked === 2;
+      if (!wasChecked && isChecked) {
+        if (!context.selectOrder.includes(id)) {
+          context.selectOrder.push(id);
+        }
+      } else if (wasChecked && !isChecked) {
+        var idx = context.selectOrder.indexOf(id);
+        if (idx >= 0) {
+          context.selectOrder.splice(idx, 1);
+        }
+      }
+    }
     context.valueMap.set(id, checked);
     var update = context.forceUpdateMap.get(id);
     if (update) update();
@@ -41188,6 +41215,12 @@ var useTree = function useTree(props) {
       initValue();
     }
     setUnmatedValue();
+    if (sortBySelect) {
+      context.selectOrder = (context.value || []).filter(function (id) {
+        var status = context.valueMap.get(id);
+        return status === 1 || status === 2 || context.unmatchedValueMap.get(id);
+      });
+    }
   };
   var isDisabled = function isDisabled(id) {
     if (isFunc(disabledProps)) {
@@ -41225,6 +41258,7 @@ var useTree = function useTree(props) {
     context.dataFlatStatusMap = new Map();
     context.valueMap = new Map();
     context.unmatchedValueMap = new Map();
+    context.selectOrder = [];
     context.data = use_tree_toArray(data);
     if (virtual) {
       context.dataFlat = [];
@@ -41515,7 +41549,8 @@ var useCascader = function useCascader(props) {
     valueProp = props.value,
     onChangeProp = props.onChange,
     filterSameChange = props.filterSameChange,
-    childrenKey = props.childrenKey;
+    childrenKey = props.childrenKey,
+    sortBySelect = props.sortBySelect;
   var _useInputAble = useInputAble({
       value: valueProp,
       control: control,
@@ -41534,7 +41569,8 @@ var useCascader = function useCascader(props) {
       mode: mode,
       disabled: disabled,
       isControlled: control,
-      childrenKey: childrenKey
+      childrenKey: childrenKey,
+      sortBySelect: sortBySelect
     }),
     datum = _useTree.datum;
   return {
@@ -43814,7 +43850,8 @@ var Cascader = function Cascader(props0) {
     virtual = props.virtual,
     filterSameChange = props.filterSameChange,
     beforeChange = props.beforeChange,
-    checkOnFiltered = props.checkOnFiltered;
+    checkOnFiltered = props.checkOnFiltered,
+    sortBySelect = props.sortBySelect;
   var showInput = isFunc(onFilterProp);
   var isRealtime = cascader_isOptionalDisabled(props.disabled) ? props.disabled.isRealtime : false;
   var disabled = isOptionalDisabled(disabledProp) ? disabledProp.disabled : disabledProp;
@@ -43855,6 +43892,12 @@ var Cascader = function Cascader(props0) {
     FilterProvider = _useFilter.FilterProvider;
   var isDataEmpty = !filterData || filterData.length === 0;
   var isMultiple = multiple === true || mode !== undefined;
+
+  // fix: multiple=true 但未传 mode 时，mode 为 undefined 会导致 getValue() 的 switch-case
+  // 走 default 分支返回空数组，进而在受控模式下 setValue → initValue 用空值重置勾选状态，
+  // 表现为 checkbox 勾选后立即回弹。此问题由 #1364 引入 deepClone 后暴露。
+  // 默认值 1 与 Tree、TreeSelect 组件的 mode 解构默认值保持一致。
+  var resolvedMode = isMultiple && mode === undefined ? 1 : mode;
   var updateKey = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
     return path.join('-');
   }, [path]);
@@ -43864,13 +43907,14 @@ var Cascader = function Cascader(props0) {
       keygen: keygen,
       unmatch: unmatch,
       disabled: disabledProp,
-      mode: mode,
+      mode: resolvedMode,
       defaultValue: defaultValue,
       childrenKey: childrenKey,
       value: valueProp,
       beforeChange: beforeChange,
       onChange: onChangeProp,
-      filterSameChange: filterSameChange
+      filterSameChange: filterSameChange,
+      sortBySelect: sortBySelect
     }),
     datum = _useCascader.datum,
     value = _useCascader.value,
@@ -44207,7 +44251,7 @@ var Cascader = function Cascader(props0) {
       parentId: "",
       virtual: virtual,
       path: [],
-      mode: mode,
+      mode: resolvedMode,
       size: size
     }, 'root')];
     var childs = path.map(function (p, i) {
@@ -44292,7 +44336,7 @@ var Cascader = function Cascader(props0) {
         data: filterData,
         datum: datum,
         keygen: keygen,
-        mode: mode,
+        mode: resolvedMode,
         height: height,
         size: size,
         isRealtime: isRealtime,
@@ -58303,7 +58347,7 @@ var TreeVirtual = function TreeVirtual(props) {
 
 
 
-var tree_excluded = ["jssStyle", "line", "childrenKey", "data", "value", "mode", "keygen", "virtual", "expanded", "expandIcons", "iconClass", "leafClass", "nodeClass", "contentClass", "rootStyle", "renderItem", "defaultValue", "dataUpdate", "childrenClass", "defaultExpandAll", "defaultExpanded", "parentClickExpand", "doubleClickExpand", "dragImageSelector", "dragImageStyle", "dragSibling", "unmatch", "ignoreSetFlat", "dragHoverExpand", "active", "setActive", "disabled", "inlineNode", "highlight", "className", "onClick", "loader", "getDatum", "onDrop", "onExpand", "onChange", "onDragEnd", "onDragLeave", "onDragOver", "onDragStart", "datum", "rowsInView", "actionOnClick", "tiledData", "height", "leafIcon"];
+var tree_excluded = ["jssStyle", "line", "childrenKey", "data", "value", "mode", "keygen", "virtual", "expanded", "expandIcons", "iconClass", "leafClass", "nodeClass", "contentClass", "rootStyle", "renderItem", "defaultValue", "dataUpdate", "childrenClass", "defaultExpandAll", "defaultExpanded", "parentClickExpand", "doubleClickExpand", "dragImageSelector", "dragImageStyle", "dragSibling", "unmatch", "ignoreSetFlat", "dragHoverExpand", "active", "setActive", "disabled", "inlineNode", "highlight", "className", "onClick", "loader", "getDatum", "onDrop", "onExpand", "onChange", "onDragEnd", "onDragLeave", "onDragOver", "onDragStart", "datum", "rowsInView", "actionOnClick", "tiledData", "height", "leafIcon", "sortBySelect"];
 
 
 
@@ -58371,6 +58415,7 @@ var Tree = function Tree(props) {
     tiledData = props.tiledData,
     height = props.height,
     leafIcon = props.leafIcon,
+    sortBySelect = props.sortBySelect,
     rest = objectWithoutProperties_default()(props, tree_excluded);
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(propActive),
     _useState2 = slicedToArray_default()(_useState, 2),
@@ -58406,7 +58451,8 @@ var Tree = function Tree(props) {
       virtual: virtual,
       onExpand: onExpandProp,
       datum: propsDatum,
-      tiledData: props.filteredData
+      tiledData: props.filteredData,
+      sortBySelect: sortBySelect
     }),
     datum = _useTree.datum,
     expanded = _useTree.expanded,
@@ -71278,7 +71324,8 @@ var TreeSelect = function TreeSelect(props0) {
     beforeChange = props.beforeChange,
     filterSameChange = props.filterSameChange,
     checkOnFiltered = props.checkOnFiltered,
-    renderOptionList = props.renderOptionList;
+    renderOptionList = props.renderOptionList,
+    sortBySelect = props.sortBySelect;
   var styles = jssStyle === null || jssStyle === void 0 || (_jssStyle$treeSelect = jssStyle.treeSelect) === null || _jssStyle$treeSelect === void 0 ? void 0 : _jssStyle$treeSelect.call(jssStyle);
   var rootStyle = Object.assign({
     width: width
@@ -71378,7 +71425,8 @@ var TreeSelect = function TreeSelect(props0) {
       expanded: controlExpanded,
       defaultExpanded: defaultExpanded,
       defaultExpandAll: defaultExpandAll,
-      isControlled: controlExpanded !== undefined
+      isControlled: controlExpanded !== undefined,
+      sortBySelect: sortBySelect
     }),
     datum = _useTree.datum,
     unControlExpanded = _useTree.expanded;
@@ -75611,7 +75659,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.9.12-beta.6'
+  version: '3.9.12-beta.8'
 });
 }();
 /******/ 	return __webpack_exports__;