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

package/lib/components/LdGrid/index.js

@@ -20,7 +20,7 @@ var _List = require("@luck-design-biz/base/List");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils = require("../../utils");
 var _model = _interopRequireDefault(require("./model"));
-var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "_loading", "loading", "unclosableSet", "onQuery", "doQuery", "pagination", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable", "autoRowClick"],
+var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pagination", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable"],
   _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 var LdGrid = function LdGrid(_ref) {
   var columns = _ref.columns,
@@ -34,7 +34,6 @@ var LdGrid = function LdGrid(_ref) {
     detail = _ref.detail,
     params = _ref.params,
     filters = _ref.filters,
-    _loading = _ref._loading,
     loading = _ref.loading,
     unclosableSet = _ref.unclosableSet,
     onQuery = _ref.onQuery,
@@ -53,8 +52,6 @@ var LdGrid = function LdGrid(_ref) {
     isFlow = _ref.isFlow,
     isTreeGrid = _ref.isTreeGrid,
     writable = _ref.writable,
-    _ref$autoRowClick = _ref.autoRowClick,
-    autoRowClick = _ref$autoRowClick === void 0 ? false : _ref$autoRowClick,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var gridRef = (0, _react.useRef)(null);
   var treeConfig = (0, _ahooks.useCreation)(function () {
@@ -75,19 +72,8 @@ var LdGrid = function LdGrid(_ref) {
   (0, _react.useEffect)(function () {
     readFilter && readFilter(params, filters);
   }, [params, filters]);
-  (0, _react.useEffect)(function () {
-    if (autoRowClick) {
-      if (list[0]) props.onRowClick && props.onRowClick(detail[list[0]], 0);else props.onRowClick && props.onRowClick(null);
-    }
-  }, [list[0]]);
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, gridRef.current), {}, {
-      getProps: function getProps() {
-        var _getDvaApp;
-        return {
-          apiUrl: (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 || (_getDvaApp = _getDvaApp._store.getState()[namespace]) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.apiUrl
-        };
-      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         doQuery({
@@ -104,10 +90,10 @@ var LdGrid = function LdGrid(_ref) {
     });
   }, [batchOperations]);
 
-  /**
-   * 优先级
-   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
-   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
+  /**
+   * 优先级
+   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
+   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
    */
   var _columns = (0, _ahooks.useCreation)(function () {
     if (columnsReset) {
@@ -119,7 +105,7 @@ var LdGrid = function LdGrid(_ref) {
     var _columnsRewrite = (0, _lodash.isFunction)(columnsRewrite) ? columnsRewrite(columns) : columnsRewrite;
     var defaultColumns = (0, _lodash.keyBy)(columns, 'aliaName');
     var customColumns = (0, _lodash.keyBy)(_columnsRewrite, 'field');
-    var mergeFields = (0, _lodash.union)((0, _lodash.keys)(customColumns), (0, _lodash.keys)(defaultColumns));
+    var mergeFields = (0, _lodash.union)((0, _lodash.keys)(defaultColumns), (0, _lodash.keys)(customColumns));
     return (0, _lodash.transform)(mergeFields, function (result, field) {
       var _customColumns$field;
       if ((_customColumns$field = customColumns[field]) !== null && _customColumns$field !== void 0 && _customColumns$field.hide) {
@@ -164,7 +150,7 @@ var LdGrid = function LdGrid(_ref) {
     ,
     actionsColumn: _actionsColumn,
     batchOperations: _batchOperations,
-    loading: _loading || loading,
+    loading: loading,
     pagination: isFlow ? false : (0, _objectSpread2.default)({
       total: total,
       current: current,
@@ -195,16 +181,16 @@ var LdIndex = function LdIndex(_ref2) {
     props = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
   var isTreeGrid = (0, _lodash.isNil)(_isTreeGrid) ? (0, _lodash.includes)(props.isTree, props.dataSetKey) : _isTreeGrid;
   var Component = (0, _ahooks.useCreation)(function () {
-    var _getDvaApp2, _getDvaApp3;
-    (_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 || _getDvaApp2.unmodel(namespace);
-    if (!((_getDvaApp3 = (0, _umi.getDvaApp)()) !== null && _getDvaApp3 !== void 0 && _getDvaApp3._store.getState()[namespace])) {
-      var _getDvaApp4;
-      (_getDvaApp4 = (0, _umi.getDvaApp)()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
+    var _getDvaApp, _getDvaApp2;
+    (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 || _getDvaApp.unmodel(namespace);
+    if (!((_getDvaApp2 = (0, _umi.getDvaApp)()) !== null && _getDvaApp2 !== void 0 && _getDvaApp2._store.getState()[namespace])) {
+      var _getDvaApp3;
+      (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 || _getDvaApp3.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        isFlow: isTreeGrid || !!props.isFlow
       }, overModel), {}, {
-        isFlow: isTreeGrid || !!props.isFlow,
-        moduleCode: moduleCode,
         dataSetKey: props.dataSetKey,
+        moduleCode: moduleCode,
+        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid',
         afterQuery: afterQuery
       })));
     }
@@ -212,7 +198,7 @@ var LdIndex = function LdIndex(_ref2) {
       suppressInit: suppressInit,
       afterInit: props.afterInit
     });
-  }, [namespace, props.dataSetKey]);
+  }, [namespace]);
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
     isTreeGrid: isTreeGrid,
     namespace: namespace

package/lib/components/LdGridForm/index.js

@@ -19,7 +19,7 @@ var _utils = require("../../utils");
 var _form = require("../../helper/form");
 var _Builder = require("../Builder");
 var _index = _interopRequireDefault(require("./index.less"));
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode", "fields", "setVerifyRules"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
 var buildLdGridForm = function buildLdGridForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -33,7 +33,6 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     dataSetKey = _ref.dataSetKey,
     _ref$columnsRewrite = _ref.columnsRewrite,
     columnsRewrite = _ref$columnsRewrite === void 0 ? [] : _ref$columnsRewrite,
-    columnsReset = _ref.columnsReset,
     _ref$onQuery = _ref.onQuery,
     onQuery = _ref$onQuery === void 0 ? {} : _ref$onQuery,
     _ref$onAdd = _ref.onAdd,
@@ -59,12 +58,10 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     className = _ref.className,
     formRef = _ref.formRef,
     formMode = _ref.formMode,
-    fields = _ref.fields,
-    setVerifyRules = _ref.setVerifyRules,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = /*#__PURE__*/(0, _react.createRef)({});
+  var defaultValues = /*#__PURE__*/(0, _react.createRef)();
   var isMain = ldId === mainFormLdId;
   var gridColumns = columns.map(function (col) {
     if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
@@ -73,14 +70,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     return col;
   });
   var _columns = function () {
-    var fieldsObj = (0, _lodash.keyBy)(fields, 'field');
-    var columnsObj = (0, _lodash.keyBy)(gridColumns, 'field');
-    var keys = (0, _lodash.isEmpty)(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
     var _defaultValues = {};
-    var _nodes = (0, _lodash.reduce)(keys, function (result, key) {
-      var setting = fieldsObj[key];
-      var col = columnsObj[key];
-      if (col !== null && col !== void 0 && col.isShowInForm) {
+    var _nodes = (0, _lodash.transform)(gridColumns, function (result, col) {
+      if (col.isShowInForm) {
         var _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
           return column.field === col.aliaName;
@@ -90,24 +82,17 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
           mode: 'grid'
         });
         _defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
-        var newCol = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
-          setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
-        });
-        var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip'];
-        result.push((0, _utils.getFormColumn)(type, newCol, (0, _objectSpread4.default)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _lodash.pick)(setting, defaultSet)), customColumn), {}, {
+        result.push((0, _utils.getFormColumn)(type, col, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
           formItemRewrite: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
             moduleCode: moduleCode,
             formRef: formRef,
-            formMode: formMode,
-            setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field']))
+            formMode: formMode
           })
         })));
       }
-      return result;
     }, []);
     defaultValues.current = _defaultValues;
-    setFieldProps && setFieldProps((0, _defineProperty2.default)({}, ldId, _nodes.map(function (col) {
+    setFieldProps((0, _defineProperty2.default)({}, ldId, _nodes.map(function (col) {
       var node = col.renderBasicFormItem();
       var renderBasicFormItem = node === null || node === void 0 ? void 0 : node.props;
       return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
@@ -116,11 +101,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         }, renderBasicFormItem)
       });
     })));
-    return columnsReset ? columnsReset(_nodes) : _nodes;
+    return _nodes;
   }();
-  var defaultDataSource = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.formItemDataFormat)(columns.map(function (c) {
-    return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
-  }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
+  var defaultDataSource = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
   var formConfig = {
     formId: ldId,
     columns: _columns,
@@ -160,10 +143,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     orderByAdd: "asc",
     rowSelection: true,
     type: type,
-    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno',
-    wrapperProps: {
-      id: ldId
-    }
+    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno'
   }, props, {
     onQuery: (0, _objectSpread4.default)((0, _objectSpread4.default)({
       api: _utils.behaviorCall,
@@ -180,9 +160,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     }, onQuery), {}, {
       format: function format(data) {
         var formItemData = data.map(function (item) {
-          return (0, _utils.formItemDataFormat)(gridColumns.map(function (c) {
-            return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
-          }), item);
+          return (0, _utils.formItemDataFormat)(gridColumns, item);
         });
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData); // 以预设为主
         return formItemData;

package/lib/components/LdGridForm/index.less

@@ -1,7 +1,7 @@
-.ldGridForm {
-  :global {
-    .ag-layout-auto-height {
-      height: 100% !important;
-    }
-  }
-}
+.ldGridForm {
+  :global {
+    .ag-layout-auto-height {
+      height: 100% !important;
+    }
+  }
+}

package/lib/components/LdRuntimeCom/index.js

@@ -1,31 +1,23 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _construct2 = _interopRequireDefault(require("@babel/runtime/helpers/construct"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var Babel = _interopRequireWildcard(require("@babel/standalone"));
 var LuckAntd = _interopRequireWildcard(require("luck-design/antd"));
 var LuckDesign = _interopRequireWildcard(require("luck-design"));
-var _lodash = _interopRequireWildcard(require("lodash"));
-var Lodash = _lodash;
-var ahooks = _interopRequireWildcard(require("ahooks"));
-var _excluded = ["children"];
-/**
- * 实时代码渲染组件
- * todo：沙箱上下文的集成
- * todo：Loading效果的优化
+/**
+ * 实时代码渲染组件
+ * todo：沙箱上下文的集成
+ * todo：Loading效果的优化
  */
 var LdRuntimeCom = function LdRuntimeCom(_ref) {
-  var children = _ref.children,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var children = _ref.children;
   var _useState = (0, _react.useState)(null),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     Component = _useState2[0],
@@ -38,25 +30,20 @@ var LdRuntimeCom = function LdRuntimeCom(_ref) {
         presets: ['react']
       }).code;
 
+      // 输出编译后的代码用于排错
+      console.log('transformedCode', transformedCode);
+
       // 自动
       var functionNameMatch = transformedCode.match(/function\s+([^\s(]+)/);
       if (functionNameMatch && functionNameMatch.length > 1) {
         var functionName = functionNameMatch[1];
-        var argsName = (0, _lodash.keys)(rest);
-        var _args = argsName.map(function (n) {
-          return rest[n];
-        });
-        var execute = (0, _construct2.default)(Function, ['React', 'LuckAntd', 'LuckDesign', 'libs'].concat((0, _toConsumableArray2.default)(argsName), ["".concat(transformedCode, "; return ").concat(functionName, ";")]));
+        var execute = new Function('React', 'LuckAntd', 'LuckDesign', "".concat(transformedCode, "; return ").concat(functionName, ";"));
         // 设置组件状态
-        var ReactComponent = execute.apply(void 0, [_react.default, LuckAntd, LuckDesign, {
-          Lodash: Lodash,
-          ahooks: ahooks
-        }].concat((0, _toConsumableArray2.default)(_args)));
+        var ReactComponent = execute(_react.default, LuckAntd, LuckDesign);
         setComponent( /*#__PURE__*/_react.default.createElement(ReactComponent, null));
       }
     }
   }, [code]);
-  if (code === '') return null;
-  return Component ? Component : 'JSX Component';
+  return Component ? Component : /*#__PURE__*/_react.default.createElement("div", null, "Loading...");
 };
 var _default = exports.default = LdRuntimeCom;

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", "boxRef", "doubleClick", "onNodeDoubleClick", "width", "height"],
   _excluded2 = ["onClick"];
-var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
 var LdTree = function LdTree(_ref) {
   var columns = _ref.columns,
     resources = _ref.resources,
@@ -56,24 +54,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 = (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 +72,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,31 +105,25 @@ 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);
+    run((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params[0]), defaultParams[0]), {}, {
+      datasetCode: dataSetKey
+    }));
   }, [dataSetKey]);
   var handleMenuClick = function handleMenuClick(menu, data) {
     var onClick = menu.onClick,
@@ -161,8 +137,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 || '');
     });
   };
@@ -187,97 +162,53 @@ var LdTree = function LdTree(_ref) {
     switcher.click();
   });
   var handleDoubleClick = (0, _ahooks.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 = (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);
+        return doubleClick && handleDoubleClick(e, data);
       }
     }, /*#__PURE__*/_react.default.createElement("div", {
       title: nodeTitle,
       className: (0, _classnames.default)((0, _defineProperty2.default)({}, _index.default.nodeTitleDisabled, unSelectable))
-    }, nodeTitle), !readOnly && renderRight(data));
+    }, nodeTitle, "11"), !readOnly && renderRight(data));
   };
   var renderTreeNodes = (0, _ahooks.useMemoizedFn)(function (data) {
     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,
@@ -295,7 +226,7 @@ var LdTree = function LdTree(_ref) {
     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 +258,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 +273,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

@@ -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-);
+  }
 }