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

package/es/components/Builder/index.js

@@ -9,11 +9,12 @@ import { formatMessage } from '@luck-design-biz/base/utils';
 import { META_TAG_NAME, LC_RUNTIME_KEY } from "../../lowcode/constants";
 import { setMetaAttrs } from "../../lowcode/engine/tools/helper";
 import LdPop from "../LdPop";
-import { readModlue, noAuthTransformCode } from "../../services";
+import { readModlue, noAuthTransformCode, readUI } from "../../services";
 import { doAction as doActionUtils } from "../../helper/action";
 export var LuckDaContext = /*#__PURE__*/createContext();
-export var useLDCtx = function useLDCtx() {
-  return useContext(LuckDaContext);
+export var useLDCtx = function useLDCtx(pageProxy) {
+  var ctx = useContext(LuckDaContext);
+  return ctx[(pageProxy === null || pageProxy === void 0 ? void 0 : pageProxy.proxyCode) || 'master'];
 };
 var builder = function builder(WrappedComponent, moduleCode) {
   var Component = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -43,21 +44,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 || []
-            });
-          }
-        }
+        }]
+      }),
+      loading = _useRequest.loading,
+      moduleResult = _useRequest.data;
+    var _useRequest2 = useRequest(readUI, {
+        defaultParams: [{
+          moduleCode: moduleCode
+        }]
       }),
-      loading = _useRequest.loading;
+      loading1 = _useRequest2.loading,
+      uiResult = _useRequest2.data;
+    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 = useMemoizedFn(function (ldId, params) {
       setPops(function (prev) {
         return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, ldId, _objectSpread(_objectSpread({}, prev[ldId]), params)));
@@ -107,8 +115,8 @@ 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 (!moduleData) return formatMessage({
+    if (loading || loading1) return null;
+    if (!moduleData) if (!moduleData) return formatMessage({
       id: 'luckda.module.loadFailed',
       label: '模块信息加载失败'
     });
@@ -117,14 +125,16 @@ var builder = function builder(WrappedComponent, moduleCode) {
       label: '模块缺少数据集'
     });
     return /*#__PURE__*/React.createElement(LuckDaContext.Provider, {
-      value: _objectSpread(_objectSpread({}, moduleData), {}, {
-        doAction: doAction,
-        openPop: openPop,
-        closePop: closePop,
-        readFieldProps: readFieldProps,
-        setFieldProps: setFieldProps,
-        moduleCode: moduleCode
-      })
+      value: {
+        master: _objectSpread(_objectSpread({}, moduleData), {}, {
+          doAction: doAction,
+          openPop: openPop,
+          closePop: closePop,
+          readFieldProps: readFieldProps,
+          setFieldProps: setFieldProps,
+          moduleCode: moduleCode
+        })
+      }
     }, /*#__PURE__*/React.createElement(WrappedComponent, _extends({
       ref: ref
     }, moduleData || {}, {

package/es/components/ComplexItem/index.js

@@ -42,7 +42,7 @@ var Index = function Index(_ref) {
     keyName: keyField,
     titleKey: "title",
     api: ( /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(get) {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(get, post) {
         var res, formatData, detail;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -51,7 +51,9 @@ var Index = function Index(_ref) {
               return fetchContent(dataModel, _objectSpread({
                 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) {
@@ -72,7 +74,7 @@ var Index = function Index(_ref) {
           }
         }, _callee);
       }));
-      return function (_x) {
+      return function (_x, _x2) {
         return _ref2.apply(this, arguments);
       };
     }()),

package/es/components/ComplexItem/service.js

@@ -4,18 +4,21 @@ import { stringify } from 'qs';
 import { request } from '@luck-design-biz/base/utils';
 import api from "@/services/ApiConfig";
 export var fetchContent = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dmCode, get) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dmCode, get, post) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", request("".concat(api.API_HOST, "/").concat(dmCode, "/ui/builder/complex/noAuthFetchContent?").concat(stringify(get))));
+          return _context.abrupt("return", request("".concat(api.API_HOST, "/").concat(dmCode, "/ui/builder/complex/noAuthFetchContent?").concat(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/es/components/LDActions/index.js

@@ -28,6 +28,7 @@ var DisplayComp = function DisplayComp(_ref) {
   return /*#__PURE__*/React.createElement(Button, _extends({}, props, {
     disabled: action.serialEffect === 'disable',
     className: classNames(styles[action.riskLevel], _defineProperty({}, className, !!className)),
+    type: action.riskLevel,
     onClick: onClick
   }), children);
 };

package/es/components/LdAutoForm/index.js

@@ -2,14 +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 _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"];
-import React, { createRef, useContext } from 'react';
+var _excluded = ["columns", "resources", "actions", "doAction", "uiSettings", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules", "pageProxy"];
+import React, { createRef } from 'react';
 import { reduce, keyBy, isEmpty, pick, union, omit, forEach, debounce, isNil } from 'lodash';
 import { BasicDivider } from 'luck-design';
 import { AutoForm } from '@luck-design-biz/base/FormList';
 import ldBuilder from "../../helper/ldBuilder";
-import { getFormItem, formItemDataFormat, dataFormat, behaviorCall } from "../../utils";
-import { LuckDaContext } from "../Builder";
+import { getFormItem, formItemDataFormat, dataFormat, behaviorCall, mergeAndSort } from "../../utils";
+import { useLDCtx } from "../Builder";
 var didMount = false;
 var debounceFunc = debounce(function (fields, changedValues, allValues, props) {
   forEach(changedValues, function (val, key) {
@@ -31,6 +31,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,
@@ -57,14 +59,17 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     _ref$fields = _ref.fields,
     fields = _ref$fields === void 0 ? [] : _ref$fields,
     setVerifyRules = _ref.setVerifyRules,
+    pageProxy = _ref.pageProxy,
     props = _objectWithoutProperties(_ref, _excluded);
-  var _ref2 = useContext(LuckDaContext) || {},
+  var _ref2 = useLDCtx(pageProxy) || {},
     setFieldProps = _ref2.setFieldProps;
   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 basicItems = function () {
     var fieldsObj = keyBy(fields, 'field');
-    var columnsObj = keyBy(columns, 'field');
+    var mergedArray = mergeAndSort(columns, formPreset.formFieldPreset || [], 'field');
+    var columnsObj = keyBy(mergedArray, 'field');
     var keys = isEmpty(fields) ? Object.keys(columnsObj) : union(Object.keys(fieldsObj), Object.keys(columnsObj));
     var _defaultValues = {};
     var _nodes = reduce(keys, function (result, key) {
@@ -85,6 +90,10 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           setVerifyRules: setVerifyRules,
           fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
         }, pick(setting, defaultSet));
+        // 该字段配置的表单显示信息
+        var colUiData = formPreset.formFieldPreset ? formPreset.formFieldPreset.find(function (c) {
+          return c.field === col.field;
+        }) : {};
         result.push(getFormItem(newCol, _objectSpread(_objectSpread({
           formId: ldId,
           moduleCode: moduleCode
@@ -93,7 +102,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
             return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.aliaName, value)));
           },
           setting: omit(setting, [].concat(defaultSet, ['uid', 'field']))
-        })));
+        }), colUiData));
       }
       return result;
     }, []);
@@ -110,7 +119,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     isMain: isMain,
     defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns.map(function (c) {
       return _objectSpread(_objectSpread({}, c), 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/es/components/LdCard/index.js

@@ -104,11 +104,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 = getDvaApp()) === null || _getDvaApp2 === void 0 || _getDvaApp2._store.dispatch({
+          type: "".concat(namespace, "/doQuery")
         });
       }
     });
@@ -220,11 +222,11 @@ var LdIndex = function LdIndex(_ref4) {
     label: '此数据集为树形数据集，请选择非树形数据集'
   });
   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({
+    var _getDvaApp3, _getDvaApp4;
+    (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 || _getDvaApp3.unmodel(namespace);
+    if (!((_getDvaApp4 = getDvaApp()) !== null && _getDvaApp4 !== void 0 && _getDvaApp4._store.getState()[namespace])) {
+      var _getDvaApp5;
+      (_getDvaApp5 = getDvaApp()) === null || _getDvaApp5 === void 0 || _getDvaApp5.model(createModel(namespace, _objectSpread(_objectSpread({
         isFlow: !!props.isFlow
       }, overModel), {}, {
         dataSetKey: props.dataSetKey,

package/es/components/LdCom/index.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["options"];
+var _excluded = ["options", "pageProxy"];
 import React from 'react';
 import { Button, Tabs } from 'luck-design/antd';
 import { Collapse, ButtonRadio } from '@luck-design-biz/base';
@@ -11,9 +11,10 @@ export var LdCollapse = ldComBuilder(Collapse);
 export var LdButtonRadio = function LdButtonRadio(_ref) {
   var _ref$options = _ref.options,
     options = _ref$options === void 0 ? [] : _ref$options,
+    pageProxy = _ref.pageProxy,
     props = _objectWithoutProperties(_ref, _excluded);
   return /*#__PURE__*/React.createElement(ButtonRadio, _extends({}, props, {
-    options: filterOptions(options)
+    options: filterOptions(options, pageProxy)
   }));
 };
 export var LdIconFont = ldComBuilder(IconFont);

package/es/components/LdFormList/index.js

@@ -6,7 +6,7 @@ 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", "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"];
@@ -22,7 +22,7 @@ import { FormList, FormListAffix, FormBtn } from '@luck-design-biz/base/FormList
 import buildLdAutoForm from "../LdAutoForm";
 import buildLdGridForm from "../LdGridForm";
 import { Collapse } from '@luck-design-biz/base';
-import { LuckDaContext } from "../Builder";
+import { useLDCtx } from "../Builder";
 import { LuckDaPopContext } from "../LdPop";
 import createModel from "./model";
 import { onBatchSubmitAction } from "../../helper/action";
@@ -38,6 +38,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,
@@ -59,6 +60,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,
@@ -82,7 +84,7 @@ var LdFormList = function LdFormList(_ref) {
   }, []);
   var _ref2 = useContext(LuckDaPopContext) || {},
     defaultLayout = _ref2.affixLayout;
-  var _ref3 = useContext(LuckDaContext) || {},
+  var _ref3 = useLDCtx(pageProxy) || {},
     dataSets = _ref3.dataSets,
     doAction = _ref3.doAction,
     resources = _ref3.resources,
@@ -221,9 +223,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);
@@ -231,10 +233,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, _defineProperty({}, 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 = _objectSpread(_objectSpread({
@@ -290,7 +293,7 @@ var LdFormList = function LdFormList(_ref) {
     getContainer: getContainer
   }), sortBy([].concat(_toConsumableArray(formList), _toConsumableArray(formExtra)), function (o) {
     var _o$props;
-    return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
+    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/es/components/LdGrid/index.js

@@ -2,7 +2,7 @@ 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"],
+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"];
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
@@ -20,6 +20,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,
@@ -77,10 +79,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 = getDvaApp()) === null || _getDvaApp2 === void 0 || _getDvaApp2._store.dispatch({
+          type: "".concat(namespace, "/doQuery")
         });
       }
     });
@@ -92,6 +96,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) : {};
 
   /**
    * 优先级
@@ -100,7 +105,7 @@ var LdGrid = function LdGrid(_ref) {
    */
   var _columns = useCreation(function () {
     if (columnsReset) {
-      if (isFunction) {
+      if (isFunction(columnsReset)) {
         return columnsReset(columns);
       }
       return columnsReset;
@@ -108,7 +113,8 @@ var LdGrid = function LdGrid(_ref) {
     var _columnsRewrite = isFunction(columnsRewrite) ? columnsRewrite(columns) : columnsRewrite;
     var defaultColumns = keyBy(columns, 'aliaName');
     var customColumns = keyBy(_columnsRewrite, 'field');
-    var mergeFields = union(keys(customColumns), keys(defaultColumns));
+    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) {
@@ -116,9 +122,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 () {
@@ -144,9 +155,6 @@ var LdGrid = function LdGrid(_ref) {
     unclosableSet: unclosableSet,
     onQuery: onQuery
   });
-
-  // console.log('_columns',columns,_columns)
-
   return /*#__PURE__*/React.createElement(GridList, _extends({
     columns: _columns
     // 资源串、行为配置
@@ -184,11 +192,11 @@ 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, _props$pagination;
-      (_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model(createModel(namespace, _objectSpread(_objectSpread({
+    var _getDvaApp3, _getDvaApp4;
+    (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 || _getDvaApp3.unmodel(namespace);
+    if (!((_getDvaApp4 = getDvaApp()) !== null && _getDvaApp4 !== void 0 && _getDvaApp4._store.getState()[namespace])) {
+      var _getDvaApp5, _props$pagination;
+      (_getDvaApp5 = getDvaApp()) === null || _getDvaApp5 === void 0 || _getDvaApp5.model(createModel(namespace, _objectSpread(_objectSpread({
         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/es/components/LdGridForm/index.js

@@ -2,15 +2,15 @@ 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", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode", "fields", "setVerifyRules"];
-import React, { createRef, useContext } from 'react';
+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"];
+import React, { createRef } from 'react';
 import { reduce, keyBy, isEmpty, pick, omit } from 'lodash';
 import classNames from 'classnames';
 import ldBuilder from "../../helper/ldBuilder";
 import { GridForm } from '@luck-design-biz/base/FormList';
-import { getFormColumn, formItemDataFormat, dataFormat, behaviorCall } from "../../utils";
+import { getFormColumn, formItemDataFormat, dataFormat, behaviorCall, mergeAndSort } from "../../utils";
 import { defaultComName } from "../../helper/form";
-import { LuckDaContext } from "../Builder";
+import { useLDCtx } from "../Builder";
 import styles from "./index.less";
 var buildLdGridForm = function buildLdGridForm(_ref) {
   var _ref$columns = _ref.columns,
@@ -21,6 +21,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,
@@ -53,8 +55,9 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     formMode = _ref.formMode,
     fields = _ref.fields,
     setVerifyRules = _ref.setVerifyRules,
+    pageProxy = _ref.pageProxy,
     props = _objectWithoutProperties(_ref, _excluded);
-  var _ref2 = useContext(LuckDaContext) || {},
+  var _ref2 = useLDCtx(pageProxy) || {},
     setFieldProps = _ref2.setFieldProps;
   var defaultValues = /*#__PURE__*/createRef({});
   var isMain = ldId === mainFormLdId;
@@ -64,9 +67,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 = mergeAndSort(gridColumns, gridPresetData.gridPreset || [], 'field');
     var fieldsObj = keyBy(fields, 'field');
-    var columnsObj = keyBy(gridColumns, 'field');
+    var columnsObj = keyBy(mergedArray, 'field');
     var keys = isEmpty(fields) ? Object.keys(columnsObj) : Object.keys(fieldsObj);
     var _defaultValues = {};
     var _nodes = reduce(keys, function (result, key) {
@@ -104,6 +109,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(getFormColumn(type, newCol, _objectSpread(_objectSpread(_objectSpread({}, pick(setting, defaultSet)), customColumn), {}, {
         formItemRewrite: _objectSpread(_objectSpread({}, (_customColumn = customColumn) === null || _customColumn === void 0 ? void 0 : _customColumn.formItemRewrite), {}, {
           moduleCode: moduleCode,
@@ -112,7 +121,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
           render: setting === null || setting === void 0 ? void 0 : setting.render,
           setting: omit(setting, [].concat(defaultSet, ['uid', 'field', 'render']))
         })
-      })));
+      }), columnUiData));
       return result;
     }, []);
     defaultValues.current = _defaultValues;