@luck-design-biz/luckda 0.0.25-9 → 0.0.25-af-2

package/es/components/LdTree/index.js

@@ -1,13 +1,12 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-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", "boxRef", "doubleClick", "onNodeDoubleClick", "width", "height"],
   _excluded2 = ["onClick"];
 import React, { useState, useRef, useImperativeHandle, forwardRef, useLayoutEffect } from 'react';
-import { isFunction, isNumber, transform, includes, remove, cloneDeep, isNil } from 'lodash';
+import { isFunction, isNumber, transform, includes, remove, cloneDeep, keys } from 'lodash';
 import { useRequest, useMemoizedFn, useCreation } from 'ahooks';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
@@ -18,7 +17,6 @@ import { TreeBox } from '@luck-design-biz/base';
 import ldBuilder from "../../helper/ldBuilder";
 import { behaviorCall } from "../../utils";
 import styles from "./index.less";
-var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
 var LdTree = function LdTree(_ref) {
   var columns = _ref.columns,
     resources = _ref.resources,
@@ -48,24 +46,13 @@ var LdTree = function LdTree(_ref) {
     service = _ref.service,
     dataToTreeFormat = _ref.dataToTreeFormat,
     boxRef = _ref.boxRef,
-    doubleClickExpand = _ref.doubleClickExpand,
+    doubleClick = _ref.doubleClick,
     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 = _objectWithoutProperties(_ref, _excluded);
   if (!includes(isTree, dataSetKey)) return formatMessage({
-    id: 'luckda.ldTree.notTrees',
+    id: 'luckda.ldTree.notTres',
     label: '此数据集非树形数据集，请选择树形数据集'
   });
   var _useState = useState(null),
@@ -77,16 +64,11 @@ var LdTree = function LdTree(_ref) {
     defaultExpandedProps = _useState4[0],
     setDefaultExpandedProps = _useState4[1];
   var treeRef = useRef(null);
-  var onceRef = useRef(true);
-  var defaultParams = useCreation(function () {
-    var _params = [_objectSpread({
-      moduleCode: moduleCode,
-      datasetCode: dataSetKey,
-      behaviorKey: 'readTree'
-    }, _defaultParmas)];
-    if (asyncLoad) _params[0][parentKey] = 0;
-    return _params;
-  }, []);
+  var defaultParams = [_objectSpread({
+    moduleCode: moduleCode,
+    datasetCode: dataSetKey,
+    behaviorKey: 'readTree'
+  }, _defaultParmas)];
   var _useRequest = useRequest(service || behaviorCall, {
       // 获取树数据源
       defaultParams: defaultParams,
@@ -115,31 +97,25 @@ var LdTree = function LdTree(_ref) {
           }
           var treeData = dataToTreeFormat ? dataToTreeFormat(data) : 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 = useMemoizedFn(function () {
-    var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    run(_objectSpread(_objectSpread(_objectSpread({}, params[0]), _params), defaultParams[0]));
-  });
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, treeRef.current), {}, {
-      onLdQuery: onLdQuery
+      onLdQuery: function onLdQuery() {
+        var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+        run(_objectSpread(_objectSpread(_objectSpread({}, params[0]), _params), defaultParams[0]));
+      }
     });
   });
   useLayoutEffect(function () {
-    onMount && onMount(_objectSpread(_objectSpread({}, params[0]), defaultParams[0]));
-    return function () {
-      onUnmount && onUnmount();
-    };
-  }, []);
-  useLayoutEffect(function () {
-    onDataSetChange && onDataSetChange(onLdQuery);
+    run(_objectSpread(_objectSpread(_objectSpread({}, params[0]), defaultParams[0]), {}, {
+      datasetCode: dataSetKey
+    }));
   }, [dataSetKey]);
   var handleMenuClick = function handleMenuClick(menu, data) {
     var onClick = menu.onClick,
@@ -153,8 +129,7 @@ var LdTree = function LdTree(_ref) {
           return handleMenuClick(menu, data);
         },
         className: styles.rightMenu,
-        key: menu.key,
-        style: menu.style
+        key: menu.key
       }, menu.name || '');
     });
   };
@@ -179,97 +154,53 @@ var LdTree = function LdTree(_ref) {
     switcher.click();
   });
   var handleDoubleClick = useMemoizedFn(function (e, rowData) {
-    if (doubleClickExpand) handleNodeDoubleClick(e);
-    if (onNodeDoubleClick) onNodeDoubleClick(e, rowData);
+    if (onNodeDoubleClick) onNodeDoubleClick(e, rowData, function () {
+      return handleNodeDoubleClick(e);
+    });else handleNodeDoubleClick(e);
   });
   var renderTitleNode = function renderTitleNode(data, unSelectable) {
     var nodeTitle = isFunction(treeNodeTitle) ? treeNodeTitle(data) : data[treeNodeTitle];
-    if (onTreeNodeRender) nodeTitle = onTreeNodeRender(nodeTitle, data);
     return /*#__PURE__*/React.createElement("div", {
       className: styles.nodeTitle,
       key: data[rowKey],
       onDoubleClick: function onDoubleClick(e) {
-        return handleDoubleClick(e, data);
+        return doubleClick && handleDoubleClick(e, data);
       }
     }, /*#__PURE__*/React.createElement("div", {
       title: nodeTitle,
       className: classNames(_defineProperty({}, styles.nodeTitleDisabled, unSelectable))
-    }, nodeTitle), !readOnly && renderRight(data));
+    }, nodeTitle, "11"), !readOnly && renderRight(data));
   };
   var renderTreeNodes = useMemoizedFn(function (data) {
     return data.map(function (item) {
       // 判断是否可选择
       var unSelectable = isFunction(unselectableNodes) ? unselectableNodes(item) : unselectableNodes.includes(item[rowKey]);
-      var props = {
+      if (item.children) {
+        return /*#__PURE__*/React.createElement(LuckTree.TreeNode, {
+          isLeaf: false,
+          title: renderTitleNode(item, unSelectable),
+          key: item[rowKey],
+          dataRef: item,
+          selectable: !unSelectable
+        }, renderTreeNodes(item.children));
+      }
+      return /*#__PURE__*/React.createElement(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 && !isNil(treeNodeIcon(item))) props.icon = treeNodeIcon(item);
-      if (!item.isleaf) {
-        return /*#__PURE__*/React.createElement(LuckTree.TreeNode, _extends({
-          isLeaf: false
-        }, props), renderTreeNodes(item.children || []));
-      }
-      return /*#__PURE__*/React.createElement(LuckTree.TreeNode, _extends({
-        isLeaf: true
-      }, props));
+        selectable: !unSelectable
+      });
     });
   });
   var handleDrop = useMemoizedFn(function (info) {
     var dragInfo = 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 = useCreation(function () {
-    return !(readOnly || !rootAdd || rootAdd.resource && !includes(resources, rootAdd.resource) || onlyRoot && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0) ? function () {
+    return !(readOnly || !rootAdd || rootAdd.resource && !includes(resources, rootAdd.resource)) ? function () {
       return handleMenuClick(rootAdd);
     } : null;
   }, [readOnly, rootAdd, resources]);
-  var onLoadData = useMemoizedFn(function (treeNode) {
-    return new Promise(function (resolve) {
-      console.log('treeNode.props.children', treeNode.props.children);
-      if (treeNode.props.isLeaf) {
-        resolve();
-        return;
-      }
-      (service || behaviorCall)(_objectSpread(_objectSpread({}, params[0]), {}, _defineProperty({}, 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(_toConsumableArray(dataSource));
-          resolve();
-        }
-      });
-    });
-  });
-  var asyncLoadData = useCreation(function () {
-    return asyncLoad ? {
-      loadData: onLoadData
-    } : {};
-  }, []);
   return /*#__PURE__*/React.createElement(TreeBox, {
     suppressTitle: !title,
     title: title,
@@ -287,7 +218,7 @@ var LdTree = function LdTree(_ref) {
     className: classNames(styles.tree, _defineProperty({}, className, !!treeClassName)),
     draggable: !readOnly && draggable,
     onDrop: handleDrop
-  }, asyncLoadData, defaultExpandedProps, props, {
+  }, defaultExpandedProps, props, {
     ref: treeRef
   }), renderTreeNodes(dataSource)));
 };
@@ -319,9 +250,7 @@ Index.propTypes = {
   // 行为
   suppressInit: PropTypes.bool,
   // 抑制初始化
-  afterInit: PropTypes.func,
-  // 初始化后
-  parentKey: PropTypes.string
+  afterInit: PropTypes.func // 初始化后
 };
 Index.defaultProps = {
   readOnly: false,
@@ -336,8 +265,7 @@ Index.defaultProps = {
     return [];
   },
   suppressInit: false,
-  defaultParmas: {},
-  parentKey: 'iparentid'
+  defaultParmas: {}
 };
 export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(Index, _extends({

package/es/components/LdTree/index.less

@@ -1,41 +1,41 @@
-.tree {
-  .nodeTitle {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    user-select: none;
-
-    div {
-      flex: 1;
-      overflow-x: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-
-    div.nodeTitleDisabled {
-      color: var(--luck-text-color-disabled);
-    }
-
-    div.nodeTitleDisabled:hover {
-      cursor: not-allowed;
-    }
-  }
-
-  :global {
-    .ant-tree-title {
-      width: 100%;
-    }
-  }
-}
-
-.classTreeOperates {
-  :global(.ant-popover-inner-content) {
-    padding: 0;
-  }
-
-  .rightMenu {
-    display: block;
-    padding: 4px 8px;
-    color: var(--luck-text-color-);
-  }
+.tree {
+  .nodeTitle {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    user-select: none;
+
+    div {
+      flex: 1;
+      overflow-x: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    div.nodeTitleDisabled {
+      color: var(--luck-text-color-disabled);
+    }
+
+    div.nodeTitleDisabled:hover {
+      cursor: not-allowed;
+    }
+  }
+
+  :global {
+    .ant-tree-title {
+      width: 100%;
+    }
+  }
+}
+
+.classTreeOperates {
+  :global(.ant-popover-inner-content) {
+    padding: 0;
+  }
+
+  .rightMenu {
+    display: block;
+    padding: 4px 8px;
+    color: var(--luck-text-color-);
+  }
 }