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

package/es/utils/form.js

@@ -12,7 +12,7 @@ var _excluded = ["comName", "property"],
   _excluded9 = ["type", "name"];
 import React from 'react';
 import moment from 'moment';
-import { capitalize, merge, transform, isArray, omit, isNil } from 'lodash';
+import { capitalize, merge, transform, isArray, omit, isNil, clone } from 'lodash';
 import { defaultComName, translator, splitStrToObj, formatCustomProps } from '../helper/form';
 import { getColumnRender } from './grid';
 import * as formItemUtils from '../helper/FromItems';
@@ -30,6 +30,7 @@ export function getFormItem() {
     props = _objectWithoutProperties(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!property) return /*#__PURE__*/React.createElement(React.Fragment, null);
+  if (property === 'sint' || property === 'number') props.opt_decimal = 0;
   var _translator = translator(props),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
@@ -62,8 +63,8 @@ export function getFormItem() {
 export var formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var omitValues = {};
   var data = transform(propsList, function (result, n) {
-    var _values$name, _values$name2;
     var _ref2 = n || {},
       comName = _ref2.comName,
       property = _ref2.property,
@@ -101,14 +102,14 @@ export var formItemDataFormat = function formItemDataFormat() {
         result[name] = values[name];
         break;
       case 'upload':
-        result[name] = ((_values$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.spath) || ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.url);
+        result[name] = values[name];
         break;
       default:
         if (!isNil(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
     }
-    values = omit(values, [name, "".concat(name, "_virtual")]);
+    omitValues = omit(values, [name, "".concat(name, "_virtual")]);
   }, {});
-  return _objectSpread(_objectSpread({}, values), data);
+  return _objectSpread(_objectSpread({}, omitValues), data);
 };
 
 /**
@@ -119,37 +120,52 @@ export var formItemDataFormat = function formItemDataFormat() {
  */
 export var dataFormat = function dataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   // 姚小川说：冗余字段后端处理，不需要前端传给后端
+  var values = clone(_values);
   var data = transform(propsList, function (result, n) {
+    var _values$name, _values$name2;
     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;
+    // if (!values.hasOwnProperty(name)) {
+    //   if (isNil(props.defaultValue)) return;
+    //   console.log('props.defaultValue',props.defaultValue);
+    //   values[name] = props.defaultValue;
+    //   values[`${name}_virtual`] = props.defaultValueVirtual;
+    // };
+    // if(!isNil(props.defaultValue)){
+
+    // }
     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$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.value) ? values[name].value : ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.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;
+      case 'upload':
+        result[name] = values[name] && values[name][0] ? values[name][0].name : null;
         break;
       default:
-        if (!isNil(values[name])) result[name] = values[name];
+        result[name] = values[name];
     }
     values = omit(values, [name, "".concat(name, "_cvt")]);
   }, {});

package/es/utils/grid.js

@@ -69,6 +69,12 @@ export function getColumnRender(name, type) {
         }).join('/') : undefined;
       };
       break;
+    case 'upload':
+      render = function render(text, record) {
+        var _text$;
+        return text && ((_text$ = text[0]) === null || _text$ === void 0 ? void 0 : _text$.name) || text;
+      };
+      break;
     default:
   }
   return render;
@@ -97,7 +103,7 @@ export var getGridColumn = function getGridColumn() {
   };
   if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region'], comName || defaultComName[property])) data.sortable = false;
   // data.filter = false;
-  if (filter) {
+  if (!isNil(filter)) {
     // 因为后端升级问题，暂时关闭过滤功能
     data.filter = filter;
     data.filterParams = filterParams;

package/lib/components/LdAutoForm/index.js

@@ -11,13 +11,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
-var _ahooks = require("ahooks");
 var _lodash = require("lodash");
 var _FormList = require("@luck-design-biz/base/FormList");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils = require("../../utils");
 var _Builder = require("../Builder");
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "formRef", "formMode"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey"];
 var defaultOpe = ['read', 'add', 'update', 'delete'];
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
@@ -49,14 +48,14 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     } : _ref$defaultDataSourc,
     _ref$ticketData = _ref.ticketData,
     ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
-    formRef = _ref.formRef,
-    formMode = _ref.formMode,
+    _ref$relationKey = _ref.relationKey,
+    relationKey = _ref$relationKey === void 0 ? window.appConfig.constraintKeys.PRIMARY : _ref$relationKey,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = (0, _react.useRef)();
+  var defaultValues = /*#__PURE__*/(0, _react.createRef)();
   var isMain = ldId === mainFormLdId;
-  var basicItems = (0, _ahooks.useCreation)(function () {
+  var basicItems = function () {
     var _defaultValues = {};
     var _nodes = (0, _lodash.transform)(columns, function (result, col) {
       if (col.isShowInForm) {
@@ -67,9 +66,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
         _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.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.getFormItem)(col, (0, _objectSpread3.default)((0, _objectSpread3.default)({
           formId: ldId,
-          moduleCode: moduleCode,
-          formRef: formRef,
-          formMode: formMode
+          moduleCode: moduleCode
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.field, value)));
@@ -84,19 +81,19 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }, i.props);
     })));
     return _nodes;
-  }, [columns, filedsRewrite, isMain]);
+  }();
   var formConfig = {
     formId: ldId,
     isMain: isMain,
     defaultDataSource: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
   };
-  var onOperate = (0, _ahooks.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 (0, _objectSpread3.default)((0, _objectSpread3.default)({
       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;
+        var _relationKey = isMain ? window.appConfig.constraintKeys.PRIMARY : relationKey;
+        post[dataSetKey].indocno = formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey];
         return (0, _utils.behaviorCall)(get, post, formData);
       },
       get: function get() {
@@ -120,13 +117,18 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
         return (0, _defineProperty2.default)({}, dataSetKey, _submitData);
       }
     });
-  });
+  };
   return /*#__PURE__*/_react.default.createElement(_FormList.AutoForm, (0, _extends2.default)({}, props, {
     onQuery: (0, _objectSpread3.default)((0, _objectSpread3.default)({
       api: _utils.behaviorCall,
       get: function get(formData) {
-        var _formData$mainFormLdI2, _params2;
-        var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readForm'), _params2);
+        var _relationKey = isMain ? window.appConfig.constraintKeys.PRIMARY : relationKey;
+        var _params = {
+          indocno: formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey],
+          moduleCode: moduleCode,
+          datasetCode: dataSetKey,
+          behaviorKey: 'readForm'
+        };
         if (!isMain) _params.relationDs = mainDataSetKey;
         return _params;
       }
@@ -136,8 +138,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
         if (onQuery === null || onQuery === void 0 ? void 0 : onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
         return formItemData;
       }
-    }),
-    onAdd: onOperate(onAdd, 'add'),
+    })
+    // onAdd={onOperate(onAdd, 'add')}
+    ,
     onUpdate: onOperate(onUpdate, 'update'),
     operates: defaultOpe
   }, formConfig), basicItems);

package/lib/components/LdCard/index.js

@@ -182,7 +182,9 @@ Index.propTypes = {
   // 卡片配置项
   onOperationsClick: _propTypes.default.func,
   // 操作
-  cardActions: _propTypes.default.array // 卡片行为
+  cardActions: _propTypes.default.array,
+  // 卡片行为
+  cardKey: _propTypes.default.string // 卡片主键
 };
 
 Index.defaultProps = {
@@ -191,12 +193,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
 };
 var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({

package/lib/components/LdFormList/index.js

@@ -12,7 +12,6 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
-var _querystring = require("querystring");
 var _umi = require("umi");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _ahooks = require("ahooks");
@@ -60,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), {}, {
@@ -85,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);
@@ -101,9 +97,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);
     (0, _action.onBatchSubmitAction)({
       values: values,
@@ -114,12 +111,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());
@@ -136,9 +135,8 @@ var LdFormList = function LdFormList(_ref) {
           //     })}`,
           //   );
           // } else {
-          formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
-            indocno: indocno
-          }), function () {
+          var mainFormData = res.detail[res.list[0]];
+          formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
             return formListRef.current.setFormMode('info');
           });
           // }
@@ -156,6 +154,7 @@ var LdFormList = function LdFormList(_ref) {
     readOnly: readOnly,
     mainFormLdId: mainFormLdId,
     onValueChange: handleValueChange,
+    formRef: formListRef,
     renderExtra: renderExtra
   });
   var formList = renderFormList(formConfig);
@@ -183,19 +182,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;
@@ -212,8 +211,6 @@ var LdFormList = function LdFormList(_ref) {
       readOnly: readOnly || _readOnly,
       onValueChange: handleValueChange,
       ticketData: props.ticketData,
-      formRef: formListRef,
-      formMode: formMode,
       renderTopLeft: function renderTopLeft() {
         return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
       }
@@ -234,8 +231,6 @@ var LdFormList = function LdFormList(_ref) {
       readOnly: readOnly || _readOnly,
       onValueChange: handleValueChange,
       ticketData: props.ticketData,
-      formRef: formListRef,
-      formMode: formMode,
       renderTopLeft: function renderTopLeft() {
         return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
       }
@@ -257,9 +252,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,
@@ -270,11 +265,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/LdGrid/index.js

@@ -214,7 +214,9 @@ Index.propTypes = {
   // 行操作
   suppressInit: _propTypes.default.bool,
   // 抑制初始化
-  afterInit: _propTypes.default.func // 初始化后
+  afterInit: _propTypes.default.func,
+  // 初始化后
+  rowKey: _propTypes.default.string // 初始化后
 };
 
 Index.defaultProps = {
@@ -222,14 +224,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
 };
 var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({

package/lib/components/LdGridForm/index.js

@@ -11,7 +11,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
-var _ahooks = require("ahooks");
 var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
@@ -20,7 +19,7 @@ var _utils = require("../../utils");
 var _form = require("../../helper/form");
 var _Builder = require("../Builder");
 var _index = _interopRequireDefault(require("./index.less"));
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
 var defaultOpe = ['read', 'add', 'update', 'delete'];
 var buildLdGridForm = function buildLdGridForm(_ref) {
   var _ref$columns = _ref.columns,
@@ -58,10 +57,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 = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = (0, _react.useRef)();
+  var defaultValues = /*#__PURE__*/(0, _react.createRef)();
   var isMain = ldId === mainFormLdId;
   var gridColumns = columns.map(function (col) {
     if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
@@ -69,11 +70,11 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     });
     return col;
   });
-  var _columns = (0, _ahooks.useCreation)(function () {
+  var _columns = function () {
     var _defaultValues = {};
     var _nodes = (0, _lodash.transform)(gridColumns, function (result, col) {
       if (col.isShowInForm) {
-        var _objectSpread2;
+        var _objectSpread2, _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
           return column.field === col.field;
         }) || {};
@@ -82,7 +83,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
           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));
-        result.push((0, _utils.getFormColumn)(type, col, customColumn));
+        result.push((0, _utils.getFormColumn)(type, col, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
+          formItemRewrite: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
+            moduleCode: moduleCode,
+            formRef: formRef,
+            formMode: formMode
+          })
+        })));
       }
     }, []);
     defaultValues.current = _defaultValues;
@@ -96,22 +103,22 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
       });
     })));
     return _nodes;
-  }, [columns, columnsRewrite, isMain]);
+  }();
   var defaultDataSource = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
   var formConfig = {
     formId: ldId,
     columns: _columns,
     isMain: isMain,
-    defaultDataSource: defaultDataSource,
-    newItemDefaultValue: defaultDataSource
+    defaultDataSource: defaultDataSource
   };
-  var onOperate = (0, _ahooks.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 (0, _objectSpread4.default)((0, _objectSpread4.default)({
       api: function api(get, post, formData) {
-        var _formData$mainFormLdI;
-        return (0, _utils.behaviorCall)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, get), {}, (0, _defineProperty2.default)({}, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno)), post, formData);
+        return (0, _utils.behaviorCall)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, get), {}, {
+          relationId: formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]
+        }), post, formData);
       },
       get: function get() {
         var _get = {
@@ -125,27 +132,30 @@ 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, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.dataFormat)(gridColumns, item)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, null)) : (0, _utils.dataFormat)(gridColumns, item);
         });
         if (_onOperate === null || _onOperate === void 0 ? void 0 : _onOperate.post) return _onOperate.post(_submitData); // 以预设为主
         return (0, _defineProperty2.default)({}, dataSetKey, (0, _defineProperty2.default)({}, "".concat(behaviorKey, "List"), _submitData));
       }
     });
-  });
+  };
   return /*#__PURE__*/_react.default.createElement(_FormList.GridForm, (0, _extends2.default)({
     noAddon: true,
     operates: defaultOpe,
     orderByAdd: "asc",
     rowSelection: true,
-    type: type
+    type: type,
+    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno'
   }, props, {
     onQuery: (0, _objectSpread4.default)((0, _objectSpread4.default)({
       api: _utils.behaviorCall,
       get: function get(formData) {
-        var _formData$mainFormLdI2, _params2;
-        var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readGrid'), _params2);
+        var _params = {
+          relationId: formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY],
+          moduleCode: moduleCode,
+          datasetCode: dataSetKey,
+          behaviorKey: 'readGrid'
+        };
         if (!isMain) _params.relationDs = mainDataSetKey;
         return _params;
       }
@@ -164,7 +174,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/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/components/LdTree/index.js

@@ -23,7 +23,7 @@ var _base = require("@luck-design-biz/base");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils2 = require("../../utils");
 var _index = _interopRequireDefault(require("./index.less"));
-var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service"],
+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"];
 var LdTree = function LdTree(_ref) {
   var columns = _ref.columns,
@@ -52,6 +52,7 @@ var LdTree = function LdTree(_ref) {
     afterInit = _ref.afterInit,
     isTree = _ref.isTree,
     service = _ref.service,
+    dataToTreeFormat = _ref.dataToTreeFormat,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   if (!(0, _lodash.includes)(isTree, dataSetKey)) return (0, _utils.formatMessage)({
     id: 'luckda.ldTree.notTres',
@@ -97,7 +98,7 @@ var LdTree = function LdTree(_ref) {
               defaultExpandedKeys: defaultExpanded
             });
           }
-          var treeData = (0, _utils.dataToTree)(data);
+          var treeData = dataToTreeFormat ? dataToTreeFormat(data) : (0, _utils.dataToTree)(data, null, rowKey, window.appConfig.constraintKeys.PARENT);
           setDataSource(treeData);
           afterInit && afterInit(treeData);
         }
@@ -235,7 +236,7 @@ Index.propTypes = {
 Index.defaultProps = {
   readOnly: false,
   title: false,
-  rowKey: 'indocno',
+  rowKey: window.appConfig.constraintKeys.PRIMARY,
   treeNodeTitle: 'sname',
   defaultExpandDeep: 0,
   draggable: false,