shineout 3.6.0-beta.28 → 3.6.0-beta.29

package/cjs/index.js

@@ -514,5 +514,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.6.0-beta.28'
+  version: '3.6.0-beta.29'
 };

package/dist/shineout.js

@@ -12139,7 +12139,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.6.0-beta.28');
+/* harmony default export */ var version = ('3.6.0-beta.29');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -27763,6 +27763,9 @@ var treeStyle = {
   notTree: {
     '&$root > $node$leaf': {
       paddingLeft: 0
+    },
+    '& $content': {
+      marginLeft: 0
     }
   },
   line: {
@@ -27913,14 +27916,16 @@ var treeStyle = {
     flex: 1,
     display: 'flex',
     alignItems: 'center',
+    marginLeft: 4,
     // 'label&': {
     //   cursor: 'pointer',
     //   userSelect: 'none',
     // },
 
-    '$iconWrapper + &': {
-      marginLeft: 4
-    },
+    // '$iconWrapper + &': {
+    //   marginLeft: 4,
+    // },
+
     '$contentDisabled &': {
       '& $text': {
         color: src.treeContentDisabledFontColor
@@ -54132,7 +54137,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", "actionOnClick"];
+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", "actionOnClick", "tiledData"];
 
 
 
@@ -54195,6 +54200,7 @@ var Tree = function Tree(props) {
     onDragStart = props.onDragStart,
     propsDatum = props.datum,
     actionOnClick = props.actionOnClick,
+    tiledData = props.tiledData,
     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),
@@ -54362,7 +54368,6 @@ var Tree = function Tree(props) {
         actionOnClick: actionOnClick
       }));
     }
-    console.log('data', data);
     return /*#__PURE__*/(0,jsx_runtime.jsx)(tree_root, {
       rootStyle: rootStyle,
       isControlled: 'expanded' in props,
@@ -65459,6 +65464,10 @@ var TreeSelect = function TreeSelect(props0) {
     tiledData = _useTiled.data,
     onTiledFilter = _useTiled.onFilter,
     tiledExpandIcons = _useTiled.expandIcons;
+  var handleExpanded = function handleExpanded(id) {
+    setVirtualExpanded(id);
+    onExpand === null || onExpand === void 0 || onExpand(id);
+  };
   var _useTree = use_tree({
       mode: mode,
       value: value,
@@ -65470,14 +65479,13 @@ var TreeSelect = function TreeSelect(props0) {
       active: multiple ? undefined : value[0],
       childrenKey: childrenKey,
       keygen: keygen,
-      onExpand: onExpand,
+      onExpand: handleExpanded,
       expanded: controlExpanded,
       defaultExpanded: defaultExpanded,
       defaultExpandAll: defaultExpandAll,
       isControlled: controlExpanded !== undefined
     }),
     datum = _useTree.datum,
-    onExpandTree = _useTree.onExpand,
     unControlExpanded = _useTree.expanded;
   var onCollapse = usePersistFn(function (collapse) {
     onCollapseProp === null || onCollapseProp === void 0 || onCollapseProp(collapse);
@@ -65545,10 +65553,6 @@ var TreeSelect = function TreeSelect(props0) {
       openPop();
     }
   });
-  var handleExpanded = function handleExpanded(id) {
-    setVirtualExpanded(id);
-    onExpandTree(id);
-  };
   var focusAndOpen = function focusAndOpen() {
     if (!focused) {
       var _inputRef$current2;
@@ -65686,7 +65690,6 @@ var TreeSelect = function TreeSelect(props0) {
   };
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (virtual && expanded) {
-      console.log(expanded);
       setVirtualExpanded(expanded);
     }
   }, [expanded]);
@@ -69602,7 +69605,7 @@ var upload_interface = __webpack_require__(8821);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.6.0-beta.28'
+  version: '3.6.0-beta.29'
 });
 }();
 /******/ 	return __webpack_exports__;