@luck-design-biz/luckda 0.0.16 → 0.0.17-1

package/es/components/LdFormList/index.js

@@ -6,7 +6,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
+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"];
@@ -53,6 +53,8 @@ var LdFormList = function LdFormList(_ref) {
     renderFormExtra = _ref$renderFormExtra === void 0 ? function () {
       return /*#__PURE__*/React.createElement(React.Fragment, null);
     } : _ref$renderFormExtra,
+    _ref$bpmButtonProps = _ref.bpmButtonProps,
+    bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -110,63 +112,64 @@ var LdFormList = function LdFormList(_ref) {
 
   /**zss添加**/
   var renderAffixRightCustom = function renderAffixRightCustom() {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/React.createElement(BpmButton, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/React.createElement(BpmButton, _extends({
       bizData: bizData,
       suppressDept: false
-    }));
+    }, 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$ticketData, PRIMARY, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           if (!(formMode !== 'add')) {
-            _context.next = 12;
+            _context.next = 13;
             break;
           }
+          PRIMARY = window.appConfig.constraintKeys.PRIMARY;
           _params = {
-            indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
+            indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData[PRIMARY],
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
             mainDataSetKey: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
           }; // 请求是否有工作流服务
-          _context.next = 4;
+          _context.next = 5;
           return readBehaviorCall(_params);
-        case 4:
+        case 5:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
-            _context.next = 12;
+            _context.next = 13;
             break;
           }
-          _context.next = 8;
+          _context.next = 9;
           return readBehaviorCall(_objectSpread(_objectSpread({}, _params), {}, {
             behaviorKey: 'readBpm'
           }));
-        case 8:
+        case 9:
           _yield$readBehaviorCa = _context.sent;
           code = _yield$readBehaviorCa.code;
           data = _yield$readBehaviorCa.data;
           if (code == 1 && data) {
             bpmInfoObj = data.bpmInfo;
-            tempObj = {
+            tempObj = _objectSpread(_objectSpread({}, props.formData[mainFormLdId]), {}, {
               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$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2[PRIMARY],
               moduleCode: rest.moduleCode,
               datasetCode: mainDataSetKey,
-              indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno
-            };
+              indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3[PRIMARY]
+            });
             setBizData(tempObj);
             setIsCustomRenderAffixRight(true);
           }
-        case 12:
+        case 13:
         case "end":
           return _context.stop();
       }
     }, _callee);
-  })), []);
+  })), [props.formData]);
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
     var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
       formCode = _ref7.formCode,
@@ -192,6 +195,7 @@ var LdFormList = function LdFormList(_ref) {
           afterSubmit(success, mainKey, res);
         } else {
           var _formListRef$current;
+          formListRef.current.setFormMode('info');
           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 () {

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/helper/action.js

@@ -158,7 +158,7 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
         } else {
           result[formInfo.dataSetKey] = transform(value, function (_result, _value, _key) {
             _result[_key] = _value.map(function (_val) {
-              return _objectSpread(_objectSpread({}, dataFormat(gridColumns, _val)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : item[window.appConfig.constraintKeys.PRIMARY]));
+              return _objectSpread(_objectSpread({}, dataFormat(gridColumns, _val)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : _val[window.appConfig.constraintKeys.PRIMARY]));
             });
           }, {});
         }

package/es/helper/form.js

@@ -86,6 +86,7 @@ export function translator() {
       label: '不满足验证要求'
     })
   }];
+  if (allConfig['desensitized']) _props.desensitized = allConfig['desensitized']; // 脱敏
   return _props;
 }
 

package/es/upload/Form/gridForm.js

@@ -2,8 +2,8 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl"];
-import React, { useState, useRef } from 'react';
+var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
+import React, { useState, useRef, forwardRef } from 'react';
 import { getDvaApp } from 'umi';
 import { useMemoizedFn } from 'ahooks';
 import { Button, Upload, Tooltip, Icon } from 'antd';
@@ -64,6 +64,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     zipName = _ref$zipName === void 0 ? 'download.zip' : _ref$zipName,
     resetActions = _ref.resetActions,
     getUrl = _ref.getUrl,
+    wrapperRef = _ref.wrapperRef,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -73,7 +74,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     uploadLoading = _useState4[0],
     setUploadLoading = _useState4[1];
-  var gridRef = useRef(null);
+  var gridRef = wrapperRef || useRef(null);
   var _getDvaApp$_store$get = (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
     currentUser = _getDvaApp$_store$get.currentUser;
 
@@ -86,7 +87,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
       var filenames = selectedRows.map(function (item) {
         return item.fileId || item.uid;
       });
-      console.log('handleDownload1', filenames, selectedRows);
       downloadFile(filenames, 'downloadOne');
       cb && cb(true);
     } else {
@@ -94,7 +94,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
       var files = selectedRows.map(function (item) {
         return item.fileId || item.uid;
       }).join(',');
-      console.log('handleDownload2', files, selectedRows);
       patchDownloadZip(getUrl('downloadZip'), files, {
         zipName: zipName
       }).then(function () {
@@ -372,5 +371,10 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }
   }))));
 };
-UploadGridForm.displayName = 'GridForm';
-export default UploadGridForm;
+var Com = /*#__PURE__*/forwardRef(function (props, ref) {
+  return /*#__PURE__*/React.createElement(UploadGridForm, _extends({
+    wrapperRef: ref
+  }, props));
+});
+export default Com;
+Com.displayName = 'GridForm';

package/es/upload/Form/index.js

@@ -15,10 +15,11 @@ function buildComponent(props) {
     note = _props$note === void 0 ? '' : _props$note,
     rest = _objectWithoutProperties(props, _excluded);
   var formId = "annex_".concat(_formId);
-  var getUrl = function getUrl(behaviorKey, _note) {
-    var formData = rest.formData,
-      mainFormLdId = rest.mainFormLdId,
-      ticketData = rest.ticketData;
+  var getUrl = function getUrl(behaviorKey, _note, docUid) {
+    var ticketData = rest.ticketData,
+      formData = rest.formData,
+      mainFormLdId = rest.mainFormLdId;
+    var PRIMARY_KEY = window.appConfig.constraintKeys.PRIMARY;
     var params = omitBy({
       moduleCode: moduleCode,
       bucket: bucket,
@@ -26,7 +27,7 @@ function buildComponent(props) {
       tag: formId,
       note: _note || note,
       active: !(behaviorKey === 'loadFileGrid' || rest.formMode === 'add' || rest.formMode === 'update'),
-      docUid: formData && formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData && ticketData[window.appConfig.constraintKeys.PRIMARY]
+      docUid: docUid || formData[mainFormLdId] && formData[mainFormLdId][PRIMARY_KEY] || ticketData && ticketData[PRIMARY_KEY]
     }, isNil);
     return "".concat(window.appConfig.OSS_HOST_V3, "?").concat(stringify(params));
   };
@@ -36,8 +37,14 @@ function buildComponent(props) {
     rowKey: "uid"
   }, rest, {
     onQuery: {
-      api: function api() {
-        return request(getUrl('loadFileGrid'));
+      api: function api(_ref) {
+        var docUid = _ref.docUid;
+        return request(getUrl('loadFileGrid', null, docUid));
+      },
+      get: function get(formData) {
+        return {
+          docUid: formData && formData[rest.mainFormLdId] && formData[rest.mainFormLdId][window.appConfig.constraintKeys.PRIMARY]
+        };
       },
       format: function format(data) {
         return data.map(function (i) {

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 '@luck-design-biz/base';
+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,7 +31,7 @@ var _action = require("../../helper/action");
 var _lodash = require("lodash");
 var _bpm = require("@luck-design-biz/base/bpm");
 var _services = require("../../services");
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
+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"];
@@ -60,6 +60,8 @@ var LdFormList = function LdFormList(_ref) {
     renderFormExtra = _ref$renderFormExtra === void 0 ? function () {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
     } : _ref$renderFormExtra,
+    _ref$bpmButtonProps = _ref.bpmButtonProps,
+    bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -117,63 +119,64 @@ var LdFormList = function LdFormList(_ref) {
 
   /**zss添加**/
   var renderAffixRightCustom = function renderAffixRightCustom() {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/_react.default.createElement(_bpm.BpmButton, {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/_react.default.createElement(_bpm.BpmButton, (0, _extends2.default)({
       bizData: bizData,
       suppressDept: false
-    }));
+    }, 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$ticketData, PRIMARY, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           if (!(formMode !== 'add')) {
-            _context.next = 12;
+            _context.next = 13;
             break;
           }
+          PRIMARY = window.appConfig.constraintKeys.PRIMARY;
           _params = {
-            indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
+            indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData[PRIMARY],
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
             mainDataSetKey: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
           }; // 请求是否有工作流服务
-          _context.next = 4;
+          _context.next = 5;
           return (0, _services.readBehaviorCall)(_params);
-        case 4:
+        case 5:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
-            _context.next = 12;
+            _context.next = 13;
             break;
           }
-          _context.next = 8;
+          _context.next = 9;
           return (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _params), {}, {
             behaviorKey: 'readBpm'
           }));
-        case 8:
+        case 9:
           _yield$readBehaviorCa = _context.sent;
           code = _yield$readBehaviorCa.code;
           data = _yield$readBehaviorCa.data;
           if (code == 1 && data) {
             bpmInfoObj = data.bpmInfo;
-            tempObj = {
+            tempObj = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.formData[mainFormLdId]), {}, {
               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$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2[PRIMARY],
               moduleCode: rest.moduleCode,
               datasetCode: mainDataSetKey,
-              indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno
-            };
+              indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3[PRIMARY]
+            });
             setBizData(tempObj);
             setIsCustomRenderAffixRight(true);
           }
-        case 12:
+        case 13:
         case "end":
           return _context.stop();
       }
     }, _callee);
-  })), []);
+  })), [props.formData]);
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
     var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
       formCode = _ref7.formCode,
@@ -199,6 +202,7 @@ var LdFormList = function LdFormList(_ref) {
           afterSubmit(success, mainKey, res);
         } else {
           var _formListRef$current;
+          formListRef.current.setFormMode('info');
           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 () {

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/helper/action.js

@@ -166,7 +166,7 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
         } else {
           result[formInfo.dataSetKey] = (0, _lodash.transform)(value, function (_result, _value, _key) {
             _result[_key] = _value.map(function (_val) {
-              return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, _val)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : item[window.appConfig.constraintKeys.PRIMARY]));
+              return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, _val)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : _val[window.appConfig.constraintKeys.PRIMARY]));
             });
           }, {});
         }

package/lib/helper/form.js

@@ -97,6 +97,7 @@ function translator() {
       label: '不满足验证要求'
     })
   }];
+  if (allConfig['desensitized']) _props.desensitized = allConfig['desensitized']; // 脱敏
   return _props;
 }
 

package/lib/upload/Form/gridForm.js

@@ -20,7 +20,7 @@ var _luckDesign = require("luck-design");
 var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
 var _FormList = require("@luck-design-biz/base/FormList");
 var _utils = require("@luck-design-biz/base/utils");
-var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl"];
+var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
 var columns = [{
   field: 'name',
   title: '附件名称'
@@ -72,6 +72,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     zipName = _ref$zipName === void 0 ? 'download.zip' : _ref$zipName,
     resetActions = _ref.resetActions,
     getUrl = _ref.getUrl,
+    wrapperRef = _ref.wrapperRef,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -81,7 +82,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     uploadLoading = _useState4[0],
     setUploadLoading = _useState4[1];
-  var gridRef = (0, _react.useRef)(null);
+  var gridRef = wrapperRef || (0, _react.useRef)(null);
   var _getDvaApp$_store$get = (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
     currentUser = _getDvaApp$_store$get.currentUser;
 
@@ -94,7 +95,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
       var filenames = selectedRows.map(function (item) {
         return item.fileId || item.uid;
       });
-      console.log('handleDownload1', filenames, selectedRows);
       downloadFile(filenames, 'downloadOne');
       cb && cb(true);
     } else {
@@ -102,7 +102,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
       var files = selectedRows.map(function (item) {
         return item.fileId || item.uid;
       }).join(',');
-      console.log('handleDownload2', files, selectedRows);
       (0, _utils.patchDownloadZip)(getUrl('downloadZip'), files, {
         zipName: zipName
       }).then(function () {
@@ -380,6 +379,11 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }
   }))));
 };
-UploadGridForm.displayName = 'GridForm';
-var _default = UploadGridForm;
-exports.default = _default;
+var Com = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  return /*#__PURE__*/_react.default.createElement(UploadGridForm, (0, _extends2.default)({
+    wrapperRef: ref
+  }, props));
+});
+var _default = Com;
+exports.default = _default;
+Com.displayName = 'GridForm';

package/lib/upload/Form/index.js

@@ -22,10 +22,11 @@ function buildComponent(props) {
     note = _props$note === void 0 ? '' : _props$note,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var formId = "annex_".concat(_formId);
-  var getUrl = function getUrl(behaviorKey, _note) {
-    var formData = rest.formData,
-      mainFormLdId = rest.mainFormLdId,
-      ticketData = rest.ticketData;
+  var getUrl = function getUrl(behaviorKey, _note, docUid) {
+    var ticketData = rest.ticketData,
+      formData = rest.formData,
+      mainFormLdId = rest.mainFormLdId;
+    var PRIMARY_KEY = window.appConfig.constraintKeys.PRIMARY;
     var params = (0, _lodash.omitBy)({
       moduleCode: moduleCode,
       bucket: bucket,
@@ -33,7 +34,7 @@ function buildComponent(props) {
       tag: formId,
       note: _note || note,
       active: !(behaviorKey === 'loadFileGrid' || rest.formMode === 'add' || rest.formMode === 'update'),
-      docUid: formData && formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData && ticketData[window.appConfig.constraintKeys.PRIMARY]
+      docUid: docUid || formData[mainFormLdId] && formData[mainFormLdId][PRIMARY_KEY] || ticketData && ticketData[PRIMARY_KEY]
     }, _lodash.isNil);
     return "".concat(window.appConfig.OSS_HOST_V3, "?").concat((0, _querystring.stringify)(params));
   };
@@ -43,8 +44,14 @@ function buildComponent(props) {
     rowKey: "uid"
   }, rest, {
     onQuery: {
-      api: function api() {
-        return (0, _utils.request)(getUrl('loadFileGrid'));
+      api: function api(_ref) {
+        var docUid = _ref.docUid;
+        return (0, _utils.request)(getUrl('loadFileGrid', null, docUid));
+      },
+      get: function get(formData) {
+        return {
+          docUid: formData && formData[rest.mainFormLdId] && formData[rest.mainFormLdId][window.appConfig.constraintKeys.PRIMARY]
+        };
       },
       format: function format(data) {
         return data.map(function (i) {

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"));
@@ -13,10 +15,11 @@ var _umi = require("umi");
 var _lodash = require("lodash");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
-var _base = require("@luck-design-biz/base");
+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"];
@@ -89,7 +92,7 @@ function getColumnRender(name, type) {
             previewUrl: "".concat(_ApiConfig.default.LUCKDA_HOST).concat(file.previewUrl)
           };
         });
-        return /*#__PURE__*/_react.default.createElement(_base.UploadGridCell, {
+        return /*#__PURE__*/_react.default.createElement(_GridCell.default, {
           fileList: fileList
         });
       };
@@ -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.16",
+  "version": "0.0.17-1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",