@luck-design-biz/luckda 0.0.12-4 → 0.0.12-6

package/es/components/LdFormList/index.js

@@ -15,7 +15,7 @@ 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';
@@ -52,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), {}, {
@@ -77,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);
@@ -93,9 +90,9 @@ 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;
     setSubmitLoading(true);
     onBatchSubmitAction({
       values: values,
@@ -173,19 +170,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;
@@ -249,9 +246,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,
@@ -262,11 +259,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/LdGridForm/index.js

@@ -116,9 +116,7 @@ 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));
@@ -130,7 +128,8 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     operates: defaultOpe,
     orderByAdd: "asc",
     rowSelection: true,
-    type: type
+    type: type,
+    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno'
   }, props, {
     onQuery: _objectSpread(_objectSpread({
       api: behaviorCall,

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/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';
@@ -130,15 +131,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, null));
               });
             }, {});
           }

package/es/utils/form.js

@@ -124,34 +124,36 @@ export var dataFormat = function dataFormat() {
   var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   // 姚小川说：冗余字段后端处理，不需要前端传给后端
   var data = transform(propsList, function (result, n) {
+    var _values$name3, _values$name4;
     var _ref3 = n || {},
       comName = _ref3.comName,
       property = _ref3.property,
       props = _objectWithoutProperties(_ref3, _excluded5);
     var translatorProps = translator(props);
     var name = translatorProps.name;
+    if (!values.hasOwnProperty(name)) return;
     switch (comName || defaultComName[property]) {
       case 'date':
-        result[name] = values[name] ? moment(values[name]).valueOf() : undefined;
+        result[name] = values[name] ? moment(values[name]).valueOf() : null;
         break;
       case 'user':
       case 'select':
       case 'group':
         if (isArray(values[name])) result[name] = values[name].map(function (v) {
           return v.value || v.key;
-        }).join(',');else if (values[name]) result[name] = values[name].value || values[name].key;
+        }).join(',');else result[name] = !isNil((_values$name3 = values[name]) === null || _values$name3 === void 0 ? void 0 : _values$name3.value) ? values[name].value : ((_values$name4 = values[name]) === null || _values$name4 === void 0 ? void 0 : _values$name4.key) || null;
         break;
       case 'switch':
         result[name] = values[name] ? 1 : 0;
         break;
       case 'region':
-        result[name] = values[name] ? JSON.stringify(values[name]) : undefined;
+        result[name] = values[name] ? JSON.stringify(values[name]) : null;
         break;
       case 'year':
-        result[name] = values[name] ? moment(values[name]).format('YYYY') : undefined;
+        result[name] = values[name] ? moment(values[name]).format('YYYY') : null;
         break;
       default:
-        if (!isNil(values[name])) result[name] = values[name];
+        result[name] = values[name];
     }
     values = omit(values, [name, "".concat(name, "_cvt")]);
   }, {});

package/lib/components/LdFormList/index.js

@@ -59,12 +59,9 @@ var LdFormList = function LdFormList(_ref) {
     setSubmitLoading = _useState2[1];
   var _ref2 = (0, _react.useContext)(_LdPop.LuckDaPopContext) || {},
     defaultLayout = _ref2.affixLayout;
-  var _ref3 = (0, _react.useContext)(_base.FormWindowContext) || {},
-    formWindow = _ref3.formWindow;
-  var _ref4 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
-    readFieldProps = _ref4.readFieldProps,
-    dataSets = _ref4.dataSets,
-    doAction = _ref4.doAction;
+  var _ref3 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
+    dataSets = _ref3.dataSets,
+    doAction = _ref3.doAction;
   var formListRef = (0, _react.useRef)(null);
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
@@ -84,8 +81,8 @@ var LdFormList = function LdFormList(_ref) {
     });
   });
   var handleValueChange = (0, _ahooks.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);
@@ -100,9 +97,9 @@ 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;
     setSubmitLoading(true);
     (0, _action.onBatchSubmitAction)({
       values: values,
@@ -180,19 +177,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.default.createElement(_react.default.Fragment, null);
-      } : _ref8$renderTopLeft,
-      _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded2);
+      } : _ref7$renderTopLeft,
+      _props = (0, _objectWithoutProperties2.default)(_ref7, _excluded2);
     var _props$type = _props.type,
       type = _props$type === void 0 ? 'auto' : _props$type;
     var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
@@ -256,9 +253,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
       formMode: 'add'
     }, initData)
   });
-  return (0, _umi.connect)(function (_ref9) {
-    var modelName = _ref9[namespace],
-      loading = _ref9.loading;
+  return (0, _umi.connect)(function (_ref8) {
+    var modelName = _ref8[namespace],
+      loading = _ref8.loading;
     return {
       formData: modelName.formData,
       formOperates: modelName.formOperates,
@@ -269,11 +266,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 = (0, _objectWithoutProperties2.default)(_ref10, _excluded3);
+var Index = function Index(_ref9) {
+  var namespace = _ref9.ldId,
+    initData = _ref9.initData,
+    overModel = _ref9.overModel,
+    props = (0, _objectWithoutProperties2.default)(_ref9, _excluded3);
   var match = (0, _umi.useRouteMatch)();
   var Component = (0, _ahooks.useCreation)(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

package/lib/components/LdGridForm/index.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectSpread5 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
@@ -64,7 +64,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
   var defaultValues = (0, _react.useRef)();
   var isMain = ldId === mainFormLdId;
   var gridColumns = columns.map(function (col) {
-    if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
+    if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread5.default)((0, _objectSpread5.default)({}, col), {}, {
       comName: 'select'
     });
     return col;
@@ -77,11 +77,11 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         var customColumn = columnsRewrite.find(function (column) {
           return column.field === col.field;
         }) || {};
-        if (col.isReadOnly) customColumn = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
+        if (col.isReadOnly) customColumn = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, customColumn), {}, {
           editable: false,
           mode: 'grid'
         });
-        _defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.field, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
+        _defaultValues = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.field, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
         result.push((0, _utils.getFormColumn)(type, col, customColumn));
       }
     }, []);
@@ -89,15 +89,15 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     setFieldProps((0, _defineProperty2.default)({}, ldId, _nodes.map(function (col) {
       var node = col.renderBasicFormItem();
       var renderBasicFormItem = node === null || node === void 0 ? void 0 : node.props;
-      return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
-        renderBasicFormItem: (0, _objectSpread4.default)({
+      return (0, _objectSpread5.default)((0, _objectSpread5.default)({}, col), {}, {
+        renderBasicFormItem: (0, _objectSpread5.default)({
           component: node.type.comName || node.type.displayName
         }, renderBasicFormItem)
       });
     })));
     return _nodes;
   }, [columns, columnsRewrite, isMain]);
-  var defaultDataSource = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
+  var defaultDataSource = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
   var formConfig = {
     formId: ldId,
     columns: _columns,
@@ -108,9 +108,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
   var onOperate = (0, _ahooks.useMemoizedFn)(function () {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
-    return (0, _objectSpread4.default)((0, _objectSpread4.default)({
+    return (0, _objectSpread5.default)((0, _objectSpread5.default)({
       api: function api(get, post, formData) {
-        return (0, _utils.behaviorCall)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, get), {}, (0, _defineProperty2.default)({}, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY])), post, formData);
+        return (0, _utils.behaviorCall)((0, _objectSpread5.default)((0, _objectSpread5.default)({}, get), {}, (0, _defineProperty2.default)({}, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY])), post, formData);
       },
       get: function get() {
         var _get = {
@@ -124,9 +124,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     }, _onOperate), {}, {
       post: function post(data) {
         var _submitData = data.map(function (item) {
-          return behaviorKey === 'add' ? (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.dataFormat)(gridColumns, item)), {}, {
-            indocno: null
-          }) : (0, _utils.dataFormat)(gridColumns, item);
+          return behaviorKey === 'add' ? (0, _objectSpread5.default)((0, _objectSpread5.default)({}, (0, _utils.dataFormat)(gridColumns, item)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, null)) : (0, _utils.dataFormat)(gridColumns, item);
         });
         if (_onOperate === null || _onOperate === void 0 ? void 0 : _onOperate.post) return _onOperate.post(_submitData); // 以预设为主
         return (0, _defineProperty2.default)({}, dataSetKey, (0, _defineProperty2.default)({}, "".concat(behaviorKey, "List"), _submitData));
@@ -138,9 +136,10 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     operates: defaultOpe,
     orderByAdd: "asc",
     rowSelection: true,
-    type: type
+    type: type,
+    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno'
   }, props, {
-    onQuery: (0, _objectSpread4.default)((0, _objectSpread4.default)({
+    onQuery: (0, _objectSpread5.default)((0, _objectSpread5.default)({
       api: _utils.behaviorCall,
       get: function get(formData) {
         var _params2;
@@ -159,7 +158,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     }),
     onAdd: onOperate(onAdd, 'add'),
     onUpdate: onOperate(onUpdate, 'update'),
-    onDelete: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, onOperate(onDelete, 'delete')), {}, {
+    onDelete: (0, _objectSpread5.default)((0, _objectSpread5.default)({}, onOperate(onDelete, 'delete')), {}, {
       post: function post(data) {
         var _submitData = data.map(function (item) {
           return {

package/lib/components/LdInfoPanel/index.js

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

package/lib/helper/action.js

@@ -5,7 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.onBatchSubmitAction = exports.doAction = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
 var _utils = require("@luck-design-biz/base/utils");
@@ -62,14 +63,14 @@ var doAction = function doAction(action) {
       if (customAction) {
         customAction({
           api: _utils2.behaviorCall,
-          get: (0, _objectSpread2.default)({
+          get: (0, _objectSpread4.default)({
             behaviorKey: action,
             moduleCode: moduleCode
           }, get),
           post: post
         });
       } else {
-        (0, _utils2.behaviorCall)((0, _objectSpread2.default)({
+        (0, _utils2.behaviorCall)((0, _objectSpread4.default)({
           behaviorKey: action,
           moduleCode: moduleCode
         }, get), post).then(function (res) {
@@ -122,14 +123,14 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
       var _dataSetKey = value.dataSetKey;
       switch (value.type) {
         case 'auto':
-          result[_dataSetKey] = (0, _objectSpread2.default)({
+          result[_dataSetKey] = (0, _objectSpread4.default)({
             indocno: formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
           }, (0, _utils2.dataFormat)(dataSets[_dataSetKey], (_values$value$id = values[value.id]) === null || _values$value$id === void 0 ? void 0 : _values$value$id.submitData));
           break;
         case 'grid':
         case 'writer':
           var gridColumns = dataSets[_dataSetKey].map(function (col) {
-            if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, col), {}, {
+            if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
               comName: 'select'
             });
             return col;
@@ -138,15 +139,13 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
           if ((0, _lodash.isArray)(values[value.id])) {
             _submitData = {
               addList: values[value.id].map(function (item) {
-                return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _utils2.dataFormat)(gridColumns, item)), {}, {
-                  indocno: null
-                });
+                return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, item)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, null));
               })
             };
           } else {
             _submitData = (0, _lodash.transform)(values[value.id], function (_result, _value, _key) {
               _result[_key] = _value.map(function (item) {
-                return (0, _utils2.dataFormat)(gridColumns, item);
+                return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, item)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, null));
               });
             }, {});
           }

package/lib/utils/form.js

@@ -133,34 +133,36 @@ var dataFormat = function dataFormat() {
   var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   // 姚小川说：冗余字段后端处理，不需要前端传给后端
   var data = (0, _lodash.transform)(propsList, function (result, n) {
+    var _values$name3, _values$name4;
     var _ref3 = n || {},
       comName = _ref3.comName,
       property = _ref3.property,
       props = (0, _objectWithoutProperties2.default)(_ref3, _excluded5);
     var translatorProps = (0, _form.translator)(props);
     var name = translatorProps.name;
+    if (!values.hasOwnProperty(name)) return;
     switch (comName || _form.defaultComName[property]) {
       case 'date':
-        result[name] = values[name] ? (0, _moment.default)(values[name]).valueOf() : undefined;
+        result[name] = values[name] ? (0, _moment.default)(values[name]).valueOf() : null;
         break;
       case 'user':
       case 'select':
       case 'group':
         if ((0, _lodash.isArray)(values[name])) result[name] = values[name].map(function (v) {
           return v.value || v.key;
-        }).join(',');else if (values[name]) result[name] = values[name].value || values[name].key;
+        }).join(',');else result[name] = !(0, _lodash.isNil)((_values$name3 = values[name]) === null || _values$name3 === void 0 ? void 0 : _values$name3.value) ? values[name].value : ((_values$name4 = values[name]) === null || _values$name4 === void 0 ? void 0 : _values$name4.key) || null;
         break;
       case 'switch':
         result[name] = values[name] ? 1 : 0;
         break;
       case 'region':
-        result[name] = values[name] ? JSON.stringify(values[name]) : undefined;
+        result[name] = values[name] ? JSON.stringify(values[name]) : null;
         break;
       case 'year':
-        result[name] = values[name] ? (0, _moment.default)(values[name]).format('YYYY') : undefined;
+        result[name] = values[name] ? (0, _moment.default)(values[name]).format('YYYY') : null;
         break;
       default:
-        if (!(0, _lodash.isNil)(values[name])) result[name] = values[name];
+        result[name] = values[name];
     }
     values = (0, _lodash.omit)(values, [name, "".concat(name, "_cvt")]);
   }, {});

package/package.json

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