shineout 3.7.0-beta.29 → 3.7.0-beta.30

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.7.0-beta.29'
+  version: '3.7.0-beta.30'
 };

package/dist/shineout.js

@@ -7174,7 +7174,8 @@ var config = {
   tree: {
     LineExpand: icons.Expand,
     LineCollapse: icons.Shrink,
-    Expand: icons.ArrowDownFill
+    Expand: icons.ArrowDownFill,
+    Leaf: icons.File
   },
   treeSelect: {
     More: icons.More,
@@ -12226,7 +12227,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.7.0-beta.29');
+/* harmony default export */ var version = ('3.7.0-beta.30');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -28159,6 +28160,19 @@ var treeStyle = {
     }
   },
   line: {
+    '&$virtual $node': {
+      '&::before, &::after': {
+        display: 'none'
+      }
+    },
+    '&$virtual $leaf $contentWrapper': {
+      marginLeft: 12
+    },
+    '&$virtual $leaf $contentWrapper, &$virtual $childnode$contentWrapper': {
+      '&::after': {
+        display: 'none'
+      }
+    },
     '& $node': {
       '&[dir=ltr]::before': {
         left: 0
@@ -28233,8 +28247,10 @@ var treeStyle = {
         }
       }
     },
-    '&$sizeSmall $contentWrapper::after': {
-      display: 'none'
+    '&$sizeSmall': {
+      '& $contentWrapper::after': {
+        display: 'none'
+      }
     },
     '&$sizeLarge': {
       '& $node:last-child::before': {
@@ -28248,7 +28264,10 @@ var treeStyle = {
           right: -32
         }
       },
-      '& $childnode, & $leaf': {
+      '&:not($virtual) $childnode, &:not($virtual) $leaf': {
+        marginLeft: 20
+      },
+      '': {
         marginLeft: 20
       },
       '& $node': {
@@ -28335,6 +28354,16 @@ var treeStyle = {
       }
     }
   },
+  lineIndent: {
+    position: 'absolute',
+    top: 0,
+    width: 1,
+    height: '100%',
+    background: src.treeLineBackgroundColor,
+    '$sizeLarge &': {
+      transform: 'translateX(-4px)'
+    }
+  },
   root: {
     '& > $node': {
       paddingLeft: 12,
@@ -38562,9 +38591,10 @@ var useTree = function useTree(props) {
       };
     }
     if (virtual) {
+      var _context$dataFlatStat;
       return {
         active: isActive,
-        expanded: context.dataFlatStatusMap.get(id).expanded
+        expanded: !!((_context$dataFlatStat = context.dataFlatStatusMap.get(id)) !== null && _context$dataFlatStat !== void 0 && _context$dataFlatStat.expanded)
       };
     }
     return {
@@ -38575,11 +38605,12 @@ var useTree = function useTree(props) {
 
   // 注册节点
   var bindVirtualNode = function bindVirtualNode(id, update) {
+    var _context$dataFlatStat2;
     context.updateMap.set(id, update);
     var isActive = activeProp === id;
     return {
       active: isActive,
-      expanded: context.dataFlatStatusMap.get(id).expanded
+      expanded: !!((_context$dataFlatStat2 = context.dataFlatStatusMap.get(id)) !== null && _context$dataFlatStat2 !== void 0 && _context$dataFlatStat2.expanded)
     };
   };
   var get = function get(id) {
@@ -38951,7 +38982,7 @@ var useTree = function useTree(props) {
   var appendChildrenExpanded = function appendChildrenExpanded(child, level, pid, insertData) {
     if (!child) return;
     child.forEach(function (item, i) {
-      var _context$dataFlatStat;
+      var _context$dataFlatStat3;
       var childId = getKey(item, pid, i);
       var node = {
         id: childId,
@@ -38960,7 +38991,7 @@ var useTree = function useTree(props) {
         pid: pid
       };
       insertData.push(node);
-      if ((_context$dataFlatStat = context.dataFlatStatusMap.get(childId)) !== null && _context$dataFlatStat !== void 0 && _context$dataFlatStat.expanded && item[childrenKey]) {
+      if ((_context$dataFlatStat3 = context.dataFlatStatusMap.get(childId)) !== null && _context$dataFlatStat3 !== void 0 && _context$dataFlatStat3.expanded && item[childrenKey]) {
         appendChildrenExpanded(item[childrenKey], level + 1, childId, insertData);
       }
     });
@@ -39043,6 +39074,16 @@ var useTree = function useTree(props) {
   var getFlatData = function getFlatData() {
     return context.dataFlat;
   };
+  var updateExpanded = usePersistFn(function (expanded) {
+    var tempExpandMap = new Set(expanded);
+    if (!expanded) return;
+    if (virtual) {
+      expandedFlat(expanded);
+    }
+    context.updateMap.forEach(function (update, id) {
+      update('expanded', tempExpandMap.has(id));
+    });
+  });
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (defaultExpandAll) {
       var nextExpanded = [];
@@ -39058,8 +39099,13 @@ var useTree = function useTree(props) {
     if (props.datum) return;
     if (!dataUpdate) return;
     setData(data);
+    var nextExpanded = props.expanded || props.defaultExpanded || [];
+    if (!shallowEqual(nextExpanded, expanded)) {
+      onExpand(nextExpanded);
+      updateExpanded(nextExpanded);
+    }
     updateInnerCheckStatus();
-  }, [data]);
+  }, [props.data]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (props.datum) return;
     setValue(value);
@@ -39084,16 +39130,17 @@ var useTree = function useTree(props) {
     getChecked: getChecked,
     getKey: getKey,
     getFlatData: getFlatData,
+    getDataById: getDataById,
     getDataByValues: getDataByValues,
     setValue: setValue,
     setData: setData,
     isDisabled: isDisabled,
+    isUnMatched: isUnMatched,
     bindNode: bindNode,
     bindVirtualNode: bindVirtualNode,
-    getDataById: getDataById,
     bindUpdate: bindUpdate,
     unBindUpdate: unBindUpdate,
-    isUnMatched: isUnMatched,
+    updateExpanded: updateExpanded,
     childrenKey: childrenKey,
     data: data,
     dataFlat: dataFlat,
@@ -42495,10 +42542,14 @@ function useFormControl(props) {
       if (isArray(name)) {
         var dv = isArray(defaultValue) ? defaultValue : [];
         name.forEach(function (n, index) {
-          controlFunc.bind(n, dv[index], validateField, update);
+          var v = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(n);
+          var bindedValue = v === undefined ? dv[index] : v;
+          controlFunc.bind(n, context.mounted ? bindedValue : dv[index], validateField, update);
         });
       } else {
-        controlFunc.bind(name, defaultValue, validateField, update);
+        var v = formFunc === null || formFunc === void 0 ? void 0 : formFunc.getValue(name);
+        var bindedValue = v === undefined ? defaultValue : v;
+        controlFunc.bind(name, context.mounted ? bindedValue : defaultValue, validateField, update);
       }
       if (context.mounted) {
         devUseWarning.warn('Please avoid modifying the name property after the component has mounted, as this may result in unintended behavior or errors.');
@@ -49926,7 +49977,7 @@ var useForm = function useForm(props) {
           if (errors.length > 0) {
             var errorFields = [];
             for (var _key in context.errors) {
-              if (context.errors[_key]) {
+              if (context.errors[_key] && context.names.has(_key)) {
                 var _context$errors$_key;
                 errorFields.push({
                   name: _key,
@@ -50242,7 +50293,6 @@ var useForm = function useForm(props) {
       }
       if (validateFieldSet.size === 0 && updateFieldSet.size === 0) {
         context.names.delete(n);
-        delete context.errors[n];
         delete context.defaultValues[n];
       }
       var finalReserveAble = (_props$reserveAble = props.reserveAble) !== null && _props$reserveAble !== void 0 ? _props$reserveAble : reserveAble;
@@ -53864,7 +53914,8 @@ var NodeContent = function NodeContent(props) {
   var _useTreeContext = useTreeContext(),
     isDisabled = _useTreeContext.isDisabled,
     bindUpdate = _useTreeContext.bindUpdate,
-    size = _useTreeContext.size;
+    size = _useTreeContext.size,
+    leafIcon = _useTreeContext.leafIcon;
   var config = useConfig();
   var disabled = isDisabled(id);
   bindUpdate(id, forceUpdate);
@@ -53984,6 +54035,25 @@ var NodeContent = function NodeContent(props) {
     if (Array.isArray(children) || children === null) return null;
     if (fetching && !children) return renderLoading();
     if (loader && children === undefined) return indicator;
+    if (leafIcon) {
+      var $iconContent = null;
+      if (leafIcon === true) {
+        $iconContent = icons_config.tree.Leaf;
+      } else if (isFunc(leafIcon)) {
+        $iconContent = leafIcon(data);
+      } else {
+        $iconContent = leafIcon;
+      }
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        className: contentStyle.iconWrapper,
+        dir: config.direction,
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          className: classnames_default()(contentStyle.icon, iconClass),
+          dir: config.direction,
+          children: $iconContent
+        })
+      });
+    }
     return null;
   };
   var renderCheckbox = function renderCheckbox() {
@@ -54461,6 +54531,7 @@ var useTreeVirtualNode = function useTreeVirtualNode(props) {
 
 
 
+
 var tree_virtual_node_placeElement = null;
 var VirtualNode = function VirtualNode(props) {
   var jssStyle = props.jssStyle,
@@ -54529,14 +54600,27 @@ var VirtualNode = function VirtualNode(props) {
     if (onToggle) onToggle(id, nextExpanded);
   };
   var indent = size === "large" ? 32 : 24;
-  return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+  var $indents;
+  if (line) {
+    $indents = Array.from({
+      length: level - 1
+    }).map(function (_, index) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        className: contentStyle.lineIndent,
+        style: {
+          left: (index + 1) * indent
+        }
+      }, index);
+    });
+  }
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
     ref: element,
     className: rootClass,
     dir: config.direction,
     style: {
       paddingLeft: level * indent
     },
-    children: /*#__PURE__*/(0,jsx_runtime.jsx)(tree_content, {
+    children: [$indents, /*#__PURE__*/(0,jsx_runtime.jsx)(tree_content, {
       virtual: true,
       jssStyle: jssStyle,
       isControlled: isControlled,
@@ -54567,7 +54651,7 @@ var VirtualNode = function VirtualNode(props) {
       onNodeClick: onNodeClick,
       onToggle: handleToggle,
       actionOnClick: actionOnClick
-    })
+    })]
   });
 };
 /* harmony default export */ var tree_virtual_node = (VirtualNode);
@@ -54839,7 +54923,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"];
+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"];
 
 
 
@@ -54905,6 +54989,7 @@ var Tree = function Tree(props) {
     rowsInView = _props$rowsInView === void 0 ? 20 : _props$rowsInView,
     actionOnClick = props.actionOnClick,
     tiledData = props.tiledData,
+    height = props.height,
     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),
@@ -54960,16 +55045,6 @@ var Tree = function Tree(props) {
     }
     return props.height || styleHeight;
   };
-  var handleUpdateExpanded = function handleUpdateExpanded(expanded) {
-    var tempExpandMap = new Set(expanded);
-    if (!expanded) return;
-    if (virtual) {
-      datum.expandedFlat(expanded);
-    }
-    datum.updateMap.forEach(function (update, id) {
-      update('expanded', tempExpandMap.has(id));
-    });
-  };
   var handleUpdateActive = function handleUpdateActive(active, item) {
     setActive(active);
     if (active !== props.active) {
@@ -55118,7 +55193,7 @@ var Tree = function Tree(props) {
       return;
     }
     if (!props.expanded) return;
-    handleUpdateExpanded(expanded);
+    datum.updateExpanded(expanded);
   }, [expanded]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     // if (!active) return;
@@ -55137,7 +55212,8 @@ var Tree = function Tree(props) {
   }, rest), {}, {
     children: /*#__PURE__*/(0,jsx_runtime.jsx)(tree_context_Provider, {
       value: objectSpread2_default()(objectSpread2_default()({}, datum), {}, {
-        size: props.size
+        size: props.size,
+        leafIcon: props.leafIcon
       }),
       children: renderList()
     })
@@ -70940,7 +71016,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.7.0-beta.29'
+  version: '3.7.0-beta.30'
 });
 }();
 /******/ 	return __webpack_exports__;