@luck-design-biz/luckda 0.0.17 → 0.0.18-2

package/es/components/LdFormList/index.js

@@ -8,10 +8,12 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
   _excluded2 = ["dataSets", "doAction", "resources"],
-  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
-  _excluded4 = ["ldId", "initData", "overModel"];
+  _excluded3 = ["formMode"],
+  _excluded4 = ["formMode"],
+  _excluded5 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
+  _excluded6 = ["ldId", "initData", "overModel"];
 import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
-import { connect, getDvaApp, useRouteMatch } from 'umi';
+import { connect, getDvaApp, useRouteMatch, useModel } from 'umi';
 import PropTypes from 'prop-types';
 import { useCreation, useMemoizedFn, useAsyncEffect } from 'ahooks';
 import { BasicDivider } from 'luck-design';
@@ -27,6 +29,7 @@ import { onBatchSubmitAction } from '../../helper/action';
 import { isArray, sortBy, mapValues } from 'lodash';
 import { BpmButton } from '@luck-design-biz/base/bpm';
 import { readBehaviorCall } from '../../services';
+import { parse, stringify } from 'querystring';
 
 // 组件
 var LdFormList = function LdFormList(_ref) {
@@ -56,6 +59,15 @@ var LdFormList = function LdFormList(_ref) {
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     props = _objectWithoutProperties(_ref, _excluded);
+  var _useModel = useModel('@@qiankunStateFromMaster', function (qiankunStateFromMaster) {
+      return {
+        peek: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.peekFloatLayer,
+        refresh: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.refreshFloatLayer
+      };
+    }),
+    peek = _useModel.peek,
+    refresh = _useModel.refresh;
+  var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     submitLoading = _useState2[0],
@@ -118,16 +130,16 @@ var LdFormList = function LdFormList(_ref) {
     }, bpmButtonProps)));
   };
   useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _props$ticketData, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
+    var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!(formMode !== 'add')) {
+          if (!(formMode !== 'add' && props.formData[mainFormLdId])) {
             _context.next = 12;
             break;
           }
           _params = {
-            indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
+            indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
             mainDataSetKey: mainDataSetKey,
@@ -155,10 +167,10 @@ var LdFormList = function LdFormList(_ref) {
               bizKey: bpmInfoObj.bizKey,
               sname: bpmInfoObj.name,
               modelKey: bpmInfoObj.bpmKey,
-              idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2.indocno,
+              idocid: (_props$formData$mainF2 = props.formData[mainFormLdId]) === null || _props$formData$mainF2 === void 0 ? void 0 : _props$formData$mainF2[PRIMARY],
               moduleCode: rest.moduleCode,
               datasetCode: mainDataSetKey,
-              indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno
+              indocno: (_props$formData$mainF3 = props.formData[mainFormLdId]) === null || _props$formData$mainF3 === void 0 ? void 0 : _props$formData$mainF3[PRIMARY]
             });
             setBizData(tempObj);
             setIsCustomRenderAffixRight(true);
@@ -168,7 +180,7 @@ var LdFormList = function LdFormList(_ref) {
           return _context.stop();
       }
     }, _callee);
-  })), [props.formData]);
+  })), [props.formData, formMode]);
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
     var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
       formCode = _ref7.formCode,
@@ -189,15 +201,45 @@ var LdFormList = function LdFormList(_ref) {
       mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
       setSubmitLoading(false);
+      var mainFormData = res.detail[res.list[0]];
       if (success) {
         if (afterSubmit) {
           afterSubmit(success, mainKey, res);
+          // 刷新浮层，解决新增后，操作日志获取不到uid的问题
+          if (refresh && peek) {
+            var _peek = peek(),
+              href = _peek.href;
+            var _href$split = href.split('?'),
+              _href$split2 = _slicedToArray(_href$split, 2),
+              path = _href$split2[0],
+              argsStr = _href$split2[1];
+            var _parse = parse(argsStr),
+              _formMode = _parse.formMode,
+              _props2 = _objectWithoutProperties(_parse, _excluded3);
+            refresh({
+              href: "".concat(path, "?").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat(stringify(_objectSpread({}, _props2)))
+            });
+          }
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          var mainFormData = res.detail[res.list[0]];
           formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, mainFormData), function () {
-            return formListRef.current.setFormMode('info');
+            formListRef.current.setFormMode('info');
+            // 刷新浮层，解决新增后，操作日志获取不到uid的问题
+            if (refresh && peek) {
+              var _peek2 = peek(),
+                _href = _peek2.href;
+              var _href$split3 = _href.split('?'),
+                _href$split4 = _slicedToArray(_href$split3, 2),
+                _path = _href$split4[0],
+                _argsStr = _href$split4[1];
+              var _parse2 = parse(_argsStr),
+                _formMode2 = _parse2.formMode,
+                _props3 = _objectWithoutProperties(_parse2, _excluded4);
+              refresh({
+                href: "".concat(_path, "?formMode=info&").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat(stringify(_objectSpread({}, _props3)))
+              });
+            }
           });
         }
       }
@@ -264,7 +306,7 @@ var LdFormList = function LdFormList(_ref) {
         _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/React.createElement(React.Fragment, null);
         } : _ref8$renderTopLeft,
-        _props = _objectWithoutProperties(_ref8, _excluded3);
+        _props = _objectWithoutProperties(_ref8, _excluded5);
       var _props$type = _props.type,
         type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
@@ -341,7 +383,7 @@ var Index = function Index(_ref10) {
   var namespace = _ref10.ldId,
     initData = _ref10.initData,
     overModel = _ref10.overModel,
-    props = _objectWithoutProperties(_ref10, _excluded4);
+    props = _objectWithoutProperties(_ref10, _excluded6);
   var match = useRouteMatch();
   var Component = useCreation(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

package/es/components/LdGrid/index.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid"],
+var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable"],
   _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
@@ -42,6 +42,7 @@ var LdGrid = function LdGrid(_ref) {
     readFilter = _ref.readFilter,
     isFlow = _ref.isFlow,
     isTreeGrid = _ref.isTreeGrid,
+    writable = _ref.writable,
     props = _objectWithoutProperties(_ref, _excluded);
   var gridRef = useRef(null);
   var treeConfig = useCreation(function () {
@@ -99,7 +100,7 @@ var LdGrid = function LdGrid(_ref) {
         result.push(customColumns[field]);
       } else if (defaultColumns[field].isShowInGrid)
         // 数据集中存在的字段和自定义结合展示
-        result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}, isTreeGrid));
+        result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable));
     }, []);
   }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = useCreation(function () {

package/es/components/LdTree/index.js

@@ -90,7 +90,7 @@ var LdTree = function LdTree(_ref) {
               defaultExpandedKeys: defaultExpanded
             });
           }
-          var treeData = dataToTreeFormat ? dataToTreeFormat(data) : dataToTree(data, null, rowKey, window.appConfig.constraintKeys.PARENT);
+          var treeData = dataToTreeFormat ? dataToTreeFormat(data) : dataToTree(data, null, window.appConfig.constraintKeys.PRIMARY, window.appConfig.constraintKeys.PARENT);
           setDataSource(treeData);
           afterInit && afterInit(treeData);
         }

package/es/utils/grid.js

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["comName", "property"],
@@ -5,13 +6,14 @@ var _excluded = ["comName", "property"],
   _excluded3 = ["filter", "filterParams"];
 import React from "react";
 import { getDvaApp } from 'umi';
-import { merge, isNil, isArray, includes } from 'lodash';
+import { merge, isNil, isArray, includes, capitalize } from 'lodash';
 import { Switch, Tag } from 'antd';
 import moment from 'moment';
 import UploadGridCell from '../upload/GridCell';
 import { formatMessage } from '@luck-design-biz/base/utils';
 import api from '@/services/ApiConfig';
-import { defaultComName, translator, formatCustomProps } from '../helper/form';
+import { defaultComName, translator, formatCustomProps, splitStrToObj } from '../helper/form';
+import * as formItemUtils from '../helper/FromItems';
 
 // const { dispatch } = getDvaApp()?._store;
 
@@ -98,6 +100,7 @@ export var getGridColumn = function getGridColumn() {
     props = _objectWithoutProperties(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
+  var writable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var _props$isVirtual = props.isVirtual,
     isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual;
   var _translator = translator(props),
@@ -219,5 +222,63 @@ export var getGridColumn = function getGridColumn() {
         data.filter = 'text';
     }
   } else data.filter = false;
+  if (writable && props.isShowInForm && !props.isReadOnly) {
+    data.editable = props.isNotNull ? {
+      required: true
+    } : true;
+    if (_props.cellWriter) data.cellWriter = _props.cellWriter;else {
+      var formItemCom = capitalize(comName || defaultComName[property]) === 'Textarea' ? 'String' : capitalize(comName || defaultComName[property]);
+      var getFormItemUtils = formItemUtils["get".concat(formItemCom, "Item")];
+      var formItemProps = {};
+      switch (formItemCom) {
+        case 'date':
+          formItemProps = {
+            dataFormat: function dataFormat(value) {
+              var _ref2;
+              return _ref2 = {}, _defineProperty(_ref2, name, value ? moment(value).valueOf() : undefined), _defineProperty(_ref2, "".concat(name, "_virtual"), value ? moment(value).format('YYYY-MM-DD HH:mm:ss') : undefined), _ref2;
+            },
+            inputFormat: function inputFormat(value, record, params) {
+              return moment(record["".concat(name, "_virtual")], 'YYYY-MM-DD HH:mm:ss');
+            }
+          };
+          break;
+        case 'user':
+        case 'select':
+        case 'group':
+          if (translateProps.multiple) {
+            formItemProps = {
+              dataFormat: function dataFormat(value) {
+                var _ref3;
+                return _ref3 = {}, _defineProperty(_ref3, name, value.map(function (v) {
+                  return v.value || v.key;
+                }).join(',')), _defineProperty(_ref3, "".concat(name, "_virtual"), value.map(function (v) {
+                  return v.label;
+                }).join(',')), _ref3;
+              },
+              inputFormat: function inputFormat(value, record, params) {
+                return _defineProperty({}, name, splitStrToObj(value, record["".concat(name, "_virtual")]));
+              }
+            };
+          } else {
+            formItemProps = {
+              dataFormat: function dataFormat(value) {
+                var _ref5;
+                return _ref5 = {}, _defineProperty(_ref5, name, value ? value.value || value.key : undefined), _defineProperty(_ref5, "".concat(name, "_virtual"), value ? value.label : undefined), _ref5;
+              },
+              inputFormat: function inputFormat(value, record, params) {
+                return _defineProperty({}, name, !isNil(value) ? {
+                  key: value,
+                  value: value,
+                  label: record["".concat(name, "_virtual")]
+                } : undefined);
+              }
+            };
+          }
+          break;
+      }
+      ;
+      data.cellWriter = getFormItemUtils(_objectSpread(_objectSpread({}, _props), formItemProps));
+    }
+  }
   return data;
 };

package/lib/components/LdFormList/index.js

@@ -31,10 +31,13 @@ var _action = require("../../helper/action");
 var _lodash = require("lodash");
 var _bpm = require("@luck-design-biz/base/bpm");
 var _services = require("../../services");
+var _querystring = require("querystring");
 var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
   _excluded2 = ["dataSets", "doAction", "resources"],
-  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
-  _excluded4 = ["ldId", "initData", "overModel"];
+  _excluded3 = ["formMode"],
+  _excluded4 = ["formMode"],
+  _excluded5 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
+  _excluded6 = ["ldId", "initData", "overModel"];
 // 组件
 var LdFormList = function LdFormList(_ref) {
   var _formList$find;
@@ -63,6 +66,15 @@ var LdFormList = function LdFormList(_ref) {
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var _useModel = (0, _umi.useModel)('@@qiankunStateFromMaster', function (qiankunStateFromMaster) {
+      return {
+        peek: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.peekFloatLayer,
+        refresh: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.refreshFloatLayer
+      };
+    }),
+    peek = _useModel.peek,
+    refresh = _useModel.refresh;
+  var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     submitLoading = _useState2[0],
@@ -125,16 +137,16 @@ var LdFormList = function LdFormList(_ref) {
     }, bpmButtonProps)));
   };
   (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var _props$ticketData, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
+    var _props$formData$mainF, _params, response, _yield$readBehaviorCa, 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:
-          if (!(formMode !== 'add')) {
+          if (!(formMode !== 'add' && props.formData[mainFormLdId])) {
             _context.next = 12;
             break;
           }
           _params = {
-            indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
+            indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
             mainDataSetKey: mainDataSetKey,
@@ -162,10 +174,10 @@ var LdFormList = function LdFormList(_ref) {
               bizKey: bpmInfoObj.bizKey,
               sname: bpmInfoObj.name,
               modelKey: bpmInfoObj.bpmKey,
-              idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2.indocno,
+              idocid: (_props$formData$mainF2 = props.formData[mainFormLdId]) === null || _props$formData$mainF2 === void 0 ? void 0 : _props$formData$mainF2[PRIMARY],
               moduleCode: rest.moduleCode,
               datasetCode: mainDataSetKey,
-              indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno
+              indocno: (_props$formData$mainF3 = props.formData[mainFormLdId]) === null || _props$formData$mainF3 === void 0 ? void 0 : _props$formData$mainF3[PRIMARY]
             });
             setBizData(tempObj);
             setIsCustomRenderAffixRight(true);
@@ -175,7 +187,7 @@ var LdFormList = function LdFormList(_ref) {
           return _context.stop();
       }
     }, _callee);
-  })), [props.formData]);
+  })), [props.formData, formMode]);
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
     var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
       formCode = _ref7.formCode,
@@ -196,15 +208,45 @@ var LdFormList = function LdFormList(_ref) {
       mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
       setSubmitLoading(false);
+      var mainFormData = res.detail[res.list[0]];
       if (success) {
         if (afterSubmit) {
           afterSubmit(success, mainKey, res);
+          // 刷新浮层，解决新增后，操作日志获取不到uid的问题
+          if (refresh && peek) {
+            var _peek = peek(),
+              href = _peek.href;
+            var _href$split = href.split('?'),
+              _href$split2 = (0, _slicedToArray2.default)(_href$split, 2),
+              path = _href$split2[0],
+              argsStr = _href$split2[1];
+            var _parse = (0, _querystring.parse)(argsStr),
+              _formMode = _parse.formMode,
+              _props2 = (0, _objectWithoutProperties2.default)(_parse, _excluded3);
+            refresh({
+              href: "".concat(path, "?").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat((0, _querystring.stringify)((0, _objectSpread2.default)({}, _props2)))
+            });
+          }
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          var mainFormData = res.detail[res.list[0]];
           formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
-            return formListRef.current.setFormMode('info');
+            formListRef.current.setFormMode('info');
+            // 刷新浮层，解决新增后，操作日志获取不到uid的问题
+            if (refresh && peek) {
+              var _peek2 = peek(),
+                _href = _peek2.href;
+              var _href$split3 = _href.split('?'),
+                _href$split4 = (0, _slicedToArray2.default)(_href$split3, 2),
+                _path = _href$split4[0],
+                _argsStr = _href$split4[1];
+              var _parse2 = (0, _querystring.parse)(_argsStr),
+                _formMode2 = _parse2.formMode,
+                _props3 = (0, _objectWithoutProperties2.default)(_parse2, _excluded4);
+              refresh({
+                href: "".concat(_path, "?formMode=info&").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat((0, _querystring.stringify)((0, _objectSpread2.default)({}, _props3)))
+              });
+            }
           });
         }
       }
@@ -271,7 +313,7 @@ var LdFormList = function LdFormList(_ref) {
         _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
         } : _ref8$renderTopLeft,
-        _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
+        _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded5);
       var _props$type = _props.type,
         type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
@@ -348,7 +390,7 @@ var Index = function Index(_ref10) {
   var namespace = _ref10.ldId,
     initData = _ref10.initData,
     overModel = _ref10.overModel,
-    props = (0, _objectWithoutProperties2.default)(_ref10, _excluded4);
+    props = (0, _objectWithoutProperties2.default)(_ref10, _excluded6);
   var match = (0, _umi.useRouteMatch)();
   var Component = (0, _ahooks.useCreation)(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

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", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid"],
+var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "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,
@@ -50,6 +50,7 @@ var LdGrid = function LdGrid(_ref) {
     readFilter = _ref.readFilter,
     isFlow = _ref.isFlow,
     isTreeGrid = _ref.isTreeGrid,
+    writable = _ref.writable,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var gridRef = (0, _react.useRef)(null);
   var treeConfig = (0, _ahooks.useCreation)(function () {
@@ -107,7 +108,7 @@ var LdGrid = function LdGrid(_ref) {
         result.push(customColumns[field]);
       } else if (defaultColumns[field].isShowInGrid)
         // 数据集中存在的字段和自定义结合展示
-        result.push((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}, isTreeGrid));
+        result.push((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable));
     }, []);
   }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = (0, _ahooks.useCreation)(function () {

package/lib/components/LdTree/index.js

@@ -98,7 +98,7 @@ var LdTree = function LdTree(_ref) {
               defaultExpandedKeys: defaultExpanded
             });
           }
-          var treeData = dataToTreeFormat ? dataToTreeFormat(data) : (0, _utils.dataToTree)(data, null, rowKey, window.appConfig.constraintKeys.PARENT);
+          var treeData = dataToTreeFormat ? dataToTreeFormat(data) : (0, _utils.dataToTree)(data, null, window.appConfig.constraintKeys.PRIMARY, window.appConfig.constraintKeys.PARENT);
           setDataSource(treeData);
           afterInit && afterInit(treeData);
         }

package/lib/utils/grid.js

@@ -1,11 +1,13 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getColumnRender = getColumnRender;
 exports.getGridColumn = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
@@ -17,6 +19,7 @@ var _GridCell = _interopRequireDefault(require("../upload/GridCell"));
 var _utils = require("@luck-design-biz/base/utils");
 var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
 var _form = require("../helper/form");
+var formItemUtils = _interopRequireWildcard(require("../helper/FromItems"));
 var _excluded = ["comName", "property"],
   _excluded2 = ["name"],
   _excluded3 = ["filter", "filterParams"];
@@ -105,6 +108,7 @@ var getGridColumn = function getGridColumn() {
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
+  var writable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   var _props$isVirtual = props.isVirtual,
     isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual;
   var _translator = (0, _form.translator)(props),
@@ -226,6 +230,64 @@ var getGridColumn = function getGridColumn() {
         data.filter = 'text';
     }
   } else data.filter = false;
+  if (writable && props.isShowInForm && !props.isReadOnly) {
+    data.editable = props.isNotNull ? {
+      required: true
+    } : true;
+    if (_props.cellWriter) data.cellWriter = _props.cellWriter;else {
+      var formItemCom = (0, _lodash.capitalize)(comName || _form.defaultComName[property]) === 'Textarea' ? 'String' : (0, _lodash.capitalize)(comName || _form.defaultComName[property]);
+      var getFormItemUtils = formItemUtils["get".concat(formItemCom, "Item")];
+      var formItemProps = {};
+      switch (formItemCom) {
+        case 'date':
+          formItemProps = {
+            dataFormat: function dataFormat(value) {
+              var _ref2;
+              return _ref2 = {}, (0, _defineProperty2.default)(_ref2, name, value ? (0, _moment.default)(value).valueOf() : undefined), (0, _defineProperty2.default)(_ref2, "".concat(name, "_virtual"), value ? (0, _moment.default)(value).format('YYYY-MM-DD HH:mm:ss') : undefined), _ref2;
+            },
+            inputFormat: function inputFormat(value, record, params) {
+              return (0, _moment.default)(record["".concat(name, "_virtual")], 'YYYY-MM-DD HH:mm:ss');
+            }
+          };
+          break;
+        case 'user':
+        case 'select':
+        case 'group':
+          if (translateProps.multiple) {
+            formItemProps = {
+              dataFormat: function dataFormat(value) {
+                var _ref3;
+                return _ref3 = {}, (0, _defineProperty2.default)(_ref3, name, value.map(function (v) {
+                  return v.value || v.key;
+                }).join(',')), (0, _defineProperty2.default)(_ref3, "".concat(name, "_virtual"), value.map(function (v) {
+                  return v.label;
+                }).join(',')), _ref3;
+              },
+              inputFormat: function inputFormat(value, record, params) {
+                return (0, _defineProperty2.default)({}, name, (0, _form.splitStrToObj)(value, record["".concat(name, "_virtual")]));
+              }
+            };
+          } else {
+            formItemProps = {
+              dataFormat: function dataFormat(value) {
+                var _ref5;
+                return _ref5 = {}, (0, _defineProperty2.default)(_ref5, name, value ? value.value || value.key : undefined), (0, _defineProperty2.default)(_ref5, "".concat(name, "_virtual"), value ? value.label : undefined), _ref5;
+              },
+              inputFormat: function inputFormat(value, record, params) {
+                return (0, _defineProperty2.default)({}, name, !(0, _lodash.isNil)(value) ? {
+                  key: value,
+                  value: value,
+                  label: record["".concat(name, "_virtual")]
+                } : undefined);
+              }
+            };
+          }
+          break;
+      }
+      ;
+      data.cellWriter = getFormItemUtils((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), formItemProps));
+    }
+  }
   return data;
 };
 exports.getGridColumn = getGridColumn;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.17",
+  "version": "0.0.18-2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",