@luck-design-biz/luckda 0.0.25-9 → 0.0.26

package/es/components/Builder/index.js

@@ -2,17 +2,14 @@ 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 _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { forwardRef, createContext, useState, useRef, useContext } from 'react';
+import React, { forwardRef, createContext, useState, useRef, useEffect } from 'react';
 import { useRequest, useSetState, useMemoizedFn } from 'ahooks';
 import { BasicForm, BasicFormItem } from 'luck-design';
 import LdPop from "../LdPop";
-import { readModlue } from "../../services";
+import { readModlue, readUI } from "../../services";
 import { doAction as doActionUtils } from "../../helper/action";
 import { formatMessage } from '@luck-design-biz/base/utils';
-export var LuckDaContext = /*#__PURE__*/createContext();
-export var useLDCtx = function useLDCtx() {
-  return useContext(LuckDaContext);
-};
+var LuckDaContext = /*#__PURE__*/createContext();
 var builder = function builder(WrappedComponent, moduleCode) {
   var Component = /*#__PURE__*/forwardRef(function (props, ref) {
     if (!moduleCode) return formatMessage({
@@ -31,21 +28,28 @@ var builder = function builder(WrappedComponent, moduleCode) {
     var _useRequest = useRequest(readModlue, {
         defaultParams: [{
           moduleCode: moduleCode
-        }],
-        onSuccess: function onSuccess(res) {
-          var code = res.code,
-            data = res.data;
-          if (code === 1) {
-            setModuleData({
-              actions: data.actions || {},
-              dataSets: data.dataSets || {},
-              isTree: data.isTree || [],
-              resources: data.resources || []
-            });
-          }
-        }
+        }]
+      }),
+      loading1 = _useRequest.loading,
+      moduleResult = _useRequest.data;
+    var _useRequest2 = useRequest(readUI, {
+        defaultParams: [{
+          moduleCode: moduleCode
+        }]
       }),
-      loading = _useRequest.loading;
+      loading2 = _useRequest2.loading,
+      uiResult = _useRequest2.data;
+    useEffect(function () {
+      if (!loading1 && !loading2 && (moduleResult === null || moduleResult === void 0 ? void 0 : moduleResult.code) === 1 && (uiResult === null || uiResult === void 0 ? void 0 : uiResult.code) === 1) {
+        setModuleData({
+          actions: moduleResult.data.actions || {},
+          dataSets: moduleResult.data.dataSets || {},
+          isTree: moduleResult.data.isTree || [],
+          resources: moduleResult.data.resources || [],
+          moduleUiList: uiResult.data.moduleUiList || {}
+        });
+      }
+    }, [loading1, loading2, moduleResult, uiResult]);
     var openPop = useMemoizedFn(function (ldId, params) {
       setPops(function (prev) {
         return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, ldId, _objectSpread(_objectSpread({}, prev[ldId]), params)));
@@ -95,7 +99,7 @@ var builder = function builder(WrappedComponent, moduleCode) {
       var _props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       fieldProps.current = _objectSpread(_objectSpread({}, fieldProps.current), _props);
     };
-    if (loading) return null;
+    if (loading1 || loading2) return null;
     if (!moduleData) return formatMessage({
       id: 'luckda.module.loadFailed',
       label: '模块信息加载失败'
@@ -134,4 +138,5 @@ var builder = function builder(WrappedComponent, moduleCode) {
   });
   return Component;
 };
-export default builder;
+export default builder;
+export { LuckDaContext };

package/es/components/LdAutoForm/index.js

@@ -2,13 +2,12 @@ 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", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules"];
+var _excluded = ["columns", "resources", "actions", "doAction", "uiSettings", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey"];
 import React, { createRef, useContext } from 'react';
-import { reduce, keyBy, isEmpty, pick, union, omit } from 'lodash';
-import { BasicDivider } from 'luck-design';
+import { transform } from 'lodash';
 import { AutoForm } from '@luck-design-biz/base/FormList';
 import ldBuilder from "../../helper/ldBuilder";
-import { getFormItem, formItemDataFormat, dataFormat, behaviorCall } from "../../utils";
+import { getFormItem, formItemDataFormat, dataFormat, behaviorCall, mergeAndSort } from "../../utils";
 import { LuckDaContext } from "../Builder";
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
@@ -19,6 +18,8 @@ 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,
@@ -42,49 +43,38 @@ 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 = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useContext(LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = /*#__PURE__*/createRef({});
+  var defaultValues = /*#__PURE__*/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 = mergeAndSort(columns, formPreset.formFieldPreset || [], 'field');
   var basicItems = function () {
-    var fieldsObj = keyBy(fields, 'field');
-    var columnsObj = keyBy(columns, 'field');
-    var keys = isEmpty(fields) ? Object.keys(columnsObj) : union(Object.keys(fieldsObj), Object.keys(columnsObj));
     var _defaultValues = {};
-    var _nodes = 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.createElement(BasicDivider, {
-          title: setting === null || setting === void 0 ? void 0 : setting.aliasName
-        }));
-      } else if (col !== null && col !== void 0 && col.isShowInForm) {
-        var customFiled = filedsRewrite.find(function (_field) {
-          return _field.name === col.aliaName;
+    var _nodes = transform(mergedArray, function (result, col) {
+      if (col.isShowInForm) {
+        var customFiled = filedsRewrite.find(function (field) {
+          return field.name === col.aliaName;
         }) || {};
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
-        var defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
-        var newCol = _objectSpread(_objectSpread({}, col), {}, {
-          setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
-        }, pick(setting, defaultSet));
-        result.push(getFormItem(newCol, _objectSpread(_objectSpread({
+
+        // 该字段配置的表单显示信息
+        var colUiData = formPreset.formFieldPreset ? formPreset.formFieldPreset.find(function (c) {
+          return c.field === col.field;
+        }) : {};
+        result.push(getFormItem(col, _objectSpread(_objectSpread({
           formId: ldId,
           moduleCode: moduleCode
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.aliaName, value)));
-          },
-          setting: omit(setting, [].concat(defaultSet, ['uid', 'field']))
-        })));
+          }
+        }), colUiData));
       }
-      return result;
     }, []);
     defaultValues.current = _defaultValues;
-    setFieldProps && setFieldProps(_defineProperty({}, ldId, _nodes.map(function (i) {
+    setFieldProps(_defineProperty({}, ldId, _nodes.map(function (i) {
       return _objectSpread({
         component: i.type.comName || i.type.displayName
       }, i.props);
@@ -94,9 +84,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var formConfig = {
     formId: ldId,
     isMain: isMain,
-    defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns.map(function (c) {
-      return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
-    }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
+    defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current)),
+    col: formPreset.formCol
   };
   var onOperate = function onOperate() {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -140,9 +129,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }
     }, onQuery), {}, {
       format: function format(data, res) {
-        var formItemData = _objectSpread({}, formItemDataFormat(columns.map(function (c) {
-          return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
-        }), data));
+        var formItemData = _objectSpread({}, formItemDataFormat(columns, data));
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
         return formItemData;
       }

package/es/components/LdCom/index.js

@@ -3,8 +3,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["options"];
 import React from 'react';
 import { Button, Tabs } from 'luck-design/antd';
-import { Collapse, ButtonRadio } from '@luck-design-biz/base';
-import IconFont from "../IconFont";
+import { Collapse, ButtonRadio, IconFont } from '@luck-design-biz/base';
 import { ldComBuilder, filterOptions, deepFilterCom } from "../../helper/ldComBuild";
 export var LdButton = ldComBuilder(Button);
 export var LdCollapse = ldComBuilder(Collapse);

package/es/components/LdFormList/index.js

@@ -6,16 +6,15 @@ 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", "setVerifyRules"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
   _excluded2 = ["dataSets", "doAction", "resources"],
-  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
+  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded4 = ["ldId", "initData", "overModel"];
-import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState, useEffect } from 'react';
-import { connect, getDvaApp, useRouteMatch } from 'umi';
+import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
+import { connect, getDvaApp, useRouteMatch, useModel } 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';
@@ -26,7 +25,11 @@ import { LuckDaContext } from "../Builder";
 import { LuckDaPopContext } from "../LdPop";
 import createModel from "./model";
 import { onBatchSubmitAction } from "../../helper/action";
-import useTodo from "../../lowcode/engine/tools/useTodo";
+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);
 
 // 组件
 var LdFormList = function LdFormList(_ref) {
@@ -55,10 +58,8 @@ var LdFormList = function LdFormList(_ref) {
     } : _ref$renderFormExtra,
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
-    setVerifyRules = _ref.setVerifyRules,
     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],
@@ -71,10 +72,6 @@ var LdFormList = function LdFormList(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     bizData = _useState6[0],
     setBizData = _useState6[1];
-  var _useTodo = useTodo(),
-    _useTodo2 = _slicedToArray(_useTodo, 2),
-    _ = _useTodo2[0],
-    callBehavior = _useTodo2[1];
   var luckTheme = useCreation(function () {
     return document.body.getAttribute('luck-theme');
   }, []);
@@ -88,9 +85,6 @@ var LdFormList = function LdFormList(_ref) {
   var formListRef = useRef(null);
   useImperativeHandle(wrapperRef, 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') {
@@ -103,8 +97,7 @@ var LdFormList = function LdFormList(_ref) {
           });
           formListRef.current.doQuery();
         }
-      },
-      ticketData: props.ticketData
+      }
     });
   });
   var handleValueChange = useMemoizedFn(function (change) {
@@ -115,7 +108,6 @@ 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) {
@@ -134,8 +126,8 @@ var LdFormList = function LdFormList(_ref) {
       placement: luckTheme === 'base' && (affixLayout || defaultLayout) !== 'top' ? 'topRight' : 'bottomRight'
     }, bpmButtonProps)));
   };
-  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;
+  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;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -145,14 +137,13 @@ 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'
-          }, _params);
+          }; // 请求是否有工作流服务
+          _context.next = 4;
+          return readBehaviorCall(_params);
         case 4:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
@@ -160,15 +151,14 @@ var LdFormList = function LdFormList(_ref) {
             break;
           }
           _context.next = 8;
-          return callBehavior({
-            moduleCode: rest.moduleCode,
-            datasetCode: mainDataSetKey,
+          return readBehaviorCall(_objectSpread(_objectSpread({}, _params), {}, {
+            // bizKey: bizData.bizKey,
             behaviorKey: 'readBpm'
-          }, _params);
+          }));
         case 8:
-          _yield$callBehavior = _context.sent;
-          code = _yield$callBehavior.code;
-          data = _yield$callBehavior.data;
+          _yield$readBehaviorCa = _context.sent;
+          code = _yield$readBehaviorCa.code;
+          data = _yield$readBehaviorCa.data;
           if (code == 1 && data) {
             bpmInfoObj = data.bpmInfo;
             tempObj = _objectSpread(_objectSpread({}, props.formData[mainFormLdId]), {}, {
@@ -236,11 +226,7 @@ var LdFormList = function LdFormList(_ref) {
     renderExtra: renderExtra
   });
   var formList = useCreation(function () {
-    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;
-    }, []);
+    return renderFormList(formConfig);
   }, [formConfig]);
   var formExtra = useCreation(function () {
     return renderFormExtra && isArray(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
@@ -248,7 +234,7 @@ var LdFormList = function LdFormList(_ref) {
   var mainDataSetKey = (_formList$find = formList.find(function (i) {
     return i.id === mainFormLdId;
   })) === null || _formList$find === void 0 ? void 0 : _formList$find.dataSetKey;
-  return formList.length > 0 ? /*#__PURE__*/React.createElement(FormList, _extends({
+  return /*#__PURE__*/React.createElement(FormList, _extends({
     editFlow: true,
     formState: formState,
     formMode: formMode,
@@ -275,32 +261,30 @@ var LdFormList = function LdFormList(_ref) {
     var _o$props;
     return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
   }).map(function (formProps) {
-    var _formProps$type = formProps.type,
-      type = _formProps$type === void 0 ? 'auto' : _formProps$type;
-    if (includes(['auto', 'writer', 'grid'], type)) {
+    if (formProps.dataSetKey) {
       var _ref8 = formProps || {},
         ldId = _ref8.id,
         _ref8$header = _ref8.header,
         header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
         title = _ref8.title,
-        selfReadOnly = _ref8.readOnly,
+        _readOnly = _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' && formProps.dataSetKey && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
+        extra: type === 'auto' && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
         id: ldId,
         key: ldId,
         mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
-      }, formProps.dataSetKey && renderForm(_objectSpread(_objectSpread({}, _props), {}, {
+      }, renderForm(_objectSpread(_objectSpread({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -309,19 +293,18 @@ 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' && formProps.dataSetKey && /*#__PURE__*/React.createElement("div", {
+      }), type === 'auto' && /*#__PURE__*/React.createElement("div", {
         style: {
           textAlign: 'right'
         }
-      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), formProps.dataSetKey && renderForm(_objectSpread(_objectSpread({}, _props), {}, {
+      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -330,8 +313,7 @@ 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) {
@@ -340,7 +322,7 @@ var LdFormList = function LdFormList(_ref) {
         mode: child.props.mode || 'tab'
       }) : child.props);
     })[0];
-  })) : null;
+  }));
 };
 
 // 构建带有model的组件

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", "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", "autoRowClick"],
+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"],
   _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, isFunction } from 'lodash';
+import { transform, includes, keyBy, union, keys, isNil } 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,
@@ -45,8 +45,6 @@ var LdGrid = function LdGrid(_ref) {
     isFlow = _ref.isFlow,
     isTreeGrid = _ref.isTreeGrid,
     writable = _ref.writable,
-    _ref$autoRowClick = _ref.autoRowClick,
-    autoRowClick = _ref$autoRowClick === void 0 ? false : _ref$autoRowClick,
     props = _objectWithoutProperties(_ref, _excluded);
   var gridRef = useRef(null);
   var treeConfig = useCreation(function () {
@@ -67,19 +65,8 @@ var LdGrid = function LdGrid(_ref) {
   useEffect(function () {
     readFilter && readFilter(params, filters);
   }, [params, filters]);
-  useEffect(function () {
-    if (autoRowClick) {
-      if (list[0]) props.onRowClick && props.onRowClick(detail[list[0]], 0);else props.onRowClick && props.onRowClick(null);
-    }
-  }, [list[0]]);
   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
-        };
-      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         doQuery({
@@ -95,6 +82,7 @@ var LdGrid = function LdGrid(_ref) {
       });
     });
   }, [batchOperations]);
+  var gridPresetData = uiSettings && uiSettings.grid && uiSettings.grid[0] && uiSettings.grid[0].preset ? JSON.parse(uiSettings.grid[0].preset) : {};
 
   /**
    * 优先级
@@ -102,16 +90,11 @@ var LdGrid = function LdGrid(_ref) {
    * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
    */
   var _columns = useCreation(function () {
-    if (columnsReset) {
-      if (isFunction) {
-        return columnsReset(columns);
-      }
-      return columnsReset;
-    }
-    var _columnsRewrite = isFunction(columnsRewrite) ? columnsRewrite(columns) : columnsRewrite;
+    if (columnsReset) return columnsReset;
     var defaultColumns = keyBy(columns, 'aliaName');
-    var customColumns = keyBy(_columnsRewrite, 'field');
-    var mergeFields = union(keys(customColumns), keys(defaultColumns));
+    var customColumns = keyBy(columnsRewrite, 'field');
+    var presetColumns = keyBy(gridPresetData.gridPreset, 'field'); // ui配置的已排序的列
+    var mergeFields = union(keys(presetColumns), keys(defaultColumns), keys(customColumns)); // 以UI配置的列排序
     return transform(mergeFields, function (result, field) {
       var _customColumns$field;
       if ((_customColumns$field = customColumns[field]) !== null && _customColumns$field !== void 0 && _customColumns$field.hide) {
@@ -119,9 +102,14 @@ var LdGrid = function LdGrid(_ref) {
       } else if (!defaultColumns[field]) {
         // 数据集中不存在的字段以自定义的形式展示
         result.push(customColumns[field]);
-      } else if (defaultColumns[field].isShowInGrid)
+      } else if (defaultColumns[field].isShowInGrid) {
+        // 该字段配置的表单显示信息
+        var columnUiData = gridPresetData.gridPreset ? gridPresetData.gridPreset.find(function (c) {
+          return c.field === field;
+        }) : {};
         // 数据集中存在的字段和自定义结合展示
-        result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable));
+        result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable, columnUiData));
+      }
     }, []);
   }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = useCreation(function () {
@@ -147,21 +135,18 @@ 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 || loading,
-    pagination: isFlow ? false : _objectSpread({
+    loading: loading,
+    pagination: isFlow ? false : {
       total: total,
       current: current,
       pageSize: pageSize
-    }, pagination),
+    },
     dataSource: formatDataSource(list, detail),
     resultSet: _resultSet,
     gridId: namespace,
@@ -187,16 +172,16 @@ var LdIndex = function LdIndex(_ref2) {
     props = _objectWithoutProperties(_ref2, _excluded2);
   var isTreeGrid = isNil(_isTreeGrid) ? includes(props.isTree, props.dataSetKey) : _isTreeGrid;
   var Component = useCreation(function () {
-    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;
-      (_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model(createModel(namespace, _objectSpread(_objectSpread({
-        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
+    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
       }, overModel), {}, {
-        isFlow: isTreeGrid || !!props.isFlow,
-        moduleCode: moduleCode,
         dataSetKey: props.dataSetKey,
+        moduleCode: moduleCode,
+        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid',
         afterQuery: afterQuery
       })));
     }
@@ -204,7 +189,7 @@ var LdIndex = function LdIndex(_ref2) {
       suppressInit: suppressInit,
       afterInit: props.afterInit
     });
-  }, [namespace, props.dataSetKey]);
+  }, [namespace]);
   return /*#__PURE__*/React.createElement(Component, _extends({
     isTreeGrid: isTreeGrid,
     namespace: namespace
@@ -223,14 +208,6 @@ 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,