@luck-design-biz/luckda 1.0.2-2 → 1.0.2-20temp

package/es/utils/grid.js

@@ -109,6 +109,11 @@ var getAlign = function getAlign(extraData, alignClass) {
       return 'left';
   }
 };
+export var getExportField = function getExportField(name, type, props) {
+  var _props$config2;
+  if (type === 'number' && (_props$config2 = props.config) !== null && _props$config2 !== void 0 && _props$config2.precision || ['date', 'user', 'select', 'group', 'region', 'upload'].includes(type)) return "".concat(name, "_virtual");
+  return;
+};
 export var getGridColumn = function getGridColumn() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     comName = _ref.comName,
@@ -117,12 +122,13 @@ export var getGridColumn = function getGridColumn() {
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
   var writable = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  var gridUiPreset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   var comType = comName || defaultComName[property];
   var _props$isVirtual = props.isVirtual,
     isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual,
     _props$extra = props.extra,
     extra = _props$extra === void 0 ? '{}' : _props$extra;
-  var _translator = translator(props),
+  var _translator = translator(_objectSpread(_objectSpread({}, props), gridUiPreset)),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
   var _merge = merge(translateProps, formatCustomProps(comType, customProps)),
@@ -132,6 +138,7 @@ export var getGridColumn = function getGridColumn() {
   var _extra = JSON.parse(extra) || {};
   var data = _objectSpread(_objectSpread({}, _props), {}, {
     field: name,
+    exportField: getExportField(name, comName || defaultComName[property], _props),
     title: _props.fieldAliasName || _props.label,
     headerAlign: _props.headerAlign || getAlign(_extra, 'sheading_alignment_virtual'),
     align: _props.align || getAlign(_extra, 'scell_alignment_virtual'),
@@ -144,8 +151,8 @@ export var getGridColumn = function getGridColumn() {
     data.filter = filter;
     data.filterParams = filterParams;
   } else if (!isTreeGrid && !isVirtual) {
-    var _props$config2;
-    if ((_props.mode || ((_props$config2 = _props.config) === null || _props$config2 === void 0 ? void 0 : _props$config2.mode)) === 'multiple') {
+    var _props$config3;
+    if ((_props.mode || ((_props$config3 = _props.config) === null || _props$config3 === void 0 ? void 0 : _props$config3.mode)) === 'multiple') {
       data.field = "".concat(name, "_virtual");
       data.filter = 'text';
       return data;
@@ -196,6 +203,7 @@ export var getGridColumn = function getGridColumn() {
         break;
       case 'select':
       case 'radio':
+      case 'dict':
         data.filter = 'select';
         if (_props.alias) {
           data.filterParams = {
@@ -269,6 +277,7 @@ export var getGridColumn = function getGridColumn() {
         case 'select':
         case 'group':
         case 'complex':
+        case 'dict':
           if (translateProps.multiple) {
             formItemProps = {
               dataFormat: function dataFormat(value) {

package/lib/components/Builder/index.js

@@ -20,8 +20,9 @@ var _LdPop = _interopRequireDefault(require("../LdPop"));
 var _services = require("../../services");
 var _action2 = require("../../helper/action");
 var LuckDaContext = exports.LuckDaContext = /*#__PURE__*/(0, _react.createContext)();
-var useLDCtx = exports.useLDCtx = function useLDCtx() {
-  return (0, _react.useContext)(LuckDaContext);
+var useLDCtx = exports.useLDCtx = function useLDCtx(pageProxy) {
+  var ctx = (0, _react.useContext)(LuckDaContext);
+  return ctx[(pageProxy === null || pageProxy === void 0 ? void 0 : pageProxy.proxyCode) || 'master'];
 };
 var builder = function builder(WrappedComponent, moduleCode) {
   var Component = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
@@ -51,21 +52,28 @@ var builder = function builder(WrappedComponent, moduleCode) {
     var _useRequest = (0, _ahooks.useRequest)(_services.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 || []
-            });
-          }
-        }
+        }]
+      }),
+      loading = _useRequest.loading,
+      moduleResult = _useRequest.data;
+    var _useRequest2 = (0, _ahooks.useRequest)(_services.readUI, {
+        defaultParams: [{
+          moduleCode: moduleCode
+        }]
       }),
-      loading = _useRequest.loading;
+      loading1 = _useRequest2.loading,
+      uiResult = _useRequest2.data;
+    (0, _react.useEffect)(function () {
+      if (!loading && !loading1 && (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 || {}
+        });
+      }
+    }, [loading, loading1, moduleResult, uiResult]);
     var openPop = (0, _ahooks.useMemoizedFn)(function (ldId, params) {
       setPops(function (prev) {
         return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, prev), {}, (0, _defineProperty2.default)({}, ldId, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, prev[ldId]), params)));
@@ -115,8 +123,8 @@ var builder = function builder(WrappedComponent, moduleCode) {
       var _props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       fieldProps.current = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, fieldProps.current), _props);
     };
-    if (loading) return null;
-    if (!moduleData) return (0, _utils.formatMessage)({
+    if (loading || loading1) return null;
+    if (!moduleData) if (!moduleData) return (0, _utils.formatMessage)({
       id: 'luckda.module.loadFailed',
       label: '模块信息加载失败'
     });
@@ -125,14 +133,16 @@ var builder = function builder(WrappedComponent, moduleCode) {
       label: '模块缺少数据集'
     });
     return /*#__PURE__*/_react.default.createElement(LuckDaContext.Provider, {
-      value: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, moduleData), {}, {
-        doAction: doAction,
-        openPop: openPop,
-        closePop: closePop,
-        readFieldProps: readFieldProps,
-        setFieldProps: setFieldProps,
-        moduleCode: moduleCode
-      })
+      value: {
+        master: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, moduleData), {}, {
+          doAction: doAction,
+          openPop: openPop,
+          closePop: closePop,
+          readFieldProps: readFieldProps,
+          setFieldProps: setFieldProps,
+          moduleCode: moduleCode
+        })
+      }
     }, /*#__PURE__*/_react.default.createElement(WrappedComponent, (0, _extends2.default)({
       ref: ref
     }, moduleData || {}, {

package/lib/components/ComplexItem/index.js

@@ -49,7 +49,7 @@ var Index = function Index(_ref) {
     keyName: keyField,
     titleKey: "title",
     api: ( /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(get) {
+      var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(get, post) {
         var res, formatData, detail;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -58,7 +58,9 @@ var Index = function Index(_ref) {
               return (0, _service.fetchContent)(dataModel, (0, _objectSpread2.default)({
                 datasetCode: dataSetCode,
                 moduleCode: moduleCode
-              }, get));
+              }, get), {
+                _AutoFilter: post
+              });
             case 2:
               res = _context.sent;
               formatData = (res === null || res === void 0 ? void 0 : res.data.map(function (i) {
@@ -79,7 +81,7 @@ var Index = function Index(_ref) {
           }
         }, _callee);
       }));
-      return function (_x) {
+      return function (_x, _x2) {
         return _ref2.apply(this, arguments);
       };
     }()),

package/lib/components/ComplexItem/service.js

@@ -11,18 +11,21 @@ var _qs = require("qs");
 var _utils = require("@luck-design-biz/base/utils");
 var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
 var fetchContent = exports.fetchContent = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(dmCode, get) {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(dmCode, get, post) {
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.API_HOST, "/").concat(dmCode, "/ui/builder/complex/noAuthFetchContent?").concat((0, _qs.stringify)(get))));
+          return _context.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.API_HOST, "/").concat(dmCode, "/ui/builder/complex/noAuthFetchContent?").concat((0, _qs.stringify)(get)), {
+            method: 'POST',
+            body: post
+          }));
         case 1:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return function fetchContent(_x, _x2) {
+  return function fetchContent(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();

package/lib/components/LDActions/index.js

@@ -36,6 +36,7 @@ var DisplayComp = function DisplayComp(_ref) {
   return /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _extends2.default)({}, props, {
     disabled: action.serialEffect === 'disable',
     className: (0, _classnames.default)(_index.default[action.riskLevel], (0, _defineProperty2.default)({}, className, !!className)),
+    type: action.riskLevel,
     onClick: onClick
   }), children);
 };

package/lib/components/LdAutoForm/index.js

@@ -17,7 +17,7 @@ var _FormList = require("@luck-design-biz/base/FormList");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils = require("../../utils");
 var _Builder = require("../Builder");
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules"];
+var _excluded = ["columns", "resources", "actions", "doAction", "uiSettings", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules", "pageProxy"];
 var didMount = false;
 var debounceFunc = (0, _lodash.debounce)(function (fields, changedValues, allValues, props) {
   (0, _lodash.forEach)(changedValues, function (val, key) {
@@ -39,6 +39,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,
@@ -65,14 +67,17 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     _ref$fields = _ref.fields,
     fields = _ref$fields === void 0 ? [] : _ref$fields,
     setVerifyRules = _ref.setVerifyRules,
+    pageProxy = _ref.pageProxy,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
+  var _ref2 = (0, _Builder.useLDCtx)(pageProxy) || {},
     setFieldProps = _ref2.setFieldProps;
   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 basicItems = function () {
     var fieldsObj = (0, _lodash.keyBy)(fields, 'field');
-    var columnsObj = (0, _lodash.keyBy)(columns, 'field');
+    var mergedArray = (0, _utils.mergeAndSort)(columns, formPreset.formFieldPreset || [], 'field');
+    var columnsObj = (0, _lodash.keyBy)(mergedArray, '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.reduce)(keys, function (result, key) {
@@ -93,6 +98,10 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           setVerifyRules: setVerifyRules,
           fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
         }, (0, _lodash.pick)(setting, defaultSet));
+        // 该字段配置的表单显示信息
+        var colUiData = formPreset.formFieldPreset ? formPreset.formFieldPreset.find(function (c) {
+          return c.field === col.field;
+        }) : {};
         result.push((0, _utils.getFormItem)(newCol, (0, _objectSpread3.default)((0, _objectSpread3.default)({
           formId: ldId,
           moduleCode: moduleCode
@@ -101,7 +110,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
             return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.aliaName, value)));
           },
           setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field']))
-        })));
+        }), colUiData));
       }
       return result;
     }, []);
@@ -118,7 +127,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     isMain: isMain,
     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))
+    }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current)),
+    col: formPreset.formCol
   };
   var onOperate = function onOperate() {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};

package/lib/components/LdCard/index.js

@@ -112,11 +112,13 @@ var LdCard = function LdCard(_ref2) {
           }
         };
       },
-      onLdQuery: function onLdQuery() {
-        var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        doQuery({
+      onLdQuery: function onLdQuery(_params) {
+        var _getDvaApp2;
+        if (_params) doQuery({
           params: _params,
           callback: afterInit
+        });else (_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 || _getDvaApp2._store.dispatch({
+          type: "".concat(namespace, "/doQuery")
         });
       }
     });
@@ -228,11 +230,11 @@ var LdIndex = function LdIndex(_ref4) {
     label: '此数据集为树形数据集，请选择非树形数据集'
   });
   var Component = (0, _ahooks.useCreation)(function () {
-    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;
-      (_getDvaApp4 = (0, _umi.getDvaApp)()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    var _getDvaApp3, _getDvaApp4;
+    (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 || _getDvaApp3.unmodel(namespace);
+    if (!((_getDvaApp4 = (0, _umi.getDvaApp)()) !== null && _getDvaApp4 !== void 0 && _getDvaApp4._store.getState()[namespace])) {
+      var _getDvaApp5;
+      (_getDvaApp5 = (0, _umi.getDvaApp)()) === null || _getDvaApp5 === void 0 || _getDvaApp5.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         isFlow: !!props.isFlow
       }, overModel), {}, {
         dataSetKey: props.dataSetKey,

package/lib/components/LdCom/index.js

@@ -12,15 +12,16 @@ 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 _excluded = ["options", "pageProxy"];
 var LdButton = exports.LdButton = (0, _ldComBuild.ldComBuilder)(_antd.Button);
 var LdCollapse = exports.LdCollapse = (0, _ldComBuild.ldComBuilder)(_base.Collapse);
 var LdButtonRadio = exports.LdButtonRadio = function LdButtonRadio(_ref) {
   var _ref$options = _ref.options,
     options = _ref$options === void 0 ? [] : _ref$options,
+    pageProxy = _ref.pageProxy,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   return /*#__PURE__*/_react.default.createElement(_base.ButtonRadio, (0, _extends2.default)({}, props, {
-    options: (0, _ldComBuild.filterOptions)(options)
+    options: (0, _ldComBuild.filterOptions)(options, pageProxy)
   }));
 };
 var LdIconFont = exports.LdIconFont = (0, _ldComBuild.ldComBuilder)(_IconFont.default);

package/lib/components/LdFormList/index.js

@@ -31,7 +31,7 @@ var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
 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", "showConfigBtn", "affixBarZIndex"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "apiRef", "wrapperRef", "pageProxy", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "getContainer", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules", "afterSubmitLoading", "validateErrorCallback", "showConfigBtn", "affixBarZIndex"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
@@ -45,6 +45,7 @@ var LdFormList = function LdFormList(_ref) {
     loading = _ref.loading,
     apiRef = _ref.apiRef,
     wrapperRef = _ref.wrapperRef,
+    pageProxy = _ref.pageProxy,
     readOnly = _ref.readOnly,
     mainFormLdId = _ref.mainFormLdId,
     renderFormList = _ref.renderFormList,
@@ -66,6 +67,7 @@ var LdFormList = function LdFormList(_ref) {
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     setVerifyRules = _ref.setVerifyRules,
     afterSubmitLoading = _ref.afterSubmitLoading,
+    validateErrorCallback = _ref.validateErrorCallback,
     _ref$showConfigBtn = _ref.showConfigBtn,
     showConfigBtn = _ref$showConfigBtn === void 0 ? true : _ref$showConfigBtn,
     affixBarZIndex = _ref.affixBarZIndex,
@@ -89,7 +91,7 @@ var LdFormList = function LdFormList(_ref) {
   }, []);
   var _ref2 = (0, _react.useContext)(_LdPop.LuckDaPopContext) || {},
     defaultLayout = _ref2.affixLayout;
-  var _ref3 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
+  var _ref3 = (0, _Builder.useLDCtx)(pageProxy) || {},
     dataSets = _ref3.dataSets,
     doAction = _ref3.doAction,
     resources = _ref3.resources,
@@ -228,9 +230,9 @@ var LdFormList = function LdFormList(_ref) {
       formUid: formUid,
       mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
-      afterSubmitLoading && afterSubmitLoading(res);
       setSubmitLoading(false);
       if (success) {
+        afterSubmitLoading === null || afterSubmitLoading === void 0 || afterSubmitLoading(res);
         var mainFormData = res.detail[res.list[0]];
         if (afterSubmit) {
           afterSubmit(success, mainKey, res);
@@ -238,10 +240,11 @@ var LdFormList = function LdFormList(_ref) {
           var _formListRef$current, _formListRef$current2;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
           (_formListRef$current2 = formListRef.current) === null || _formListRef$current2 === void 0 || _formListRef$current2.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
-            formListRef.current.setFormMode('info');
+            var _formListRef$current4;
+            (_formListRef$current4 = formListRef.current) === null || _formListRef$current4 === void 0 || _formListRef$current4.setFormMode('info');
           });
         }
-      }
+      } else validateErrorCallback === null || validateErrorCallback === void 0 || validateErrorCallback();
     });
   };
   var formConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({
@@ -297,7 +300,7 @@ var LdFormList = function LdFormList(_ref) {
     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);
+    return (o === null || o === void 0 ? void 0 : o.order) || (o === null || o === void 0 || (_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;

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", "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"],
+var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "uiSettings", "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,6 +28,8 @@ 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,
@@ -85,10 +87,12 @@ var LdGrid = function LdGrid(_ref) {
           }
         };
       },
-      onLdQuery: function onLdQuery() {
-        var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        doQuery({
+      onLdQuery: function onLdQuery(_params) {
+        var _getDvaApp2;
+        if (_params) doQuery({
           params: _params
+        });else (_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 || _getDvaApp2._store.dispatch({
+          type: "".concat(namespace, "/doQuery")
         });
       }
     });
@@ -100,6 +104,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) : {};
 
   /**
    * 优先级
@@ -108,7 +113,7 @@ var LdGrid = function LdGrid(_ref) {
    */
   var _columns = (0, _ahooks.useCreation)(function () {
     if (columnsReset) {
-      if (_lodash.isFunction) {
+      if ((0, _lodash.isFunction)(columnsReset)) {
         return columnsReset(columns);
       }
       return columnsReset;
@@ -116,7 +121,8 @@ var LdGrid = function LdGrid(_ref) {
     var _columnsRewrite = (0, _lodash.isFunction)(columnsRewrite) ? columnsRewrite(columns) : columnsRewrite;
     var defaultColumns = (0, _lodash.keyBy)(columns, 'aliaName');
     var customColumns = (0, _lodash.keyBy)(_columnsRewrite, 'field');
-    var mergeFields = (0, _lodash.union)((0, _lodash.keys)(customColumns), (0, _lodash.keys)(defaultColumns));
+    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配置的列排序
     return (0, _lodash.transform)(mergeFields, function (result, field) {
       var _customColumns$field;
       if ((_customColumns$field = customColumns[field]) !== null && _customColumns$field !== void 0 && _customColumns$field.hide) {
@@ -124,9 +130,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((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable));
+        result.push((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}, isTreeGrid, writable, columnUiData));
+      }
     }, []);
   }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = (0, _ahooks.useCreation)(function () {
@@ -152,9 +163,6 @@ 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
     // 资源串、行为配置
@@ -192,11 +200,11 @@ 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 _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)({
+    var _getDvaApp3, _getDvaApp4;
+    (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 || _getDvaApp3.unmodel(namespace);
+    if (!((_getDvaApp4 = (0, _umi.getDvaApp)()) !== null && _getDvaApp4 !== void 0 && _getDvaApp4._store.getState()[namespace])) {
+      var _getDvaApp5, _props$pagination;
+      (_getDvaApp5 = (0, _umi.getDvaApp)()) === null || _getDvaApp5 === void 0 || _getDvaApp5.model((0, _model.default)(namespace, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
       }, overModel), {}, {
         pageSize: overModel.pageSize || ((_props$pagination = props.pagination) === null || _props$pagination === void 0 ? void 0 : _props$pagination.pageSize) || props.pageSize,

package/lib/components/LdGridForm/index.js

@@ -19,7 +19,7 @@ var _utils = require("../../utils");
 var _form = require("../../helper/form");
 var _Builder = require("../Builder");
 var _index = _interopRequireDefault(require("./index.less"));
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode", "fields", "setVerifyRules"];
+var _excluded = ["columns", "resources", "actions", "doAction", "uiSettings", "ldId", "dataSetKey", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode", "fields", "setVerifyRules", "pageProxy"];
 var buildLdGridForm = function buildLdGridForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -29,6 +29,8 @@ 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,
@@ -61,8 +63,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     formMode = _ref.formMode,
     fields = _ref.fields,
     setVerifyRules = _ref.setVerifyRules,
+    pageProxy = _ref.pageProxy,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
+  var _ref2 = (0, _Builder.useLDCtx)(pageProxy) || {},
     setFieldProps = _ref2.setFieldProps;
   var defaultValues = /*#__PURE__*/(0, _react.createRef)({});
   var isMain = ldId === mainFormLdId;
@@ -72,9 +75,11 @@ 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 _columns = function () {
+    var mergedArray = (0, _utils.mergeAndSort)(gridColumns, gridPresetData.gridPreset || [], 'field');
     var fieldsObj = (0, _lodash.keyBy)(fields, 'field');
-    var columnsObj = (0, _lodash.keyBy)(gridColumns, 'field');
+    var columnsObj = (0, _lodash.keyBy)(mergedArray, 'field');
     var keys = (0, _lodash.isEmpty)(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
     var _defaultValues = {};
     var _nodes = (0, _lodash.reduce)(keys, function (result, key) {
@@ -112,6 +117,10 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
       });
       var defaultSet = ['width', 'align', 'headerAlign', 'pinned', 'tip', 'formMode'];
+      // 该字段配置的表单显示信息
+      var columnUiData = gridPresetData.gridPreset ? gridPresetData.gridPreset.find(function (c) {
+        return c.field === col.field;
+      }) : {};
       result.push((0, _utils.getFormColumn)(type, newCol, (0, _objectSpread4.default)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _lodash.pick)(setting, defaultSet)), customColumn), {}, {
         formItemRewrite: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
           moduleCode: moduleCode,
@@ -120,7 +129,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
           render: setting === null || setting === void 0 ? void 0 : setting.render,
           setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field', 'render']))
         })
-      })));
+      }), columnUiData));
       return result;
     }, []);
     defaultValues.current = _defaultValues;