@luck-design-biz/luckda 0.0.25-9 → 0.0.26

package/lib/components/LdTree/index.js

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
@@ -24,9 +23,8 @@ var _base = require("@luck-design-biz/base");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils2 = require("../../utils");
 var _index = _interopRequireDefault(require("./index.less"));
-var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service", "dataToTreeFormat", "boxRef", "doubleClickExpand", "onNodeDoubleClick", "width", "height", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "treeNodeIcon", "asyncLoad", "parentKey", "onMount", "onUnmount", "onDataSetChange", "onTreeNodeRender", "onlyRoot"],
+var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service", "dataToTreeFormat"],
   _excluded2 = ["onClick"];
-var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
 var LdTree = function LdTree(_ref) {
   var columns = _ref.columns,
     resources = _ref.resources,
@@ -55,25 +53,9 @@ var LdTree = function LdTree(_ref) {
     isTree = _ref.isTree,
     service = _ref.service,
     dataToTreeFormat = _ref.dataToTreeFormat,
-    boxRef = _ref.boxRef,
-    doubleClickExpand = _ref.doubleClickExpand,
-    onNodeDoubleClick = _ref.onNodeDoubleClick,
-    width = _ref.width,
-    height = _ref.height,
-    treeNodeCheckable = _ref.treeNodeCheckable,
-    treeNodeDisableCheckbox = _ref.treeNodeDisableCheckbox,
-    treeNodeDisable = _ref.treeNodeDisable,
-    treeNodeIcon = _ref.treeNodeIcon,
-    asyncLoad = _ref.asyncLoad,
-    parentKey = _ref.parentKey,
-    onMount = _ref.onMount,
-    onUnmount = _ref.onUnmount,
-    onDataSetChange = _ref.onDataSetChange,
-    onTreeNodeRender = _ref.onTreeNodeRender,
-    onlyRoot = _ref.onlyRoot,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   if (!(0, _lodash.includes)(isTree, dataSetKey)) return (0, _utils.formatMessage)({
-    id: 'luckda.ldTree.notTrees',
+    id: 'luckda.ldTree.notTres',
     label: '此数据集非树形数据集，请选择树形数据集'
   });
   var _useState = (0, _react.useState)(null),
@@ -85,16 +67,11 @@ var LdTree = function LdTree(_ref) {
     defaultExpandedProps = _useState4[0],
     setDefaultExpandedProps = _useState4[1];
   var treeRef = (0, _react.useRef)(null);
-  var onceRef = (0, _react.useRef)(true);
-  var defaultParams = (0, _ahooks.useCreation)(function () {
-    var _params = [(0, _objectSpread3.default)({
-      moduleCode: moduleCode,
-      datasetCode: dataSetKey,
-      behaviorKey: 'readTree'
-    }, _defaultParmas)];
-    if (asyncLoad) _params[0][parentKey] = 0;
-    return _params;
-  }, []);
+  var defaultParams = [(0, _objectSpread2.default)({
+    moduleCode: moduleCode,
+    datasetCode: dataSetKey,
+    behaviorKey: 'readTree'
+  }, _defaultParmas)];
   var _useRequest = (0, _ahooks.useRequest)(service || _utils2.behaviorCall, {
       // 获取树数据源
       defaultParams: defaultParams,
@@ -123,32 +100,21 @@ var LdTree = function LdTree(_ref) {
           }
           var treeData = dataToTreeFormat ? dataToTreeFormat(data) : (0, _utils.dataToTree)(data, null, window.appConfig.constraintKeys.PRIMARY, window.appConfig.constraintKeys.PARENT);
           setDataSource(treeData);
-          onceRef.current && afterInit && afterInit(treeData, data);
-          onceRef.current = false;
+          afterInit && afterInit(treeData);
         }
       }
     }),
     loading = _useRequest.loading,
     run = _useRequest.run,
     params = _useRequest.params;
-  var onLdQuery = (0, _ahooks.useMemoizedFn)(function () {
-    var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    run((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, params[0]), _params), defaultParams[0]));
-  });
   (0, _react.useImperativeHandle)(wrapperRef, function () {
-    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, treeRef.current), {}, {
-      onLdQuery: onLdQuery
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, treeRef.current), {}, {
+      onLdQuery: function onLdQuery() {
+        var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+        run((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params[0]), _params), defaultParams[0]));
+      }
     });
   });
-  (0, _react.useLayoutEffect)(function () {
-    onMount && onMount((0, _objectSpread3.default)((0, _objectSpread3.default)({}, params[0]), defaultParams[0]));
-    return function () {
-      onUnmount && onUnmount();
-    };
-  }, []);
-  (0, _react.useLayoutEffect)(function () {
-    onDataSetChange && onDataSetChange(onLdQuery);
-  }, [dataSetKey]);
   var handleMenuClick = function handleMenuClick(menu, data) {
     var onClick = menu.onClick,
       other = (0, _objectWithoutProperties2.default)(menu, _excluded2);
@@ -161,8 +127,7 @@ var LdTree = function LdTree(_ref) {
           return handleMenuClick(menu, data);
         },
         className: _index.default.rightMenu,
-        key: menu.key,
-        style: menu.style
+        key: menu.key
       }, menu.name || '');
     });
   };
@@ -182,23 +147,11 @@ var LdTree = function LdTree(_ref) {
       type: "more"
     }));
   };
-  var handleNodeDoubleClick = (0, _ahooks.useMemoizedFn)(function (e) {
-    var switcher = e.currentTarget.closest('li').querySelector('.ant-tree-switcher');
-    switcher.click();
-  });
-  var handleDoubleClick = (0, _ahooks.useMemoizedFn)(function (e, rowData) {
-    if (doubleClickExpand) handleNodeDoubleClick(e);
-    if (onNodeDoubleClick) onNodeDoubleClick(e, rowData);
-  });
   var renderTitleNode = function renderTitleNode(data, unSelectable) {
     var nodeTitle = (0, _lodash.isFunction)(treeNodeTitle) ? treeNodeTitle(data) : data[treeNodeTitle];
-    if (onTreeNodeRender) nodeTitle = onTreeNodeRender(nodeTitle, data);
     return /*#__PURE__*/_react.default.createElement("div", {
       className: _index.default.nodeTitle,
-      key: data[rowKey],
-      onDoubleClick: function onDoubleClick(e) {
-        return handleDoubleClick(e, data);
-      }
+      key: data[rowKey]
     }, /*#__PURE__*/_react.default.createElement("div", {
       title: nodeTitle,
       className: (0, _classnames.default)((0, _defineProperty2.default)({}, _index.default.nodeTitleDisabled, unSelectable))
@@ -208,94 +161,45 @@ var LdTree = function LdTree(_ref) {
     return data.map(function (item) {
       // 判断是否可选择
       var unSelectable = (0, _lodash.isFunction)(unselectableNodes) ? unselectableNodes(item) : unselectableNodes.includes(item[rowKey]);
-      var props = {
+      if (item.children) {
+        return /*#__PURE__*/_react.default.createElement(_luckDesign.LuckTree.TreeNode, {
+          isLeaf: false,
+          title: renderTitleNode(item, unSelectable),
+          key: item[rowKey],
+          dataRef: item,
+          selectable: !unSelectable
+        }, renderTreeNodes(item.children));
+      }
+      return /*#__PURE__*/_react.default.createElement(_luckDesign.LuckTree.TreeNode, {
         title: renderTitleNode(item, unSelectable),
         key: item[rowKey],
         dataRef: item,
-        selectable: !unSelectable,
-        checkable: treeNodeCheckable && treeNodeCheckable(item),
-        disableCheckbox: treeNodeDisableCheckbox && treeNodeDisableCheckbox(item),
-        disabled: treeNodeDisable && treeNodeDisable(item)
-      };
-      if (treeNodeIcon && !(0, _lodash.isNil)(treeNodeIcon(item))) props.icon = treeNodeIcon(item);
-      if (!item.isleaf) {
-        return /*#__PURE__*/_react.default.createElement(_luckDesign.LuckTree.TreeNode, (0, _extends2.default)({
-          isLeaf: false
-        }, props), renderTreeNodes(item.children || []));
-      }
-      return /*#__PURE__*/_react.default.createElement(_luckDesign.LuckTree.TreeNode, (0, _extends2.default)({
-        isLeaf: true
-      }, props));
+        selectable: !unSelectable
+      });
     });
   });
   var handleDrop = (0, _ahooks.useMemoizedFn)(function (info) {
     var dragInfo = (0, _utils.dragTreeData)(info, dataSource);
-    if (onDrop) onDrop(info, dragInfo);else if (dragInfo !== false) {
-      doAction('drag', {
-        get: {
-          datasetCode: dataSetKey
-        },
-        post: {
-          fromId: info.dragNode.props.dataRef[PRIMARY],
-          toId: info.node.props.dataRef[PRIMARY]
-        }
-      }, {
-        showConfirm: false,
-        callback: function callback(success) {
-          return success && onLdQuery();
-        }
-      });
-    }
+    onDrop && onDrop(info, dragInfo);
   });
   var onAdd = (0, _ahooks.useCreation)(function () {
-    return !(readOnly || !rootAdd || rootAdd.resource && !(0, _lodash.includes)(resources, rootAdd.resource) || onlyRoot && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0) ? function () {
+    return !(readOnly || !rootAdd || rootAdd.resource && !(0, _lodash.includes)(resources, rootAdd.resource)) ? function () {
       return handleMenuClick(rootAdd);
     } : null;
   }, [readOnly, rootAdd, resources]);
-  var onLoadData = (0, _ahooks.useMemoizedFn)(function (treeNode) {
-    return new Promise(function (resolve) {
-      console.log('treeNode.props.children', treeNode.props.children);
-      if (treeNode.props.isLeaf) {
-        resolve();
-        return;
-      }
-      (service || _utils2.behaviorCall)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, params[0]), {}, (0, _defineProperty2.default)({}, parentKey, treeNode.props.dataRef[window.appConfig.constraintKeys.PRIMARY]))).then(function (res) {
-        var code = res.code,
-          list = res.list,
-          detail = res.detail;
-        if (code === 1) {
-          treeNode.props.dataRef.children = list.map(function (i) {
-            return detail[i];
-          });
-          setDataSource((0, _toConsumableArray2.default)(dataSource));
-          resolve();
-        }
-      });
-    });
-  });
-  var asyncLoadData = (0, _ahooks.useCreation)(function () {
-    return asyncLoad ? {
-      loadData: onLoadData
-    } : {};
-  }, []);
   return /*#__PURE__*/_react.default.createElement(_base.TreeBox, {
     suppressTitle: !title,
     title: title,
     loading: loading,
     id: ldId,
     onAdd: onAdd,
-    className: className,
-    ref: boxRef,
-    style: {
-      width: width,
-      height: height
-    }
+    className: className
   }, dataSource && /*#__PURE__*/_react.default.createElement(_luckDesign.LuckTree, (0, _extends2.default)({
     blockNode: true,
     className: (0, _classnames.default)(_index.default.tree, (0, _defineProperty2.default)({}, className, !!treeClassName)),
     draggable: !readOnly && draggable,
     onDrop: handleDrop
-  }, asyncLoadData, defaultExpandedProps, props, {
+  }, defaultExpandedProps, props, {
     ref: treeRef
   }), renderTreeNodes(dataSource)));
 };
@@ -327,9 +231,7 @@ Index.propTypes = {
   // 行为
   suppressInit: _propTypes.default.bool,
   // 抑制初始化
-  afterInit: _propTypes.default.func,
-  // 初始化后
-  parentKey: _propTypes.default.string
+  afterInit: _propTypes.default.func // 初始化后
 };
 Index.defaultProps = {
   readOnly: false,
@@ -344,8 +246,7 @@ Index.defaultProps = {
     return [];
   },
   suppressInit: false,
-  defaultParmas: {},
-  parentKey: 'iparentid'
+  defaultParmas: {}
 };
 var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({

package/lib/components/LdTree/index.less

@@ -3,7 +3,6 @@
     display: flex;
     align-items: center;
     width: 100%;
-    user-select: none;
 
     div {
       flex: 1;
@@ -11,11 +10,9 @@
       white-space: nowrap;
       text-overflow: ellipsis;
     }
-
     div.nodeTitleDisabled {
       color: var(--luck-text-color-disabled);
     }
-
     div.nodeTitleDisabled:hover {
       cursor: not-allowed;
     }
@@ -27,15 +24,13 @@
     }
   }
 }
-
 .classTreeOperates {
   :global(.ant-popover-inner-content) {
     padding: 0;
   }
-
   .rightMenu {
     display: block;
     padding: 4px 8px;
     color: var(--luck-text-color-);
   }
-}
+}