@luck-design-biz/luckda 0.0.27 → 1.0.0-2-alpha

package/es/components/LdFormList/index.js

@@ -6,15 +6,16 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "apiRef", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading"],
   _excluded2 = ["dataSets", "doAction", "resources"],
-  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
+  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
-import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
-import { connect, getDvaApp, useRouteMatch, useModel } from 'umi';
+import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState, useEffect } from 'react';
+import { connect, getDvaApp, useRouteMatch } from 'umi';
 import PropTypes from 'prop-types';
+import { isArray, sortBy, mapValues, reduce, includes } from 'lodash';
+import { BpmButton } from '@luck-design-biz/bpm';
 import { useCreation, useMemoizedFn, useAsyncEffect } from 'ahooks';
-import { createDeepCompareEffect } from 'ahooks/es/createDeepCompareEffect';
 import { BasicDivider } from 'luck-design';
 import { ChildrenUtil } from '@luck-design-biz/base/utils';
 import { FormList, FormListAffix, FormBtn } from '@luck-design-biz/base/FormList';
@@ -25,11 +26,7 @@ import { LuckDaContext } from "../Builder";
 import { LuckDaPopContext } from "../LdPop";
 import createModel from "./model";
 import { onBatchSubmitAction } from "../../helper/action";
-import { isArray, sortBy, mapValues } from 'lodash';
-import { BpmButton } from '@luck-design-biz/bpm';
-import { readBehaviorCall } from "../../services";
-import { parse, stringify } from 'querystring';
-var useDeepCompareAsyncEffect = createDeepCompareEffect(useAsyncEffect);
+import { callBehavior } from "../../lowcode/engine/provider/ContextProvider/utils";
 
 // 组件
 var LdFormList = function LdFormList(_ref) {
@@ -39,6 +36,7 @@ var LdFormList = function LdFormList(_ref) {
     formMode = _ref.formMode,
     formOperates = _ref.formOperates,
     loading = _ref.loading,
+    apiRef = _ref.apiRef,
     wrapperRef = _ref.wrapperRef,
     readOnly = _ref.readOnly,
     mainFormLdId = _ref.mainFormLdId,
@@ -49,6 +47,7 @@ var LdFormList = function LdFormList(_ref) {
     showSaveBtn = _ref.showSaveBtn,
     saveBtnTitle = _ref.saveBtnTitle,
     affixLayout = _ref.affixLayout,
+    getContainer = _ref.getContainer,
     _ref$onValueChange = _ref.onValueChange,
     onValueChange = _ref$onValueChange === void 0 ? function () {} : _ref$onValueChange,
     afterSubmit = _ref.afterSubmit,
@@ -58,8 +57,11 @@ var LdFormList = function LdFormList(_ref) {
     } : _ref$renderFormExtra,
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
+    setVerifyRules = _ref.setVerifyRules,
+    afterSubmitLoading = _ref.afterSubmitLoading,
     props = _objectWithoutProperties(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
+  var currentValueRef = useRef(null);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     submitLoading = _useState2[0],
@@ -83,8 +85,11 @@ var LdFormList = function LdFormList(_ref) {
     resources = _ref3.resources,
     rest = _objectWithoutProperties(_ref3, _excluded2);
   var formListRef = useRef(null);
-  useImperativeHandle(wrapperRef, function () {
+  useImperativeHandle(apiRef, function () {
     return _objectSpread(_objectSpread({}, formListRef.current), {}, {
+      getCValue: function getCValue() {
+        return currentValueRef.current || props.formData;
+      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         if (props.formMode !== 'add') {
@@ -97,7 +102,8 @@ var LdFormList = function LdFormList(_ref) {
           });
           formListRef.current.doQuery();
         }
-      }
+      },
+      ticketData: props.ticketData
     });
   });
   var handleValueChange = useMemoizedFn(function (change) {
@@ -108,6 +114,7 @@ var LdFormList = function LdFormList(_ref) {
       var getValue = ((_formRefs$key = formRefs[key]) !== null && _formRefs$key !== void 0 && (_formRefs$key = _formRefs$key.formRef) !== null && _formRefs$key !== void 0 && _formRefs$key.current ? formRefs[key].getData : null) || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
       return _defineProperty({}, key, getValue && getValue());
     });
+    currentValueRef.current = data;
     onValueChange(change, data);
   });
   var renderExtra = useMemoizedFn(function (formId, extraConfig, type) {
@@ -126,8 +133,8 @@ var LdFormList = function LdFormList(_ref) {
       placement: luckTheme === 'base' && (affixLayout || defaultLayout) !== 'top' ? 'topRight' : 'bottomRight'
     }, bpmButtonProps)));
   };
-  useDeepCompareAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
+  useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _props$formData$mainF, _params, response, _yield$callBehavior, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -137,13 +144,14 @@ var LdFormList = function LdFormList(_ref) {
           }
           _params = {
             indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
+            mainDataSetKey: mainDataSetKey
+          }; // 请求是否有工作流服务
+          _context.next = 4;
+          return callBehavior({
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
-            mainDataSetKey: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
-          }; // 请求是否有工作流服务
-          _context.next = 4;
-          return readBehaviorCall(_params);
+          }, _params);
         case 4:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
@@ -151,14 +159,15 @@ var LdFormList = function LdFormList(_ref) {
             break;
           }
           _context.next = 8;
-          return readBehaviorCall(_objectSpread(_objectSpread({}, _params), {}, {
-            // bizKey: bizData.bizKey,
+          return callBehavior({
+            moduleCode: rest.moduleCode,
+            datasetCode: mainDataSetKey,
             behaviorKey: 'readBpm'
-          }));
+          }, _params);
         case 8:
-          _yield$readBehaviorCa = _context.sent;
-          code = _yield$readBehaviorCa.code;
-          data = _yield$readBehaviorCa.data;
+          _yield$callBehavior = _context.sent;
+          code = _yield$callBehavior.code;
+          data = _yield$callBehavior.data;
           if (code == 1 && data) {
             bpmInfoObj = data.bpmInfo;
             tempObj = _objectSpread(_objectSpread({}, props.formData[mainFormLdId]), {}, {
@@ -198,6 +207,7 @@ var LdFormList = function LdFormList(_ref) {
       formUid: formUid,
       mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
+      afterSubmitLoading && afterSubmitLoading(res);
       setSubmitLoading(false);
       if (success) {
         var mainFormData = res.detail[res.list[0]];
@@ -226,7 +236,11 @@ var LdFormList = function LdFormList(_ref) {
     renderExtra: renderExtra
   });
   var formList = useCreation(function () {
-    return renderFormList(formConfig);
+    var _list = renderFormList(formConfig);
+    return reduce(_list, function (result, item) {
+      if (!item.serial || item.serialEffect === 'disable' || includes(resources, item.serial)) result.push(item);
+      return result;
+    }, []);
   }, [formConfig]);
   var formExtra = useCreation(function () {
     return renderFormExtra && isArray(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
@@ -244,6 +258,7 @@ var LdFormList = function LdFormList(_ref) {
     })
   }, props, {
     modelName: namespace,
+    wrapperRef: wrapperRef,
     ref: formListRef,
     onAdd: function onAdd(values, other) {
       return handleBatchSubmit(values, 'add', other);
@@ -256,35 +271,38 @@ var LdFormList = function LdFormList(_ref) {
     renderLeft: renderAffixLeft,
     renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
     title: saveBtnTitle,
-    layout: affixLayout || defaultLayout
+    layout: affixLayout || defaultLayout,
+    getContainer: getContainer
   }), sortBy([].concat(_toConsumableArray(formList), _toConsumableArray(formExtra)), function (o) {
     var _o$props;
     return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
   }).map(function (formProps) {
-    if (formProps.dataSetKey) {
+    var _formProps$type = formProps.type,
+      type = _formProps$type === void 0 ? 'auto' : _formProps$type;
+    if (includes(['auto', 'writer', 'grid'], type)) {
       var _ref8 = formProps || {},
         ldId = _ref8.id,
         _ref8$header = _ref8.header,
         header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
         title = _ref8.title,
-        _readOnly = _ref8.readOnly,
+        selfReadOnly = _ref8.readOnly,
         _ref8$extraConfig = _ref8.extraConfig,
         extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
         _ref8$renderTopLeft = _ref8.renderTopLeft,
         _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/React.createElement(React.Fragment, null);
         } : _ref8$renderTopLeft,
+        serial = _ref8.serial,
         _props = _objectWithoutProperties(_ref8, _excluded3);
-      var _props$type = _props.type,
-        type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
+      var _readOnly = selfReadOnly || serial && !includes(resources, serial);
       if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/React.createElement(Collapse, {
         title: title || ldId,
-        extra: type === 'auto' && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
+        extra: type === 'auto' && formProps.dataSetKey && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
         id: ldId,
         key: ldId,
         mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
-      }, renderForm(_objectSpread(_objectSpread({}, _props), {}, {
+      }, formProps.dataSetKey && renderForm(_objectSpread(_objectSpread({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -293,18 +311,19 @@ var LdFormList = function LdFormList(_ref) {
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
           return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
-        }
+        },
+        setVerifyRules: setVerifyRules
       })));
       return /*#__PURE__*/React.createElement(Fragment, {
         key: ldId
       }, header === 'divider' && /*#__PURE__*/React.createElement(BasicDivider, {
         title: title || ldId,
-        id: ldId
-      }), type === 'auto' && /*#__PURE__*/React.createElement("div", {
+        key: "divider|".concat(ldId)
+      }), type === 'auto' && formProps.dataSetKey && /*#__PURE__*/React.createElement("div", {
         style: {
           textAlign: 'right'
         }
-      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
+      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), formProps.dataSetKey && renderForm(_objectSpread(_objectSpread({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -313,7 +332,8 @@ var LdFormList = function LdFormList(_ref) {
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
           return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'), _renderTopLeft()];
-        }
+        },
+        setVerifyRules: setVerifyRules
       })));
     }
     return ChildrenUtil.deepMap(formProps, function (child) {
@@ -407,6 +427,6 @@ Index.defaultProps = {
 };
 export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(Index, _extends({
-    wrapperRef: ref
+    apiRef: ref
   }, props));
 });

package/es/components/LdGrid/index.js

@@ -2,11 +2,11 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "uiSettings", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable"],
+var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "_loading", "loading", "unclosableSet", "onQuery", "doQuery", "pagination", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid", "writable"],
   _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
-import { transform, includes, keyBy, union, keys, isNil } from 'lodash';
+import { transform, includes, keyBy, union, keys, isNil, isFunction } from 'lodash';
 import { useCreation } from 'ahooks';
 import PropTypes from 'prop-types';
 import { build } from '@luck-design-biz/base/Component';
@@ -20,18 +20,18 @@ var LdGrid = function LdGrid(_ref) {
     actions = _ref.actions,
     doAction = _ref.doAction,
     afterInit = _ref.afterInit,
-    _ref$uiSettings = _ref.uiSettings,
-    uiSettings = _ref$uiSettings === void 0 ? {} : _ref$uiSettings,
     namespace = _ref.namespace,
     wrapperRef = _ref.wrapperRef,
     list = _ref.list,
     detail = _ref.detail,
     params = _ref.params,
     filters = _ref.filters,
+    _loading = _ref._loading,
     loading = _ref.loading,
     unclosableSet = _ref.unclosableSet,
     onQuery = _ref.onQuery,
     doQuery = _ref.doQuery,
+    pagination = _ref.pagination,
     current = _ref.pageno,
     pageSize = _ref.pagesize,
     total = _ref.totalCount,
@@ -67,6 +67,16 @@ var LdGrid = function LdGrid(_ref) {
   }, [params, filters]);
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, gridRef.current), {}, {
+      getProps: function getProps() {
+        var _getDvaApp;
+        return {
+          apiUrl: (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 || (_getDvaApp = _getDvaApp._store.getState()[namespace]) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.apiUrl,
+          filter: {
+            filters: filters,
+            params: params
+          }
+        };
+      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         doQuery({
@@ -82,7 +92,6 @@ var LdGrid = function LdGrid(_ref) {
       });
     });
   }, [batchOperations]);
-  var gridPresetData = uiSettings && uiSettings.grid && uiSettings.grid[0] && uiSettings.grid[0].preset ? JSON.parse(uiSettings.grid[0].preset) : {};
 
   /**
    * 优先级
@@ -90,11 +99,16 @@ var LdGrid = function LdGrid(_ref) {
    * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
    */
   var _columns = useCreation(function () {
-    if (columnsReset) return columnsReset;
+    if (columnsReset) {
+      if (isFunction) {
+        return columnsReset(columns);
+      }
+      return columnsReset;
+    }
+    var _columnsRewrite = isFunction(columnsRewrite) ? columnsRewrite(columns) : columnsRewrite;
     var defaultColumns = keyBy(columns, 'aliaName');
-    var customColumns = keyBy(columnsRewrite, 'field');
-    var presetColumns = keyBy(gridPresetData.gridPreset, 'field'); // ui配置的已排序的列
-    var mergeFields = union(keys(presetColumns), keys(defaultColumns), keys(customColumns)); // 以UI配置的列排序
+    var customColumns = keyBy(_columnsRewrite, 'field');
+    var mergeFields = union(keys(customColumns), keys(defaultColumns));
     return transform(mergeFields, function (result, field) {
       var _customColumns$field;
       if ((_customColumns$field = customColumns[field]) !== null && _customColumns$field !== void 0 && _customColumns$field.hide) {
@@ -102,14 +116,9 @@ var LdGrid = function LdGrid(_ref) {
       } else if (!defaultColumns[field]) {
         // 数据集中不存在的字段以自定义的形式展示
         result.push(customColumns[field]);
-      } else if (defaultColumns[field].isShowInGrid) {
-        // 该字段配置的表单显示信息
-        var columnUiData = gridPresetData.gridPreset ? gridPresetData.gridPreset.find(function (c) {
-          return c.field === field;
-        }) : {};
+      } else if (defaultColumns[field].isShowInGrid)
         // 数据集中存在的字段和自定义结合展示
-        result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable, columnUiData));
-      }
+        result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable));
     }, []);
   }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = useCreation(function () {
@@ -135,18 +144,21 @@ var LdGrid = function LdGrid(_ref) {
     unclosableSet: unclosableSet,
     onQuery: onQuery
   });
+
+  // console.log('_columns',columns,_columns)
+
   return /*#__PURE__*/React.createElement(GridList, _extends({
     columns: _columns
     // 资源串、行为配置
     ,
     actionsColumn: _actionsColumn,
     batchOperations: _batchOperations,
-    loading: loading,
-    pagination: isFlow ? false : {
+    loading: _loading || loading,
+    pagination: isFlow ? false : _objectSpread(_objectSpread({}, pagination), {}, {
       total: total,
       current: current,
       pageSize: pageSize
-    },
+    }),
     dataSource: formatDataSource(list, detail),
     resultSet: _resultSet,
     gridId: namespace,
@@ -172,16 +184,17 @@ var LdIndex = function LdIndex(_ref2) {
     props = _objectWithoutProperties(_ref2, _excluded2);
   var isTreeGrid = isNil(_isTreeGrid) ? includes(props.isTree, props.dataSetKey) : _isTreeGrid;
   var Component = useCreation(function () {
-    var _getDvaApp, _getDvaApp2;
-    (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 || _getDvaApp.unmodel(namespace);
-    if (!((_getDvaApp2 = getDvaApp()) !== null && _getDvaApp2 !== void 0 && _getDvaApp2._store.getState()[namespace])) {
-      var _getDvaApp3;
-      (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 || _getDvaApp3.model(createModel(namespace, _objectSpread(_objectSpread({
-        isFlow: isTreeGrid || !!props.isFlow
+    var _getDvaApp2, _getDvaApp3;
+    (_getDvaApp2 = getDvaApp()) === null || _getDvaApp2 === void 0 || _getDvaApp2.unmodel(namespace);
+    if (!((_getDvaApp3 = getDvaApp()) !== null && _getDvaApp3 !== void 0 && _getDvaApp3._store.getState()[namespace])) {
+      var _getDvaApp4, _props$pagination;
+      (_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model(createModel(namespace, _objectSpread(_objectSpread({
+        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
       }, overModel), {}, {
-        dataSetKey: props.dataSetKey,
+        pageSize: overModel.pageSize || ((_props$pagination = props.pagination) === null || _props$pagination === void 0 ? void 0 : _props$pagination.pageSize) || props.pageSize,
+        isFlow: isTreeGrid || !!props.isFlow,
         moduleCode: moduleCode,
-        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid',
+        dataSetKey: props.dataSetKey,
         afterQuery: afterQuery
       })));
     }
@@ -189,7 +202,7 @@ var LdIndex = function LdIndex(_ref2) {
       suppressInit: suppressInit,
       afterInit: props.afterInit
     });
-  }, [namespace]);
+  }, [namespace, props.dataSetKey]);
   return /*#__PURE__*/React.createElement(Component, _extends({
     isTreeGrid: isTreeGrid,
     namespace: namespace
@@ -208,6 +221,14 @@ Index.propTypes = {
   PropTypes.shape({
     field: PropTypes.string.isRequired
   })),
+  pagination: PropTypes.shape({
+    pageSize: PropTypes.number,
+    pageSizeOptions: PropTypes.arrayOf(PropTypes.string),
+    showSizeChanger: PropTypes.bool,
+    showQuickJumper: PropTypes.bool,
+    hideOnSinglePage: PropTypes.bool,
+    simple: PropTypes.bool
+  }),
   batchOperations: PropTypes.array,
   // 批量操作元素
   formatDataSource: PropTypes.func,

package/es/components/LdGridForm/index.js

@@ -2,13 +2,13 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "uiSettings", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode", "fields", "setVerifyRules"];
 import React, { createRef, useContext } from 'react';
-import { transform } from 'lodash';
+import { reduce, keyBy, isEmpty, pick, omit } from 'lodash';
 import classNames from 'classnames';
 import ldBuilder from "../../helper/ldBuilder";
 import { GridForm } from '@luck-design-biz/base/FormList';
-import { getFormColumn, formItemDataFormat, dataFormat, behaviorCall, mergeAndSort } from "../../utils";
+import { getFormColumn, formItemDataFormat, dataFormat, behaviorCall } from "../../utils";
 import { defaultComName } from "../../helper/form";
 import { LuckDaContext } from "../Builder";
 import styles from "./index.less";
@@ -21,12 +21,11 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     actions = _ref$actions === void 0 ? {} : _ref$actions,
     _ref$doAction = _ref.doAction,
     doAction = _ref$doAction === void 0 ? function () {} : _ref$doAction,
-    _ref$uiSettings = _ref.uiSettings,
-    uiSettings = _ref$uiSettings === void 0 ? {} : _ref$uiSettings,
     ldId = _ref.ldId,
     dataSetKey = _ref.dataSetKey,
     _ref$columnsRewrite = _ref.columnsRewrite,
     columnsRewrite = _ref$columnsRewrite === void 0 ? [] : _ref$columnsRewrite,
+    columnsReset = _ref.columnsReset,
     _ref$onQuery = _ref.onQuery,
     onQuery = _ref$onQuery === void 0 ? {} : _ref$onQuery,
     _ref$onAdd = _ref.onAdd,
@@ -52,10 +51,12 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     className = _ref.className,
     formRef = _ref.formRef,
     formMode = _ref.formMode,
+    fields = _ref.fields,
+    setVerifyRules = _ref.setVerifyRules,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useContext(LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = /*#__PURE__*/createRef();
+  var defaultValues = /*#__PURE__*/createRef({});
   var isMain = ldId === mainFormLdId;
   var gridColumns = columns.map(function (col) {
     if ((col.comName || defaultComName[col.property]) === 'radio') return _objectSpread(_objectSpread({}, col), {}, {
@@ -63,12 +64,15 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     });
     return col;
   });
-  var gridPresetData = uiSettings && uiSettings.grid && uiSettings.grid[0] && uiSettings.grid[0].preset ? JSON.parse(uiSettings.grid[0].preset) : {};
-  var mergedArray = mergeAndSort(gridColumns, gridPresetData.gridPreset || [], 'field');
   var _columns = function () {
+    var fieldsObj = keyBy(fields, 'field');
+    var columnsObj = keyBy(gridColumns, 'field');
+    var keys = isEmpty(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
     var _defaultValues = {};
-    var _nodes = transform(mergedArray, function (result, col) {
-      if (col.isShowInForm) {
+    var _nodes = reduce(keys, function (result, key) {
+      var setting = fieldsObj[key];
+      var col = columnsObj[key];
+      if (col !== null && col !== void 0 && col.isShowInForm) {
         var _customColumn;
         var customColumn = columnsRewrite.find(function (column) {
           return column.field === col.aliaName;
@@ -78,21 +82,24 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
           mode: 'grid'
         });
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
-        // 该字段配置的表单显示信息
-        var columnUiData = gridPresetData.gridPreset ? gridPresetData.gridPreset.find(function (c) {
-          return c.field === col.field;
-        }) : {};
-        result.push(getFormColumn(type, col, _objectSpread(_objectSpread({}, customColumn), {}, {
+        var newCol = _objectSpread(_objectSpread({}, col), {}, {
+          setVerifyRules: setVerifyRules,
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
+        });
+        var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip'];
+        result.push(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, defaultSet)), customColumn), {}, {
           formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
             moduleCode: moduleCode,
             formRef: formRef,
-            formMode: formMode
+            formMode: formMode,
+            setting: omit(setting, [].concat(defaultSet, ['uid', 'field']))
           })
-        }), columnUiData));
+        })));
       }
+      return result;
     }, []);
     defaultValues.current = _defaultValues;
-    setFieldProps(_defineProperty({}, ldId, _nodes.map(function (col) {
+    setFieldProps && setFieldProps(_defineProperty({}, ldId, _nodes.map(function (col) {
       var node = col.renderBasicFormItem();
       var renderBasicFormItem = node === null || node === void 0 ? void 0 : node.props;
       return _objectSpread(_objectSpread({}, col), {}, {
@@ -101,9 +108,11 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         }, renderBasicFormItem)
       });
     })));
-    return _nodes;
+    return columnsReset ? columnsReset(_nodes) : _nodes;
   }();
-  var defaultDataSource = _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
+  var defaultDataSource = _objectSpread(_objectSpread({}, formItemDataFormat(columns.map(function (c) {
+    return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
+  }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current));
   var formConfig = {
     formId: ldId,
     columns: _columns,
@@ -133,7 +142,11 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         var _submitData = data.map(function (item) {
           return behaviorKey === 'add' ? _objectSpread(_objectSpread({}, dataFormat(gridColumns, item)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, null)) : dataFormat(gridColumns, item);
         });
-        if (_onOperate !== null && _onOperate !== void 0 && _onOperate.post) return _onOperate.post(_submitData); // 以预设为主
+        if (_onOperate !== null && _onOperate !== void 0 && _onOperate.post) return _onOperate.post({
+          values: data,
+          submitData: _submitData,
+          behaviorKey: behaviorKey
+        }); // 以预设为主
         return _defineProperty({}, dataSetKey, _defineProperty({}, "".concat(behaviorKey, "List"), _submitData));
       }
     });
@@ -143,7 +156,10 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     orderByAdd: "asc",
     rowSelection: true,
     type: type,
-    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno'
+    rowKey: window.appConfig.constraintKeys.PRIMARY || 'indocno',
+    wrapperProps: {
+      id: ldId
+    }
   }, props, {
     onQuery: _objectSpread(_objectSpread({
       api: behaviorCall,
@@ -160,7 +176,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     }, onQuery), {}, {
       format: function format(data) {
         var formItemData = data.map(function (item) {
-          return formItemDataFormat(gridColumns, item);
+          return formItemDataFormat(gridColumns.map(function (c) {
+            return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
+          }), item);
         });
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData); // 以预设为主
         return formItemData;