@luck-design-biz/luckda 0.0.25-2 → 0.0.25-21

package/lib/components/LdFormList/index.js

@@ -30,8 +30,8 @@ var _Builder = require("../Builder");
 var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
-var _services = require("../../services");
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
+var _useTodo3 = _interopRequireDefault(require("../../lowcode/engine/tools/useTodo"));
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "apiRef", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
@@ -43,6 +43,7 @@ var LdFormList = function LdFormList(_ref) {
     formMode = _ref.formMode,
     formOperates = _ref.formOperates,
     loading = _ref.loading,
+    apiRef = _ref.apiRef,
     wrapperRef = _ref.wrapperRef,
     readOnly = _ref.readOnly,
     mainFormLdId = _ref.mainFormLdId,
@@ -53,6 +54,7 @@ var LdFormList = function LdFormList(_ref) {
     showSaveBtn = _ref.showSaveBtn,
     saveBtnTitle = _ref.saveBtnTitle,
     affixLayout = _ref.affixLayout,
+    getContainer = _ref.getContainer,
     _ref$onValueChange = _ref.onValueChange,
     onValueChange = _ref$onValueChange === void 0 ? function () {} : _ref$onValueChange,
     afterSubmit = _ref.afterSubmit,
@@ -62,8 +64,11 @@ var LdFormList = function LdFormList(_ref) {
     } : _ref$renderFormExtra,
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
+    setVerifyRules = _ref.setVerifyRules,
+    afterSubmitLoading = _ref.afterSubmitLoading,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
+  var currentValueRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     submitLoading = _useState2[0],
@@ -76,6 +81,10 @@ var LdFormList = function LdFormList(_ref) {
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     bizData = _useState6[0],
     setBizData = _useState6[1];
+  var _useTodo = (0, _useTodo3.default)(),
+    _useTodo2 = (0, _slicedToArray2.default)(_useTodo, 2),
+    _ = _useTodo2[0],
+    callBehavior = _useTodo2[1];
   var luckTheme = (0, _ahooks.useCreation)(function () {
     return document.body.getAttribute('luck-theme');
   }, []);
@@ -87,8 +96,11 @@ var LdFormList = function LdFormList(_ref) {
     resources = _ref3.resources,
     rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
   var formListRef = (0, _react.useRef)(null);
-  (0, _react.useImperativeHandle)(wrapperRef, function () {
+  (0, _react.useImperativeHandle)(apiRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
+      getCValue: function getCValue() {
+        return currentValueRef.current || props.formData;
+      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         if (props.formMode !== 'add') {
@@ -101,7 +113,8 @@ var LdFormList = function LdFormList(_ref) {
           });
           formListRef.current.doQuery();
         }
-      }
+      },
+      ticketData: props.ticketData
     });
   });
   var handleValueChange = (0, _ahooks.useMemoizedFn)(function (change) {
@@ -112,6 +125,7 @@ var LdFormList = function LdFormList(_ref) {
       var getValue = ((_formRefs$key = formRefs[key]) !== null && _formRefs$key !== void 0 && (_formRefs$key = _formRefs$key.formRef) !== null && _formRefs$key !== void 0 && _formRefs$key.current ? formRefs[key].getData : null) || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
       return (0, _defineProperty2.default)({}, key, getValue && getValue());
     });
+    currentValueRef.current = data;
     onValueChange(change, data);
   });
   var renderExtra = (0, _ahooks.useMemoizedFn)(function (formId, extraConfig, type) {
@@ -131,7 +145,7 @@ var LdFormList = function LdFormList(_ref) {
     }, bpmButtonProps)));
   };
   (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
+    var _props$formData$mainF, _params, response, _yield$callBehavior, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -141,13 +155,14 @@ var LdFormList = function LdFormList(_ref) {
           }
           _params = {
             indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
+            mainDataSetKey: mainDataSetKey
+          }; // 请求是否有工作流服务
+          _context.next = 4;
+          return callBehavior({
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
-            mainDataSetKey: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
-          }; // 请求是否有工作流服务
-          _context.next = 4;
-          return (0, _services.readBehaviorCall)(_params);
+          }, _params);
         case 4:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
@@ -155,13 +170,15 @@ var LdFormList = function LdFormList(_ref) {
             break;
           }
           _context.next = 8;
-          return (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _params), {}, {
+          return callBehavior({
+            moduleCode: rest.moduleCode,
+            datasetCode: mainDataSetKey,
             behaviorKey: 'readBpm'
-          }));
+          }, _params);
         case 8:
-          _yield$readBehaviorCa = _context.sent;
-          code = _yield$readBehaviorCa.code;
-          data = _yield$readBehaviorCa.data;
+          _yield$callBehavior = _context.sent;
+          code = _yield$callBehavior.code;
+          data = _yield$callBehavior.data;
           if (code == 1 && data) {
             bpmInfoObj = data.bpmInfo;
             tempObj = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.formData[mainFormLdId]), {}, {
@@ -201,6 +218,7 @@ var LdFormList = function LdFormList(_ref) {
       formUid: formUid,
       mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
+      afterSubmitLoading && afterSubmitLoading(res);
       setSubmitLoading(false);
       if (success) {
         var mainFormData = res.detail[res.list[0]];
@@ -241,7 +259,7 @@ var LdFormList = function LdFormList(_ref) {
   var mainDataSetKey = (_formList$find = formList.find(function (i) {
     return i.id === mainFormLdId;
   })) === null || _formList$find === void 0 ? void 0 : _formList$find.dataSetKey;
-  return formList.length > 0 ? /*#__PURE__*/_react.default.createElement(_FormList.FormList, (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_FormList.FormList, (0, _extends2.default)({
     editFlow: true,
     formState: formState,
     formMode: formMode,
@@ -251,6 +269,7 @@ var LdFormList = function LdFormList(_ref) {
     })
   }, props, {
     modelName: namespace,
+    wrapperRef: wrapperRef,
     ref: formListRef,
     onAdd: function onAdd(values, other) {
       return handleBatchSubmit(values, 'add', other);
@@ -263,12 +282,15 @@ var LdFormList = function LdFormList(_ref) {
     renderLeft: renderAffixLeft,
     renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
     title: saveBtnTitle,
-    layout: affixLayout || defaultLayout
+    layout: affixLayout || defaultLayout,
+    getContainer: getContainer
   }), (0, _lodash.sortBy)([].concat((0, _toConsumableArray2.default)(formList), (0, _toConsumableArray2.default)(formExtra)), function (o) {
     var _o$props;
     return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
   }).map(function (formProps) {
-    if (formProps.dataSetKey) {
+    var _formProps$type = formProps.type,
+      type = _formProps$type === void 0 ? 'auto' : _formProps$type;
+    if ((0, _lodash.includes)(['auto', 'writer', 'grid'], type)) {
       var _ref8 = formProps || {},
         ldId = _ref8.id,
         _ref8$header = _ref8.header,
@@ -283,17 +305,15 @@ var LdFormList = function LdFormList(_ref) {
         } : _ref8$renderTopLeft,
         serial = _ref8.serial,
         _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
-      var _props$type = _props.type,
-        type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
       var _readOnly = selfReadOnly || serial && !(0, _lodash.includes)(resources, serial);
       if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
         title: title || ldId,
-        extra: type === 'auto' && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
+        extra: type === 'auto' && formProps.dataSetKey && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
         id: ldId,
         key: ldId,
         mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
-      }, renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+      }, formProps.dataSetKey && renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -302,18 +322,19 @@ var LdFormList = function LdFormList(_ref) {
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
           return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
-        }
+        },
+        setVerifyRules: setVerifyRules
       })));
       return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
         key: ldId
       }, header === 'divider' && /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
         title: title || ldId,
         id: ldId
-      }), type === 'auto' && /*#__PURE__*/_react.default.createElement("div", {
+      }), type === 'auto' && formProps.dataSetKey && /*#__PURE__*/_react.default.createElement("div", {
         style: {
           textAlign: 'right'
         }
-      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), formProps.dataSetKey && renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -322,7 +343,8 @@ var LdFormList = function LdFormList(_ref) {
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
           return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'), _renderTopLeft()];
-        }
+        },
+        setVerifyRules: setVerifyRules
       })));
     }
     return _utils.ChildrenUtil.deepMap(formProps, function (child) {
@@ -331,7 +353,7 @@ var LdFormList = function LdFormList(_ref) {
         mode: child.props.mode || 'tab'
       }) : child.props);
     })[0];
-  })) : null;
+  }));
 };
 
 // 构建带有model的组件
@@ -416,6 +438,6 @@ Index.defaultProps = {
 };
 var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({
-    wrapperRef: ref
+    apiRef: ref
   }, props));
 });

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", "unclosableSet", "onQuery", "doQuery", "pagination", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable"],
+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"],
   _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 var LdGrid = function LdGrid(_ref) {
   var columns = _ref.columns,
@@ -34,6 +34,7 @@ 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,
@@ -74,6 +75,16 @@ var LdGrid = function LdGrid(_ref) {
   }, [params, filters]);
   (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,
+          filter: {
+            filters: filters,
+            params: params
+          }
+        };
+      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         doQuery({
@@ -90,10 +101,10 @@ var LdGrid = function LdGrid(_ref) {
     });
   }, [batchOperations]);
 
-  /**
-   * 优先级
-   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
-   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
+  /**
+   * 优先级
+   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
+   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
    */
   var _columns = (0, _ahooks.useCreation)(function () {
     if (columnsReset) {
@@ -150,7 +161,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,
@@ -181,13 +192,14 @@ 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 _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)({
+    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, _props$pagination;
+      (_getDvaApp4 = (0, _umi.getDvaApp)()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
       }, overModel), {}, {
+        pageSize: overModel.pageSize || ((_props$pagination = props.pagination) === null || _props$pagination === void 0 ? void 0 : _props$pagination.pageSize) || props.pageSize,
         isFlow: isTreeGrid || !!props.isFlow,
         moduleCode: moduleCode,
         dataSetKey: props.dataSetKey,

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"];
+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 buildLdGridForm = function buildLdGridForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -59,10 +59,12 @@ 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), {}, {
@@ -71,9 +73,14 @@ 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.transform)(gridColumns, function (result, col) {
-      if (col.isShowInForm) {
+    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 _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
           return column.field === col.aliaName;
@@ -83,14 +90,21 @@ 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']));
-        result.push((0, _utils.getFormColumn)(type, col, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
+        var newCol = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
+          setVerifyRules: setVerifyRules,
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || 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), {}, {
           formItemRewrite: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
             moduleCode: moduleCode,
             formRef: formRef,
-            formMode: formMode
+            formMode: formMode,
+            setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field']))
           })
         })));
       }
+      return result;
     }, []);
     defaultValues.current = _defaultValues;
     setFieldProps && setFieldProps((0, _defineProperty2.default)({}, ldId, _nodes.map(function (col) {
@@ -104,7 +118,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     })));
     return columnsReset ? columnsReset(_nodes) : _nodes;
   }();
-  var defaultDataSource = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
+  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 formConfig = {
     formId: ldId,
     columns: _columns,
@@ -134,7 +150,11 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         var _submitData = data.map(function (item) {
           return behaviorKey === 'add' ? (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.dataFormat)(gridColumns, item)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, null)) : (0, _utils.dataFormat)(gridColumns, item);
         });
-        if (_onOperate !== null && _onOperate !== void 0 && _onOperate.post) return _onOperate.post(_submitData); // 以预设为主
+        if (_onOperate !== null && _onOperate !== void 0 && _onOperate.post) return _onOperate.post({
+          values: data,
+          submitData: _submitData,
+          behaviorKey: behaviorKey
+        }); // 以预设为主
         return (0, _defineProperty2.default)({}, dataSetKey, (0, _defineProperty2.default)({}, "".concat(behaviorKey, "List"), _submitData));
       }
     });
@@ -144,7 +164,10 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     orderByAdd: "asc",
     rowSelection: true,
     type: type,
-    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno'
+    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno',
+    wrapperProps: {
+      id: ldId
+    }
   }, props, {
     onQuery: (0, _objectSpread4.default)((0, _objectSpread4.default)({
       api: _utils.behaviorCall,
@@ -161,7 +184,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     }, onQuery), {}, {
       format: function format(data) {
         var formItemData = data.map(function (item) {
-          return (0, _utils.formItemDataFormat)(gridColumns, 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);
         });
         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/LdTree/index.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -23,7 +24,7 @@ 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"],
+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"],
   _excluded2 = ["onClick"];
 var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
 var LdTree = function LdTree(_ref) {
@@ -69,6 +70,7 @@ var LdTree = function LdTree(_ref) {
     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',
@@ -83,6 +85,7 @@ 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,
@@ -120,7 +123,8 @@ 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);
-          afterInit && afterInit(treeData);
+          onceRef.current && afterInit && afterInit(treeData, data);
+          onceRef.current = false;
         }
       }
     }),
@@ -131,9 +135,32 @@ var LdTree = function LdTree(_ref) {
     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]));
   });
+  var handleUpdateTree = function handleUpdateTree(type, nodes) {
+    var data = [];
+    var flattenData = (0, _utils.flattenTree)(dataSource);
+    switch (type) {
+      case 'delete':
+        data = (0, _lodash.differenceBy)(flattenData, nodes, window.appConfig.constraintKeys.PRIMARY);
+        break;
+      case 'add':
+        data = [].concat((0, _toConsumableArray2.default)(flattenData), (0, _toConsumableArray2.default)(nodes));
+        break;
+      default:
+        data = flattenData.map(function (i) {
+          var findNode = nodes.find(function (n) {
+            return n[PRIMARY] === i[PRIMARY];
+          });
+          if (findNode) return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, i), findNode);
+          return i;
+        });
+    }
+    var treeData = dataToTreeFormat ? dataToTreeFormat(data) : (0, _utils.dataToTree)(data, null, window.appConfig.constraintKeys.PRIMARY, window.appConfig.constraintKeys.PARENT);
+    setDataSource(treeData);
+  };
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, treeRef.current), {}, {
-      onLdQuery: onLdQuery
+      onLdQuery: onLdQuery,
+      updateTree: handleUpdateTree
     });
   });
   (0, _react.useLayoutEffect)(function () {
@@ -226,33 +253,46 @@ var LdTree = function LdTree(_ref) {
   });
   var handleDrop = (0, _ahooks.useMemoizedFn)(function (info) {
     var dragInfo = (0, _utils.dragTreeData)(info, dataSource);
-    onDrop && onDrop(info, dragInfo);
+    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();
+        }
+      });
+    }
   });
   var onAdd = (0, _ahooks.useCreation)(function () {
-    return !(readOnly || !rootAdd || rootAdd.resource && !(0, _lodash.includes)(resources, rootAdd.resource)) ? 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 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) {
-        console.log(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();
+        }
       });
-      // setTimeout(() => {
-      //   treeNode.props.dataRef.children = [
-      //     { title: 'Child Node', key: `${treeNode.props.eventKey}-0` },
-      //     { title: 'Child Node', key: `${treeNode.props.eventKey}-1` },
-      //   ];
-      //   this.setState({
-      //     treeData: [...this.state.treeData],
-      //   });
-      //   resolve();
-      // }, 1000);
     });
   });
   var asyncLoadData = (0, _ahooks.useCreation)(function () {