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

package/lib/components/LdAutoForm/index.js

@@ -11,14 +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", "formData"];
-var defaultOpe = ['read', 'add', 'update', 'delete'];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey"];
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -49,32 +47,28 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     } : _ref$defaultDataSourc,
     _ref$ticketData = _ref.ticketData,
     ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
-    formRef = _ref.formRef,
-    formMode = _ref.formMode,
-    forwardFormData = _ref.formData,
+    _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) {
         var _objectSpread2;
         var customFiled = filedsRewrite.find(function (field) {
-          return field.name === col.field;
+          return field.name === col.aliaName;
         }) || {};
-        _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));
+        _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.aliaName, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
         result.push((0, _utils.getFormItem)(col, (0, _objectSpread3.default)((0, _objectSpread3.default)({
           formId: ldId,
-          moduleCode: moduleCode,
-          formRef: formRef,
-          formMode: formMode,
-          uid: ticketData[window.appConfig.constraintKeys.PRIMARY]
+          moduleCode: moduleCode
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
-            return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.field, value)));
+            return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.aliaName, value)));
           }
         })));
       }
@@ -86,18 +80,19 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }, i.props);
     })));
     return _nodes;
-  }, [columns, filedsRewrite, isMain, formMode]);
+  }();
   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) {
-        post[dataSetKey][isMain ? 'indocno' : 'relationId'] = formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY];
+        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() {
@@ -121,13 +116,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 _params2;
-        var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), (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;
       }
@@ -137,10 +137,10 @@ 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'),
-    onUpdate: onOperate(onUpdate, 'update'),
-    operates: defaultOpe
+    })
+    // onAdd={onOperate(onAdd, 'add')}
+    ,
+    onUpdate: onOperate(onUpdate, 'update')
   }, formConfig), basicItems);
 };
 var _default = (0, _ldBuilder.default)(buildLdAutoForm);

package/lib/components/LdFormList/index.js

@@ -25,7 +25,8 @@ var _Builder = require("../Builder");
 var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
-var _excluded = ["namespace", "formState", "formMode", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
+var _lodash = require("lodash");
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
   _excluded2 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded3 = ["ldId", "initData", "overModel"];
 // 组件
@@ -34,6 +35,7 @@ var LdFormList = function LdFormList(_ref) {
   var namespace = _ref.namespace,
     formState = _ref.formState,
     formMode = _ref.formMode,
+    formOperates = _ref.formOperates,
     loading = _ref.loading,
     wrapperRef = _ref.wrapperRef,
     readOnly = _ref.readOnly,
@@ -61,7 +63,8 @@ var LdFormList = function LdFormList(_ref) {
     defaultLayout = _ref2.affixLayout;
   var _ref3 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     dataSets = _ref3.dataSets,
-    doAction = _ref3.doAction;
+    doAction = _ref3.doAction,
+    resources = _ref3.resources;
   var formListRef = (0, _react.useRef)(null);
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
@@ -135,7 +138,8 @@ var LdFormList = function LdFormList(_ref) {
           //     })}`,
           //   );
           // } else {
-          formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, mainKey)), function () {
+          var mainFormData = res.detail[res.list[0]];
+          formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
             return formListRef.current.setFormMode('info');
           });
           // }
@@ -156,7 +160,15 @@ var LdFormList = function LdFormList(_ref) {
     formRef: formListRef,
     renderExtra: renderExtra
   });
-  var formList = renderFormList(formConfig);
+  var formList = (0, _ahooks.useCreation)(function () {
+    var _list = renderFormList(formConfig);
+    var extraList = renderFormExtra && (0, _lodash.isArray)(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
+    var list = _list.concat(extraList);
+    return (0, _lodash.sortBy)(list, function (o) {
+      var _o$props;
+      return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
+    });
+  }, [formConfig]);
   var mainDataSetKey = (_formList$find = formList.find(function (i) {
     return i.id === mainFormLdId;
   })) === null || _formList$find === void 0 ? void 0 : _formList$find.dataSetKey;
@@ -164,7 +176,10 @@ var LdFormList = function LdFormList(_ref) {
     editFlow: true,
     formState: formState,
     formMode: formMode,
-    loading: loading || submitLoading
+    loading: loading || submitLoading,
+    formOperates: (0, _lodash.mapValues)(formOperates, function () {
+      return resources;
+    })
   }, props, {
     modelName: namespace,
     ref: formListRef,
@@ -181,70 +196,67 @@ var LdFormList = function LdFormList(_ref) {
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout
   }), formList.map(function (formProps) {
-    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);
-      } : _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;
-    if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
-      title: title || ldId,
-      extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
-      id: ldId,
-      key: ldId,
-      mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
-    }, renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
-      ldId: ldId,
-      mainFormLdId: mainFormLdId,
-      mainDataSetKey: mainDataSetKey,
-      readOnly: readOnly || _readOnly,
-      onValueChange: handleValueChange,
-      ticketData: props.ticketData,
-      formRef: formListRef,
-      formMode: formMode,
-      formData: props.formData,
-      renderTopLeft: function renderTopLeft() {
-        return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
-      }
-    })));
-    return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
-      key: ldId
-    }, header === 'divider' && /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
-      title: title || ldId,
-      id: ldId
-    }), type === 'auto' && /*#__PURE__*/_react.default.createElement("div", {
-      style: {
-        textAlign: 'right'
-      }
-    }, renderExtra(ldId, extraConfig, 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
-      ldId: ldId,
-      mainFormLdId: mainFormLdId,
-      mainDataSetKey: mainDataSetKey,
-      readOnly: readOnly || _readOnly,
-      onValueChange: handleValueChange,
-      ticketData: props.ticketData,
-      formRef: formListRef,
-      formMode: formMode,
-      formData: props.formData,
-      renderTopLeft: function renderTopLeft() {
-        return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
-      }
-    })));
-  }), _utils.ChildrenUtil.deepMap(renderFormExtra(formConfig), function (child) {
-    var _child$type;
-    return /*#__PURE__*/_react.default.cloneElement(child, ((_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'Collapse' ? {
-      mode: child.props.mode || 'tab'
-    } : {});
+    if (formProps.dataSetKey) {
+      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);
+        } : _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;
+      if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
+        title: title || ldId,
+        extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
+        id: ldId,
+        key: ldId,
+        mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
+      }, renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+        ldId: ldId,
+        mainFormLdId: mainFormLdId,
+        mainDataSetKey: mainDataSetKey,
+        readOnly: readOnly || _readOnly,
+        onValueChange: handleValueChange,
+        ticketData: props.ticketData,
+        renderTopLeft: function renderTopLeft() {
+          return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
+        }
+      })));
+      return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
+        key: ldId
+      }, header === 'divider' && /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
+        title: title || ldId,
+        id: ldId
+      }), type === 'auto' && /*#__PURE__*/_react.default.createElement("div", {
+        style: {
+          textAlign: 'right'
+        }
+      }, renderExtra(ldId, extraConfig, 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+        ldId: ldId,
+        mainFormLdId: mainFormLdId,
+        mainDataSetKey: mainDataSetKey,
+        readOnly: readOnly || _readOnly,
+        onValueChange: handleValueChange,
+        ticketData: props.ticketData,
+        renderTopLeft: function renderTopLeft() {
+          return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
+        }
+      })));
+    }
+    return _utils.ChildrenUtil.deepMap(formProps, function (child) {
+      var _child$type;
+      return /*#__PURE__*/_react.default.cloneElement(child, ((_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'Collapse' ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child.props), {}, {
+        mode: child.props.mode || 'tab'
+      }) : child.props);
+    })[0];
   }));
 };
 

package/lib/components/LdGrid/index.js

@@ -95,7 +95,7 @@ var LdGrid = function LdGrid(_ref) {
    */
   var _columns = (0, _ahooks.useCreation)(function () {
     if (columnsReset) return columnsReset;
-    var defaultColumns = (0, _lodash.keyBy)(columns, 'field');
+    var defaultColumns = (0, _lodash.keyBy)(columns, 'aliaName');
     var customColumns = (0, _lodash.keyBy)(columnsRewrite, 'field');
     var mergeFields = (0, _lodash.union)((0, _lodash.keys)(defaultColumns), (0, _lodash.keys)(customColumns));
     return (0, _lodash.transform)(mergeFields, function (result, field) {

package/lib/components/LdGridForm/index.js

@@ -8,10 +8,9 @@ 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 _objectSpread5 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+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"));
@@ -21,7 +20,6 @@ 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", "formRef", "formMode"];
-var defaultOpe = ['read', 'add', 'update', 'delete'];
 var buildLdGridForm = function buildLdGridForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -63,29 +61,29 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     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, _objectSpread5.default)((0, _objectSpread5.default)({}, col), {}, {
+    if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
       comName: 'select'
     });
     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, _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
-          return column.field === col.field;
+          return column.field === col.aliaName;
         }) || {};
-        if (col.isReadOnly) customColumn = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, customColumn), {}, {
+        if (col.isReadOnly) customColumn = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, customColumn), {}, {
           editable: false,
           mode: 'grid'
         });
-        _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, (0, _objectSpread5.default)((0, _objectSpread5.default)({}, customColumn), {}, {
-          formItemRewrite: (0, _objectSpread5.default)((0, _objectSpread5.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
+        _defaultValues = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.aliaName, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
+        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
@@ -97,28 +95,29 @@ 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, _objectSpread5.default)((0, _objectSpread5.default)({}, col), {}, {
-        renderBasicFormItem: (0, _objectSpread5.default)({
+      return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
+        renderBasicFormItem: (0, _objectSpread4.default)({
           component: node.type.comName || node.type.displayName
         }, renderBasicFormItem)
       });
     })));
     return _nodes;
-  }, [columns, columnsRewrite, isMain, formMode]);
-  var defaultDataSource = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
+  }();
+  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, _objectSpread5.default)((0, _objectSpread5.default)({
+    return (0, _objectSpread4.default)((0, _objectSpread4.default)({
       api: function api(get, 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);
+        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 = {
@@ -132,26 +131,29 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     }, _onOperate), {}, {
       post: function post(data) {
         var _submitData = data.map(function (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);
+          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,
     rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno'
   }, props, {
-    onQuery: (0, _objectSpread5.default)((0, _objectSpread5.default)({
+    onQuery: (0, _objectSpread4.default)((0, _objectSpread4.default)({
       api: _utils.behaviorCall,
       get: function get(formData) {
-        var _params2;
-        var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), (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;
       }
@@ -166,7 +168,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     }),
     onAdd: onOperate(onAdd, 'add'),
     onUpdate: onOperate(onUpdate, 'update'),
-    onDelete: (0, _objectSpread5.default)((0, _objectSpread5.default)({}, onOperate(onDelete, 'delete')), {}, {
+    onDelete: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, onOperate(onDelete, 'delete')), {}, {
       post: function post(data) {
         var _submitData = data.map(function (item) {
           return {

package/lib/components/LdInfoPanel/index.js

@@ -61,7 +61,7 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
   var _columns = (0, _ahooks.useCreation)(function () {
     return customColumns ? customColumns.map(function (col) {
       var xCol = columns.find(function (column) {
-        return column.field === col.dataIndex;
+        return column.aliaName === col.dataIndex;
       }) || {};
       return (0, _objectSpread2.default)({
         title: xCol.fieldName
@@ -70,7 +70,7 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
       if (item.isShowInForm) {
         result.push({
           title: item.fieldName,
-          dataIndex: item.field
+          dataIndex: item.aliaName
         });
       }
     }, []);

package/lib/helper/FromItems.js

@@ -37,7 +37,7 @@ var _excluded = ["onBlur"],
   _excluded20 = ["handleValueChange", "config"],
   _excluded21 = ["onBlur"],
   _excluded22 = ["handleValueChange", "config"],
-  _excluded23 = ["onBlur", "uid"],
+  _excluded23 = ["onBlur"],
   _excluded24 = ["handleValueChange", "config"];
 var getNumberItem = function getNumberItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -319,11 +319,9 @@ 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 = (0, _objectWithoutProperties2.default)(_ref14$config2, _excluded23),
     props = (0, _objectWithoutProperties2.default)(_ref14, _excluded24);
   return /*#__PURE__*/_react.default.createElement(_base.UploadFormItemV3, (0, _extends2.default)({}, props, {
-    docUid: props.uid,
     config: (0, _objectSpread2.default)((0, _objectSpread2.default)({
       listType: 'picture-card',
       accept: 'image/*'

package/lib/helper/action.js

@@ -75,8 +75,8 @@ var doAction = function doAction(action) {
           moduleCode: moduleCode
         }, get), post).then(function (res) {
           var code = res.code,
-            _data = res.data;
-          callback && callback(code === 1, _data, res);
+            list = res.list;
+          callback && callback(code === 1, list && list[0], res);
           if (code === 1 && showPopWhenSuccess) {
             (0, _utils.showPop)((0, _utils.formatMessage)({
               id: 'app.base.tip.operate.success'
@@ -161,7 +161,8 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
       doAction(action, {
         get: {
           form_id: form_id,
-          effcode: effcode
+          effcode: effcode,
+          mainDataset: mainDataSetKey
         },
         post: backData
       }, {

package/lib/helper/form.js

@@ -69,7 +69,7 @@ function translator() {
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var allConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), JSON.parse(extra || '{}'));
   var _props = {
-    name: allConfig.field,
+    name: allConfig.aliaName,
     label: allConfig.fieldName,
     config: {
       required: !!allConfig.isNotNull,

package/lib/utils/form.js

@@ -38,7 +38,7 @@ function getFormItem() {
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!property) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
-  if (property === 'sint') props.opt_decimal = 0;
+  if (property === 'sint' || property === 'number') props.opt_decimal = 0;
   var _translator = (0, _form.translator)(props),
     name = _translator.name,
     translateProps = (0, _objectWithoutProperties2.default)(_translator, _excluded2);
@@ -133,7 +133,7 @@ var dataFormat = function dataFormat() {
   // 姚小川说：冗余字段后端处理，不需要前端传给后端
   var values = (0, _lodash.clone)(_values);
   var data = (0, _lodash.transform)(propsList, function (result, n) {
-    var _values$name, _values$name2, _values$name$;
+    var _values$name, _values$name2;
     var _ref3 = n || {},
       comName = _ref3.comName,
       property = _ref3.property,
@@ -171,7 +171,7 @@ var dataFormat = function dataFormat() {
         result[name] = values[name] ? (0, _moment.default)(values[name]).format('YYYY') : null;
         break;
       case 'upload':
-        result[name] = values[name] ? (_values$name$ = values[name][0]) === null || _values$name$ === void 0 ? void 0 : _values$name$.name : null;
+        result[name] = values[name] && values[name][0] ? values[name][0].name : null;
         break;
       default:
         result[name] = values[name];

package/lib/utils/grid.js

@@ -40,7 +40,7 @@ function getColumnRender(name, type) {
       break;
     case 'year':
       render = function render(text, record) {
-        return record["".concat(name, "_virtual")] || (text ? (0, _moment.default)(value).format('YYYY-MM-DD') : undefined);
+        return record["".concat(name, "_virtual")] || (text ? (0, _moment.default)(text).format('YYYY-MM-DD') : undefined);
       };
       break;
     case 'user':
@@ -87,7 +87,6 @@ function getColumnRender(name, type) {
   return render;
 }
 var getGridColumn = function getGridColumn() {
-  var _props$config2;
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     comName = _ref.comName,
     property = _ref.property,
@@ -115,6 +114,12 @@ var getGridColumn = function getGridColumn() {
     data.filter = filter;
     data.filterParams = filterParams;
   } else if (!isTreeGrid && !isVirtual) {
+    var _props$config2;
+    if ((_props.mode || ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode)) === 'multiple') {
+      data.field = "".concat(name, "_virtual");
+      data.filter = 'text';
+      return data;
+    }
     switch (comName || _form.defaultComName[property]) {
       case 'switch':
         data.filter = 'select';
@@ -156,7 +161,6 @@ var getGridColumn = function getGridColumn() {
             });
           },
           key: name,
-          mode: _props.mode && ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode),
           filterOption: false
         };
         break;
@@ -164,7 +168,6 @@ var getGridColumn = function getGridColumn() {
       case 'radio':
         data.filter = 'select';
         if (_props.alias) {
-          var _props$config3;
           data.filterParams = {
             options: function options() {
               var _getDvaApp3, _getDvaApp3$_store;
@@ -175,8 +178,7 @@ var getGridColumn = function getGridColumn() {
                 }
               });
             },
-            key: name,
-            mode: _props.mode && ((_props$config3 = _props.config) === null || _props$config3 === void 0 ? void 0 : _props$config3.mode)
+            key: name
           };
         }
         break;
@@ -202,8 +204,7 @@ var getGridColumn = function getGridColumn() {
               }
             });
           },
-          key: name,
-          mode: 'multiple'
+          key: name
         };
         break;
       default: