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

package/lib/components/LdAutoForm/index.js

@@ -12,11 +12,24 @@ var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _lodash = require("lodash");
+var _luckDesign = require("luck-design");
 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", "uiSettings", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules"];
+var didMount = false;
+var debounceFunc = (0, _lodash.debounce)(function (fields, changedValues, allValues, props) {
+  (0, _lodash.forEach)(changedValues, function (val, key) {
+    var _field$events;
+    var field = fields.find(function (f) {
+      return f.field === key;
+    });
+    if (field !== null && field !== void 0 && (_field$events = field.events) !== null && _field$events !== void 0 && _field$events.onValueChange) {
+      field.events.onValueChange(val, key, allValues, props);
+    }
+  });
+}, 300);
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -26,8 +39,6 @@ var buildLdAutoForm = function buildLdAutoForm(_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$filedsRewrite = _ref.filedsRewrite,
@@ -51,38 +62,49 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
     _ref$relationKey = _ref.relationKey,
     relationKey = _ref$relationKey === void 0 ? window.appConfig.constraintKeys.PRIMARY : _ref$relationKey,
+    fields = _ref.fields,
+    setVerifyRules = _ref.setVerifyRules,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = /*#__PURE__*/(0, _react.createRef)();
+  var defaultValues = /*#__PURE__*/(0, _react.createRef)({});
   var isMain = ldId === mainFormLdId;
-  var formPreset = uiSettings && uiSettings.form && uiSettings.form[0] && uiSettings.form[0].preset ? JSON.parse(uiSettings.form[0].preset) : {};
-  var mergedArray = (0, _utils.mergeAndSort)(columns, formPreset.formFieldPreset || [], 'field');
   var basicItems = function () {
+    var fieldsObj = (0, _lodash.keyBy)(fields, 'field');
+    var columnsObj = (0, _lodash.keyBy)(columns, 'field');
+    var keys = (0, _lodash.isEmpty)(fields) ? Object.keys(columnsObj) : (0, _lodash.union)(Object.keys(fieldsObj), Object.keys(columnsObj));
     var _defaultValues = {};
-    var _nodes = (0, _lodash.transform)(mergedArray, function (result, col) {
-      if (col.isShowInForm) {
-        var customFiled = filedsRewrite.find(function (field) {
-          return field.name === col.aliaName;
+    var _nodes = (0, _lodash.reduce)(keys, function (result, key) {
+      var setting = fieldsObj[key];
+      var col = columnsObj[key];
+      if ((setting === null || setting === void 0 ? void 0 : setting._type) === 'divider') {
+        result.push( /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
+          title: setting === null || setting === void 0 ? void 0 : setting.fieldAliasName
+        }));
+      } else if (col !== null && col !== void 0 && col.isShowInForm && setting !== null && setting !== void 0 && setting.isShow) {
+        var customFiled = filedsRewrite.find(function (_field) {
+          return _field.name === col.aliaName;
         }) || {};
         _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
-
-        // 该字段配置的表单显示信息
-        var colUiData = formPreset.formFieldPreset ? formPreset.formFieldPreset.find(function (c) {
-          return c.field === col.field;
-        }) : {};
-        result.push((0, _utils.getFormItem)(col, (0, _objectSpread3.default)((0, _objectSpread3.default)({
+        var defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
+        var newCol = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, col), {}, {
+          setVerifyRules: setVerifyRules,
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
+        }, (0, _lodash.pick)(setting, defaultSet));
+        result.push((0, _utils.getFormItem)(newCol, (0, _objectSpread3.default)((0, _objectSpread3.default)({
           formId: ldId,
           moduleCode: moduleCode
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.aliaName, value)));
-          }
-        }), colUiData));
+          },
+          setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field']))
+        })));
       }
+      return result;
     }, []);
     defaultValues.current = _defaultValues;
-    setFieldProps((0, _defineProperty2.default)({}, ldId, _nodes.map(function (i) {
+    setFieldProps && setFieldProps((0, _defineProperty2.default)({}, ldId, _nodes.map(function (i) {
       return (0, _objectSpread3.default)({
         component: i.type.comName || i.type.displayName
       }, i.props);
@@ -92,8 +114,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var formConfig = {
     formId: ldId,
     isMain: isMain,
-    defaultDataSource: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current)),
-    col: formPreset.formCol
+    defaultDataSource: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns.map(function (c) {
+      return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
+    }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
   };
   var onOperate = function onOperate() {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -127,6 +150,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     });
   };
   return /*#__PURE__*/_react.default.createElement(_FormList.AutoForm, (0, _extends2.default)({}, props, {
+    onDataLoaded: function onDataLoaded() {
+      didMount = true;
+    },
     onQuery: (0, _objectSpread3.default)((0, _objectSpread3.default)({
       api: _utils.behaviorCall,
       get: function get(formData) {
@@ -137,14 +163,23 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }
     }, onQuery), {}, {
       format: function format(data, res) {
-        var formItemData = (0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, data));
+        var formItemData = (0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns.map(function (c) {
+          return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
+        }), data));
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
         return formItemData;
       }
     })
     // onAdd={onOperate(onAdd, 'add')}
     ,
-    onUpdate: onOperate(onUpdate, 'update')
+    onUpdate: onOperate(onUpdate, 'update'),
+    formOption: {
+      onValuesChange: function onValuesChange(props, changedValues, allValues) {
+        if (didMount) {
+          debounceFunc(fields, changedValues, allValues, props);
+        }
+      }
+    }
   }, formConfig), basicItems);
 };
 var _default = exports.default = (0, _ldBuilder.default)(buildLdAutoForm);

package/lib/components/LdCom/index.js

@@ -10,6 +10,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _antd = require("luck-design/antd");
 var _base = require("@luck-design-biz/base");
+var _IconFont = _interopRequireDefault(require("../IconFont"));
 var _ldComBuild = require("../../helper/ldComBuild");
 var _excluded = ["options"];
 var LdButton = exports.LdButton = (0, _ldComBuild.ldComBuilder)(_antd.Button);
@@ -22,7 +23,7 @@ var LdButtonRadio = exports.LdButtonRadio = function LdButtonRadio(_ref) {
     options: (0, _ldComBuild.filterOptions)(options)
   }));
 };
-var LdIconFont = exports.LdIconFont = (0, _ldComBuild.ldComBuilder)(_base.IconFont);
+var LdIconFont = exports.LdIconFont = (0, _ldComBuild.ldComBuilder)(_IconFont.default);
 var LdTabs = exports.LdTabs = (0, _ldComBuild.deepFilterCom)(_antd.Tabs, function (child) {
   var _child$type;
   return (child === null || child === void 0 || (_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'TabPane';

package/lib/components/LdFormList/index.js

@@ -17,8 +17,9 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireWildcard(require("react"));
 var _umi = require("umi");
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _lodash = require("lodash");
+var _bpm = require("@luck-design-biz/bpm");
 var _ahooks = require("ahooks");
-var _createDeepCompareEffect = require("ahooks/es/createDeepCompareEffect");
 var _luckDesign = require("luck-design");
 var _utils = require("@luck-design-biz/base/utils");
 var _FormList = require("@luck-design-biz/base/FormList");
@@ -29,16 +30,11 @@ var _Builder = require("../Builder");
 var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
-var _lodash = require("lodash");
-var _bpm = require("@luck-design-biz/bpm");
-var _services = require("../../services");
-var _querystring = require("querystring");
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
+var _utils2 = require("../../lowcode/engine/provider/ContextProvider/utils");
+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"];
-var useDeepCompareAsyncEffect = (0, _createDeepCompareEffect.createDeepCompareEffect)(_ahooks.useAsyncEffect);
-
 // 组件
 var LdFormList = function LdFormList(_ref) {
   var _formList$find;
@@ -47,6 +43,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,
@@ -57,6 +54,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,
@@ -66,8 +64,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 = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
+  var currentValueRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     submitLoading = _useState2[0],
@@ -91,8 +92,11 @@ var LdFormList = function LdFormList(_ref) {
     resources = _ref3.resources,
     rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
   var formListRef = (0, _react.useRef)(null);
-  (0, _react.useImperativeHandle)(wrapperRef, function () {
+  (0, _react.useImperativeHandle)(apiRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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') {
@@ -105,7 +109,8 @@ var LdFormList = function LdFormList(_ref) {
           });
           formListRef.current.doQuery();
         }
-      }
+      },
+      ticketData: props.ticketData
     });
   });
   var handleValueChange = (0, _ahooks.useMemoizedFn)(function (change) {
@@ -116,6 +121,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 (0, _defineProperty2.default)({}, key, getValue && getValue());
     });
+    currentValueRef.current = data;
     onValueChange(change, data);
   });
   var renderExtra = (0, _ahooks.useMemoizedFn)(function (formId, extraConfig, type) {
@@ -134,8 +140,8 @@ var LdFormList = function LdFormList(_ref) {
       placement: luckTheme === 'base' && (affixLayout || defaultLayout) !== 'top' ? 'topRight' : 'bottomRight'
     }, bpmButtonProps)));
   };
-  useDeepCompareAsyncEffect( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
+  (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _props$formData$mainF, _params, response, _yield$callBehavior, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -145,13 +151,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 (0, _utils2.callBehavior)({
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
-            mainDataSetKey: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
-          }; // 请求是否有工作流服务
-          _context.next = 4;
-          return (0, _services.readBehaviorCall)(_params);
+          }, _params);
         case 4:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
@@ -159,14 +166,15 @@ var LdFormList = function LdFormList(_ref) {
             break;
           }
           _context.next = 8;
-          return (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _params), {}, {
-            // bizKey: bizData.bizKey,
+          return (0, _utils2.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 = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.formData[mainFormLdId]), {}, {
@@ -206,6 +214,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]];
@@ -234,7 +243,11 @@ var LdFormList = function LdFormList(_ref) {
     renderExtra: renderExtra
   });
   var formList = (0, _ahooks.useCreation)(function () {
-    return renderFormList(formConfig);
+    var _list = renderFormList(formConfig);
+    return (0, _lodash.reduce)(_list, function (result, item) {
+      if (!item.serial || item.serialEffect === 'disable' || (0, _lodash.includes)(resources, item.serial)) result.push(item);
+      return result;
+    }, []);
   }, [formConfig]);
   var formExtra = (0, _ahooks.useCreation)(function () {
     return renderFormExtra && (0, _lodash.isArray)(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
@@ -252,6 +265,7 @@ var LdFormList = function LdFormList(_ref) {
     })
   }, props, {
     modelName: namespace,
+    wrapperRef: wrapperRef,
     ref: formListRef,
     onAdd: function onAdd(values, other) {
       return handleBatchSubmit(values, 'add', other);
@@ -264,35 +278,38 @@ var LdFormList = function LdFormList(_ref) {
     renderLeft: renderAffixLeft,
     renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
     title: saveBtnTitle,
-    layout: affixLayout || defaultLayout
+    layout: affixLayout || defaultLayout,
+    getContainer: getContainer
   }), (0, _lodash.sortBy)([].concat((0, _toConsumableArray2.default)(formList), (0, _toConsumableArray2.default)(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 ((0, _lodash.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.default.createElement(_react.default.Fragment, null);
         } : _ref8$renderTopLeft,
+        serial = _ref8.serial,
         _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
-      var _props$type = _props.type,
-        type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
+      var _readOnly = selfReadOnly || serial && !(0, _lodash.includes)(resources, serial);
       if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.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((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+      }, formProps.dataSetKey && renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -301,18 +318,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.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", {
+        key: "divider|".concat(ldId)
+      }), type === 'auto' && formProps.dataSetKey && /*#__PURE__*/_react.default.createElement("div", {
         style: {
           textAlign: 'right'
         }
-      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), formProps.dataSetKey && renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -321,7 +339,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 _utils.ChildrenUtil.deepMap(formProps, function (child) {
@@ -415,6 +434,6 @@ Index.defaultProps = {
 };
 var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({
-    wrapperRef: ref
+    apiRef: ref
   }, props));
 });

package/lib/components/LdGrid/index.js

@@ -20,7 +20,7 @@ var _List = require("@luck-design-biz/base/List");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils = require("../../utils");
 var _model = _interopRequireDefault(require("./model"));
-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"];
 var LdGrid = function LdGrid(_ref) {
   var columns = _ref.columns,
@@ -28,18 +28,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,
@@ -75,6 +75,16 @@ var LdGrid = function LdGrid(_ref) {
   }, [params, filters]);
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, gridRef.current), {}, {
+      getProps: function getProps() {
+        var _getDvaApp;
+        return {
+          apiUrl: (_getDvaApp = (0, _umi.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({
@@ -90,7 +100,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) : {};
 
   /**
    * 优先级
@@ -98,11 +107,16 @@ var LdGrid = function LdGrid(_ref) {
    * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
    */
   var _columns = (0, _ahooks.useCreation)(function () {
-    if (columnsReset) return columnsReset;
+    if (columnsReset) {
+      if (_lodash.isFunction) {
+        return columnsReset(columns);
+      }
+      return columnsReset;
+    }
+    var _columnsRewrite = (0, _lodash.isFunction)(columnsRewrite) ? columnsRewrite(columns) : columnsRewrite;
     var defaultColumns = (0, _lodash.keyBy)(columns, 'aliaName');
-    var customColumns = (0, _lodash.keyBy)(columnsRewrite, 'field');
-    var presetColumns = (0, _lodash.keyBy)(gridPresetData.gridPreset, 'field'); // ui配置的已排序的列
-    var mergeFields = (0, _lodash.union)((0, _lodash.keys)(presetColumns), (0, _lodash.keys)(defaultColumns), (0, _lodash.keys)(customColumns)); // 以UI配置的列排序
+    var customColumns = (0, _lodash.keyBy)(_columnsRewrite, 'field');
+    var mergeFields = (0, _lodash.union)((0, _lodash.keys)(customColumns), (0, _lodash.keys)(defaultColumns));
     return (0, _lodash.transform)(mergeFields, function (result, field) {
       var _customColumns$field;
       if ((_customColumns$field = customColumns[field]) !== null && _customColumns$field !== void 0 && _customColumns$field.hide) {
@@ -110,14 +124,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((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable, columnUiData));
-      }
+        result.push((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable));
     }, []);
   }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = (0, _ahooks.useCreation)(function () {
@@ -143,18 +152,21 @@ var LdGrid = function LdGrid(_ref) {
     unclosableSet: unclosableSet,
     onQuery: onQuery
   });
+
+  // console.log('_columns',columns,_columns)
+
   return /*#__PURE__*/_react.default.createElement(_List.GridList, (0, _extends2.default)({
     columns: _columns
     // 资源串、行为配置
     ,
     actionsColumn: _actionsColumn,
     batchOperations: _batchOperations,
-    loading: loading,
-    pagination: isFlow ? false : {
+    loading: _loading || loading,
+    pagination: isFlow ? false : (0, _objectSpread2.default)((0, _objectSpread2.default)({}, pagination), {}, {
       total: total,
       current: current,
       pageSize: pageSize
-    },
+    }),
     dataSource: formatDataSource(list, detail),
     resultSet: _resultSet,
     gridId: namespace,
@@ -180,16 +192,17 @@ var LdIndex = function LdIndex(_ref2) {
     props = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
   var isTreeGrid = (0, _lodash.isNil)(_isTreeGrid) ? (0, _lodash.includes)(props.isTree, props.dataSetKey) : _isTreeGrid;
   var Component = (0, _ahooks.useCreation)(function () {
-    var _getDvaApp, _getDvaApp2;
-    (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 || _getDvaApp.unmodel(namespace);
-    if (!((_getDvaApp2 = (0, _umi.getDvaApp)()) !== null && _getDvaApp2 !== void 0 && _getDvaApp2._store.getState()[namespace])) {
-      var _getDvaApp3;
-      (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 || _getDvaApp3.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        isFlow: isTreeGrid || !!props.isFlow
+    var _getDvaApp2, _getDvaApp3;
+    (_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 || _getDvaApp2.unmodel(namespace);
+    if (!((_getDvaApp3 = (0, _umi.getDvaApp)()) !== null && _getDvaApp3 !== void 0 && _getDvaApp3._store.getState()[namespace])) {
+      var _getDvaApp4, _props$pagination;
+      (_getDvaApp4 = (0, _umi.getDvaApp)()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        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
       })));
     }
@@ -197,7 +210,7 @@ var LdIndex = function LdIndex(_ref2) {
       suppressInit: suppressInit,
       afterInit: props.afterInit
     });
-  }, [namespace]);
+  }, [namespace, props.dataSetKey]);
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
     isTreeGrid: isTreeGrid,
     namespace: namespace
@@ -216,6 +229,14 @@ Index.propTypes = {
   _propTypes.default.shape({
     field: _propTypes.default.string.isRequired
   })),
+  pagination: _propTypes.default.shape({
+    pageSize: _propTypes.default.number,
+    pageSizeOptions: _propTypes.default.arrayOf(_propTypes.default.string),
+    showSizeChanger: _propTypes.default.bool,
+    showQuickJumper: _propTypes.default.bool,
+    hideOnSinglePage: _propTypes.default.bool,
+    simple: _propTypes.default.bool
+  }),
   batchOperations: _propTypes.default.array,
   // 批量操作元素
   formatDataSource: _propTypes.default.func,