@luck-design-biz/luckda 0.0.12 → 0.0.13-1

package/es/components/LdAutoForm/index.js

@@ -2,9 +2,8 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "formRef", "formMode"];
-import React, { useContext, useRef, useState } from 'react';
-import { useCreation, useMemoizedFn } from 'ahooks';
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "formRef", "formMode", "formData"];
+import React, { createRef, useContext } from 'react';
 import { transform } from 'lodash';
 import { AutoForm } from '@luck-design-biz/base/FormList';
 import ldBuilder from '../../helper/ldBuilder';
@@ -43,12 +42,13 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
     formRef = _ref.formRef,
     formMode = _ref.formMode,
+    forwardFormData = _ref.formData,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useContext(LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = useRef();
+  var defaultValues = /*#__PURE__*/createRef();
   var isMain = ldId === mainFormLdId;
-  var basicItems = useCreation(function () {
+  var basicItems = function () {
     var _defaultValues = {};
     var _nodes = transform(columns, function (result, col) {
       if (col.isShowInForm) {
@@ -61,7 +61,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           formId: ldId,
           moduleCode: moduleCode,
           formRef: formRef,
-          formMode: formMode
+          formMode: formMode,
+          uid: ticketData[window.appConfig.constraintKeys.PRIMARY]
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.field, value)));
@@ -76,19 +77,18 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }, i.props);
     })));
     return _nodes;
-  }, [columns, filedsRewrite, isMain]);
+  }();
   var formConfig = {
     formId: ldId,
     isMain: isMain,
     defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
   };
-  var onOperate = useMemoizedFn(function () {
+  var onOperate = function onOperate() {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
     return _objectSpread(_objectSpread({
       api: function api(get, post, formData) {
-        var _formData$mainFormLdI;
-        post[dataSetKey][isMain ? 'indocno' : 'relationId'] = ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno;
+        post[dataSetKey][isMain ? 'indocno' : 'relationId'] = formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY];
         return behaviorCall(get, post, formData);
       },
       get: function get() {
@@ -112,13 +112,13 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
         return _defineProperty({}, dataSetKey, _submitData);
       }
     });
-  });
+  };
   return /*#__PURE__*/React.createElement(AutoForm, _extends({}, props, {
     onQuery: _objectSpread(_objectSpread({
       api: behaviorCall,
       get: function get(formData) {
-        var _formData$mainFormLdI2, _params2;
-        var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readForm'), _params2);
+        var _params2;
+        var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readForm'), _params2);
         if (!isMain) _params.relationDs = mainDataSetKey;
         return _params;
       }

package/es/components/LdCard/index.js

@@ -174,7 +174,9 @@ Index.propTypes = {
   // 卡片配置项
   onOperationsClick: PropTypes.func,
   // 操作
-  cardActions: PropTypes.array // 卡片行为
+  cardActions: PropTypes.array,
+  // 卡片行为
+  cardKey: PropTypes.string // 卡片主键
 };
 
 Index.defaultProps = {
@@ -183,12 +185,13 @@ Index.defaultProps = {
   isFlow: false,
   cardConfig: {},
   formatDataSource: function formatDataSource(_list, _detail) {
-    return _list.map(function (indocno) {
-      return _detail[indocno];
+    return _list.map(function (id) {
+      return _detail[id];
     });
   },
   cardActions: [],
-  overModel: {}
+  overModel: {},
+  cardKey: window.appConfig.constraintKeys.PRIMARY
 };
 export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(Index, _extends({

package/es/components/LdFormList/index.js

@@ -7,16 +7,15 @@ var _excluded = ["namespace", "formState", "formMode", "loading", "wrapperRef",
   _excluded2 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded3 = ["ldId", "initData", "overModel"];
 import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
-import { stringify } from 'querystring';
-import { connect, getDvaApp, useRouteMatch, history } from 'umi';
+import { connect, getDvaApp, useRouteMatch } from 'umi';
 import PropTypes from 'prop-types';
 import { useCreation, useMemoizedFn } from 'ahooks';
 import { BasicDivider } from 'luck-design';
-import { formatMessage, ChildrenUtil } from '@luck-design-biz/base/utils';
+import { ChildrenUtil } from '@luck-design-biz/base/utils';
 import { FormList, FormListAffix, FormBtn } from '@luck-design-biz/base/FormList';
 import buildLdAutoForm from '../LdAutoForm';
 import buildLdGridForm from '../LdGridForm';
-import { Collapse, FormWindowContext } from '@luck-design-biz/base';
+import { Collapse } from '@luck-design-biz/base';
 import { LuckDaContext } from '../Builder';
 import { LuckDaPopContext } from '../LdPop';
 import createModel from './model';
@@ -53,12 +52,9 @@ var LdFormList = function LdFormList(_ref) {
     setSubmitLoading = _useState2[1];
   var _ref2 = useContext(LuckDaPopContext) || {},
     defaultLayout = _ref2.affixLayout;
-  var _ref3 = useContext(FormWindowContext) || {},
-    formWindow = _ref3.formWindow;
-  var _ref4 = useContext(LuckDaContext) || {},
-    readFieldProps = _ref4.readFieldProps,
-    dataSets = _ref4.dataSets,
-    doAction = _ref4.doAction;
+  var _ref3 = useContext(LuckDaContext) || {},
+    dataSets = _ref3.dataSets,
+    doAction = _ref3.doAction;
   var formListRef = useRef(null);
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, formListRef.current), {}, {
@@ -78,8 +74,8 @@ var LdFormList = function LdFormList(_ref) {
     });
   });
   var handleValueChange = useMemoizedFn(function (change) {
-    var _ref5 = formListRef.current || {},
-      formRefs = _ref5.formRefs;
+    var _ref4 = formListRef.current || {},
+      formRefs = _ref4.formRefs;
     var data = formRefs && Object.keys(formRefs).map(function (key) {
       var _formRefs$key, _formRefs$key$formRef, _formRefs$key$current;
       var getValue = (((_formRefs$key = formRefs[key]) === null || _formRefs$key === void 0 ? void 0 : (_formRefs$key$formRef = _formRefs$key.formRef) === null || _formRefs$key$formRef === void 0 ? void 0 : _formRefs$key$formRef.current) ? formRefs[key].getData : null) || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
@@ -94,9 +90,10 @@ var LdFormList = function LdFormList(_ref) {
     }, extraConfig)));
   });
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
-    var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-      formCode = _ref7.formCode,
-      formKey = _ref7.formKey;
+    var _ref6 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      formCode = _ref6.formCode,
+      formKey = _ref6.formKey,
+      formUid = _ref6.formUid;
     setSubmitLoading(true);
     onBatchSubmitAction({
       values: values,
@@ -107,12 +104,14 @@ var LdFormList = function LdFormList(_ref) {
       action: action,
       formData: props.formData,
       form_id: formKey,
-      effcode: formCode
-    }, function (success, indocno, res) {
+      effcode: formCode,
+      formUid: formUid,
+      mainDataSetKey: mainDataSetKey
+    }, function (success, mainKey, res) {
       setSubmitLoading(false);
       if (success) {
         if (afterSubmit) {
-          afterSubmit(success, indocno, res);
+          afterSubmit(success, mainKey, res);
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
@@ -129,9 +128,7 @@ var LdFormList = function LdFormList(_ref) {
           //     })}`,
           //   );
           // } else {
-          formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
-            indocno: indocno
-          }), function () {
+          formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, mainKey)), function () {
             return formListRef.current.setFormMode('info');
           });
           // }
@@ -149,6 +146,7 @@ var LdFormList = function LdFormList(_ref) {
     readOnly: readOnly,
     mainFormLdId: mainFormLdId,
     onValueChange: handleValueChange,
+    formRef: formListRef,
     renderExtra: renderExtra
   });
   var formList = renderFormList(formConfig);
@@ -176,19 +174,19 @@ var LdFormList = function LdFormList(_ref) {
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout
   }), formList.map(function (formProps) {
-    var _ref8 = formProps || {},
-      ldId = _ref8.id,
-      _ref8$header = _ref8.header,
-      header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
-      title = _ref8.title,
-      _readOnly = _ref8.readOnly,
-      _ref8$extraConfig = _ref8.extraConfig,
-      extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
-      _ref8$renderTopLeft = _ref8.renderTopLeft,
-      _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
+    var _ref7 = formProps || {},
+      ldId = _ref7.id,
+      _ref7$header = _ref7.header,
+      header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
+      title = _ref7.title,
+      _readOnly = _ref7.readOnly,
+      _ref7$extraConfig = _ref7.extraConfig,
+      extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
+      _ref7$renderTopLeft = _ref7.renderTopLeft,
+      _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
         return /*#__PURE__*/React.createElement(React.Fragment, null);
-      } : _ref8$renderTopLeft,
-      _props = _objectWithoutProperties(_ref8, _excluded2);
+      } : _ref7$renderTopLeft,
+      _props = _objectWithoutProperties(_ref7, _excluded2);
     var _props$type = _props.type,
       type = _props$type === void 0 ? 'auto' : _props$type;
     var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
@@ -207,6 +205,7 @@ var LdFormList = function LdFormList(_ref) {
       ticketData: props.ticketData,
       formRef: formListRef,
       formMode: formMode,
+      formData: props.formData,
       renderTopLeft: function renderTopLeft() {
         return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
       }
@@ -229,6 +228,7 @@ var LdFormList = function LdFormList(_ref) {
       ticketData: props.ticketData,
       formRef: formListRef,
       formMode: formMode,
+      formData: props.formData,
       renderTopLeft: function renderTopLeft() {
         return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
       }
@@ -250,9 +250,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
       formMode: 'add'
     }, initData)
   });
-  return connect(function (_ref9) {
-    var modelName = _ref9[namespace],
-      loading = _ref9.loading;
+  return connect(function (_ref8) {
+    var modelName = _ref8[namespace],
+      loading = _ref8.loading;
     return {
       formData: modelName.formData,
       formOperates: modelName.formOperates,
@@ -263,11 +263,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
     };
   })(WrappedComponent);
 };
-var Index = function Index(_ref10) {
-  var namespace = _ref10.ldId,
-    initData = _ref10.initData,
-    overModel = _ref10.overModel,
-    props = _objectWithoutProperties(_ref10, _excluded3);
+var Index = function Index(_ref9) {
+  var namespace = _ref9.ldId,
+    initData = _ref9.initData,
+    overModel = _ref9.overModel,
+    props = _objectWithoutProperties(_ref9, _excluded3);
   var match = useRouteMatch();
   var Component = useCreation(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

package/es/components/LdGrid/index.js

@@ -206,7 +206,9 @@ Index.propTypes = {
   // 行操作
   suppressInit: PropTypes.bool,
   // 抑制初始化
-  afterInit: PropTypes.func // 初始化后
+  afterInit: PropTypes.func,
+  // 初始化后
+  rowKey: PropTypes.string // 初始化后
 };
 
 Index.defaultProps = {
@@ -214,14 +216,15 @@ Index.defaultProps = {
   columnsReset: null,
   batchOperations: [],
   formatDataSource: function formatDataSource(_list, _detail) {
-    return _list.map(function (indocno) {
-      return _detail[indocno];
+    return _list.map(function (id) {
+      return _detail[id];
     });
   },
   resultSet: {},
   suppressInit: false,
   isFlow: false,
-  overModel: {}
+  overModel: {},
+  rowKey: window.appConfig.constraintKeys.PRIMARY
 };
 export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(Index, _extends({

package/es/components/LdGridForm/index.js

@@ -2,9 +2,8 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className"];
-import React, { useContext, useRef } from 'react';
-import { useCreation, useMemoizedFn } from 'ahooks';
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
+import React, { createRef, useContext } from 'react';
 import { transform } from 'lodash';
 import classNames from 'classnames';
 import ldBuilder from '../../helper/ldBuilder';
@@ -50,10 +49,12 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     _ref$ticketData = _ref.ticketData,
     ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
     className = _ref.className,
+    formRef = _ref.formRef,
+    formMode = _ref.formMode,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useContext(LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = useRef();
+  var defaultValues = /*#__PURE__*/createRef();
   var isMain = ldId === mainFormLdId;
   var gridColumns = columns.map(function (col) {
     if ((col.comName || defaultComName[col.property]) === 'radio') return _objectSpread(_objectSpread({}, col), {}, {
@@ -61,11 +62,11 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     });
     return col;
   });
-  var _columns = useCreation(function () {
+  var _columns = function () {
     var _defaultValues = {};
     var _nodes = transform(gridColumns, function (result, col) {
       if (col.isShowInForm) {
-        var _objectSpread2;
+        var _objectSpread2, _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
           return column.field === col.field;
         }) || {};
@@ -74,7 +75,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
           mode: 'grid'
         });
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, col.field, col['optDefaultValue']), _defineProperty(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
-        result.push(getFormColumn(type, col, customColumn));
+        result.push(getFormColumn(type, col, _objectSpread(_objectSpread({}, customColumn), {}, {
+          formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
+            moduleCode: moduleCode,
+            formRef: formRef,
+            formMode: formMode
+          })
+        })));
       }
     }, []);
     defaultValues.current = _defaultValues;
@@ -88,22 +95,20 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
       });
     })));
     return _nodes;
-  }, [columns, columnsRewrite, isMain]);
+  }();
   var defaultDataSource = _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
   var formConfig = {
     formId: ldId,
     columns: _columns,
     isMain: isMain,
-    defaultDataSource: defaultDataSource,
-    newItemDefaultValue: defaultDataSource
+    defaultDataSource: defaultDataSource
   };
-  var onOperate = useMemoizedFn(function () {
+  var onOperate = function onOperate() {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
     return _objectSpread(_objectSpread({
       api: function api(get, post, formData) {
-        var _formData$mainFormLdI;
-        return behaviorCall(_objectSpread(_objectSpread({}, get), {}, _defineProperty({}, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno)), post, formData);
+        return behaviorCall(_objectSpread(_objectSpread({}, get), {}, _defineProperty({}, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY])), post, formData);
       },
       get: function get() {
         var _get = {
@@ -117,27 +122,26 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     }, _onOperate), {}, {
       post: function post(data) {
         var _submitData = data.map(function (item) {
-          return behaviorKey === 'add' ? _objectSpread(_objectSpread({}, dataFormat(gridColumns, item)), {}, {
-            indocno: null
-          }) : dataFormat(gridColumns, item);
+          return behaviorKey === 'add' ? _objectSpread(_objectSpread({}, dataFormat(gridColumns, item)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, null)) : dataFormat(gridColumns, item);
         });
         if (_onOperate === null || _onOperate === void 0 ? void 0 : _onOperate.post) return _onOperate.post(_submitData); // 以预设为主
         return _defineProperty({}, dataSetKey, _defineProperty({}, "".concat(behaviorKey, "List"), _submitData));
       }
     });
-  });
+  };
   return /*#__PURE__*/React.createElement(GridForm, _extends({
     noAddon: true,
     operates: defaultOpe,
     orderByAdd: "asc",
     rowSelection: true,
-    type: type
+    type: type,
+    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno'
   }, props, {
     onQuery: _objectSpread(_objectSpread({
       api: behaviorCall,
       get: function get(formData) {
-        var _formData$mainFormLdI2, _params2;
-        var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readGrid'), _params2);
+        var _params2;
+        var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readGrid'), _params2);
         if (!isMain) _params.relationDs = mainDataSetKey;
         return _params;
       }
@@ -156,7 +160,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
       post: function post(data) {
         var _submitData = data.map(function (item) {
           return {
-            indocno: item.indocno
+            indocno: item[window.appConfig.constraintKeys.PRIMARY]
           };
         });
         if (onDelete === null || onDelete === void 0 ? void 0 : onDelete.post) return onDelete.post(_submitData); // 以预设为主

package/es/components/LdInfoPanel/index.js

@@ -58,12 +58,14 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
       return _objectSpread({
         title: xCol.fieldName
       }, col);
-    }) : columns.map(function (item) {
-      return {
-        title: item.fieldName,
-        dataIndex: item.field
-      };
-    });
+    }) : transform(columns, function (result, item) {
+      if (item.isShowInForm) {
+        result.push({
+          title: item.fieldName,
+          dataIndex: item.field
+        });
+      }
+    }, []);
   }, [columns]);
   var _useRequest = useRequest(service || behaviorCall, {
       // 获取数据源

package/es/components/LdTree/index.js

@@ -3,7 +3,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 = ["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"],
+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"],
   _excluded2 = ["onClick"];
 import React, { useState, useRef, useImperativeHandle, forwardRef } from 'react';
 import { isFunction, isNumber, transform, includes, remove, cloneDeep, keys } from 'lodash';
@@ -44,6 +44,7 @@ var LdTree = function LdTree(_ref) {
     afterInit = _ref.afterInit,
     isTree = _ref.isTree,
     service = _ref.service,
+    dataToTreeFormat = _ref.dataToTreeFormat,
     props = _objectWithoutProperties(_ref, _excluded);
   if (!includes(isTree, dataSetKey)) return formatMessage({
     id: 'luckda.ldTree.notTres',
@@ -89,7 +90,7 @@ var LdTree = function LdTree(_ref) {
               defaultExpandedKeys: defaultExpanded
             });
           }
-          var treeData = dataToTree(data);
+          var treeData = dataToTreeFormat ? dataToTreeFormat(data) : dataToTree(data, null, rowKey, window.appConfig.constraintKeys.PARENT);
           setDataSource(treeData);
           afterInit && afterInit(treeData);
         }
@@ -227,7 +228,7 @@ Index.propTypes = {
 Index.defaultProps = {
   readOnly: false,
   title: false,
-  rowKey: 'indocno',
+  rowKey: window.appConfig.constraintKeys.PRIMARY,
   treeNodeTitle: 'sname',
   defaultExpandDeep: 0,
   draggable: false,

package/es/helper/FromItems.js

@@ -24,7 +24,7 @@ var _excluded = ["onBlur"],
   _excluded20 = ["handleValueChange", "config"],
   _excluded21 = ["onBlur"],
   _excluded22 = ["handleValueChange", "config"],
-  _excluded23 = ["onBlur"],
+  _excluded23 = ["onBlur", "uid"],
   _excluded24 = ["handleValueChange", "config"];
 import React, { useState, useEffect } from 'react';
 import { getDvaApp } from 'umi';
@@ -298,12 +298,16 @@ export var getUploadItem = function getUploadItem() {
     _ref14$config = _ref14.config,
     _ref14$config2 = _ref14$config === void 0 ? {} : _ref14$config,
     _onBlur5 = _ref14$config2.onBlur,
+    uid = _ref14$config2.uid,
     _config = _objectWithoutProperties(_ref14$config2, _excluded23),
     props = _objectWithoutProperties(_ref14, _excluded24);
   return /*#__PURE__*/React.createElement(UploadFormItemV3, _extends({}, props, {
+    docUid: props.uid,
     config: _objectSpread(_objectSpread({
-      listType: 'picture-card'
+      listType: 'picture-card',
+      accept: 'image/*'
     }, _config), {}, {
+      num: 1,
       onBlur: function onBlur(value) {
         handleValueChange && handleValueChange(value);
         _onBlur5 && _onBlur5(value);

package/es/helper/action.js

@@ -1,3 +1,4 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 // 通用方法
 import React from 'react';
@@ -80,10 +81,14 @@ export var doAction = function doAction(action) {
     };
     showConfirm ? makeSure(handleAction) : handleAction();
   } else {
-    showPop(formatMessage({
-      id: 'luckda.operates.message.noAction',
-      label: '该模块下缺少此行为'
+    var errorMsg = "".concat(formatMessage({
+      id: 'luckda.module.miss',
+      label: '该模块下缺少'
+    })).concat(action).concat(formatMessage({
+      id: 'luckda.operates.Action',
+      label: '行为'
     }));
+    showPop(errorMsg);
   }
 };
 export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
@@ -102,15 +107,17 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
     action = _ref3.action,
     formData = _ref3.formData,
     form_id = _ref3.form_id,
-    effcode = _ref3.effcode;
+    effcode = _ref3.effcode,
+    formUid = _ref3.formUid,
+    mainDataSetKey = _ref3.mainDataSetKey;
   var data = transform(formList, function (result, value) {
-    var _formData$value$id, _values$value$id;
+    var _values$value$id;
     if (values[value.id]) {
       var _dataSetKey = value.dataSetKey;
       switch (value.type) {
         case 'auto':
           result[_dataSetKey] = _objectSpread({
-            indocno: (_formData$value$id = formData[value.id]) === null || _formData$value$id === void 0 ? void 0 : _formData$value$id.indocno
+            indocno: mainDataSetKey === _dataSetKey && action === 'add' && !window.appConfig.suppressUid ? formUid : formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
           }, dataFormat(dataSets[_dataSetKey], (_values$value$id = values[value.id]) === null || _values$value$id === void 0 ? void 0 : _values$value$id.submitData));
           break;
         case 'grid':
@@ -125,15 +132,13 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
           if (isArray(values[value.id])) {
             _submitData = {
               addList: values[value.id].map(function (item) {
-                return _objectSpread(_objectSpread({}, dataFormat(gridColumns, item)), {}, {
-                  indocno: null
-                });
+                return _objectSpread(_objectSpread({}, dataFormat(gridColumns, item)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, null));
               })
             };
           } else {
             _submitData = transform(values[value.id], function (_result, _value, _key) {
               _result[_key] = _value.map(function (item) {
-                return dataFormat(gridColumns, item);
+                return _objectSpread(_objectSpread({}, dataFormat(gridColumns, item)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : item[window.appConfig.constraintKeys.PRIMARY]));
               });
             }, {});
           }

package/es/helper/form.js

@@ -9,6 +9,7 @@ export var defaultComName = {
   number: 'number',
   money: 'number',
   decimal: 'number',
+  sint: 'number',
   string: 'string',
   text: 'textarea',
   date: 'date',
@@ -20,7 +21,8 @@ export var defaultComName = {
   color: 'color',
   zone: 'region',
   year: 'year',
-  rte: 'editor'
+  rte: 'editor',
+  file: 'upload'
 };
 
 /**