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

package/es/components/Builder/index.js

@@ -9,7 +9,7 @@ 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(pageProxy) {
@@ -44,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)));
@@ -108,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: '模块信息加载失败'
     });

package/es/components/LdAutoForm/index.js

@@ -2,13 +2,13 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules", "pageProxy"];
+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 { getFormItem, formItemDataFormat, dataFormat, behaviorCall, mergeAndSort } from "../../utils";
 import { useLDCtx } from "../Builder";
 var didMount = false;
 var debounceFunc = debounce(function (fields, changedValues, allValues, props) {
@@ -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,
@@ -63,9 +65,11 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     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) {
@@ -86,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
@@ -94,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;
     }, []);
@@ -111,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/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,
@@ -94,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) : {};
 
   /**
    * 优先级
@@ -110,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) {
@@ -118,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 () {

package/es/components/LdGridForm/index.js

@@ -2,13 +2,13 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "columnsReset", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className", "formRef", "formMode", "fields", "setVerifyRules", "pageProxy"];
+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 { useLDCtx } from "../Builder";
 import styles from "./index.less";
@@ -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,
@@ -65,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) {
@@ -105,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,
@@ -113,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;

package/es/helper/form.js

@@ -69,9 +69,15 @@ export function translator() {
     label: allConfig.fieldName,
     config: {
       required: !!allConfig.isNotNull,
-      disabled: !!allConfig.isReadOnly
+      disabled: !!allConfig.isReadOnly,
+      placeholder: allConfig.placeholder,
+      rows: allConfig.rows
     },
     layout: 'block',
+    align: allConfig.align,
+    headerAlign: allConfig.headerAlign,
+    width: allConfig.width,
+    tip: allConfig.tip,
     col: allConfig.col || 1,
     row: allConfig.row || 1
   };

package/es/helper/ldBuilder.js

@@ -20,6 +20,8 @@ var builder = function builder(wrapped) {
       actions = _ref.actions,
       _ref$dataSets = _ref.dataSets,
       dataSets = _ref$dataSets === void 0 ? [] : _ref$dataSets,
+      _ref$moduleUiList = _ref.moduleUiList,
+      moduleUiList = _ref$moduleUiList === void 0 ? {} : _ref$moduleUiList,
       _ref$isTree = _ref.isTree,
       isTree = _ref$isTree === void 0 ? [] : _ref$isTree,
       doAction = _ref.doAction,
@@ -60,7 +62,8 @@ var builder = function builder(wrapped) {
       resources: resources,
       actions: actions,
       doAction: doAction,
-      moduleCode: moduleCode
+      moduleCode: moduleCode,
+      uiSettings: moduleUiList[dataSetKey] // form和grid的页面配置信息
     });
     return wrapped(wrappedProps);
   };

package/es/services.js

@@ -21,22 +21,39 @@ function _readModlue() {
   }));
   return _readModlue.apply(this, arguments);
 }
-export function noAuthTransformCode(_x2) {
-  return _noAuthTransformCode.apply(this, arguments);
+export function readUI(_x2) {
+  return _readUI.apply(this, arguments);
 }
-function _noAuthTransformCode() {
-  _noAuthTransformCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+function _readUI() {
+  _readUI = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(get) {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", request("".concat(api.BASE_HOST, "/page/option/noAuthTransformCode"), {
-            params: params
-          }));
+          return _context2.abrupt("return", request("".concat(api.LUCKDA_HOST, "/ui/builder/noAuthFetchModuleDataSetUI?").concat(stringify(get))));
         case 1:
         case "end":
           return _context2.stop();
       }
     }, _callee2);
   }));
+  return _readUI.apply(this, arguments);
+}
+export function noAuthTransformCode(_x3) {
+  return _noAuthTransformCode.apply(this, arguments);
+}
+function _noAuthTransformCode() {
+  _noAuthTransformCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          return _context3.abrupt("return", request("".concat(api.BASE_HOST, "/page/option/noAuthTransformCode"), {
+            params: params
+          }));
+        case 1:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
   return _noAuthTransformCode.apply(this, arguments);
 }

package/es/utils/form.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -22,6 +23,7 @@ import * as formItemUtils from "../helper/FromItems";
  * 根据动态表单配置项生成formItem
  * @param {动态表单配置项} props
  * @param {自定义动态表单配置项} customProps
+ * @param {formUi配置项} formUiPreset
  * @returns <BasicForm name='' ... />
  */
 export function getFormItem() {
@@ -30,10 +32,11 @@ export function getFormItem() {
     property = _ref.property,
     props = _objectWithoutProperties(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var formUiPreset = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!property) return /*#__PURE__*/React.createElement(React.Fragment, null);
   if (property === 'sint' || property === 'number' || property === 'long') props.opt_decimal = 0;
   var comType = comName || defaultComName[property];
-  var _translator = translator(props),
+  var _translator = translator(_objectSpread(_objectSpread({}, props), formUiPreset)),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
   var _merge = merge(
@@ -202,8 +205,12 @@ export var dataFormat = function dataFormat() {
 /**
  *
  * @param formType
+ * @param comName
+ * @param property
  * @param props
+ * @param formItemRewrite
  * @param customProps
+ * @param gridUiPreset
  * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
  */
 export var getFormColumn = function getFormColumn() {
@@ -216,9 +223,10 @@ export var getFormColumn = function getFormColumn() {
   var _ref5 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
     formItemRewrite = _ref5.formItemRewrite,
     customProps = _objectWithoutProperties(_ref5, _excluded7);
+  var gridUiPreset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var formItemType = comName || defaultComName[property];
   if (formItemType === 'radio') formItemType = 'select';
-  var _translator2 = translator(props),
+  var _translator2 = translator(_objectSpread(_objectSpread({}, props), gridUiPreset)),
     name = _translator2.name,
     translateProps = _objectWithoutProperties(_translator2, _excluded8);
   var _merge2 = merge(
@@ -229,7 +237,7 @@ export var getFormColumn = function getFormColumn() {
     _props = _objectWithoutProperties(_merge2, _excluded9);
   var columnRender = getColumnRender(name, formItemType, _props);
   if (formType !== 'writer') _props.name = name;
-  return _objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread({}, _props), {}, {
     title: translateProps.label,
     editable: formType === 'writer' && {
       required: _props.required || ((_props$config = _props.config) === null || _props$config === void 0 ? void 0 : _props$config.required)
@@ -259,4 +267,29 @@ export var getFormColumn = function getFormColumn() {
     field: name,
     exportField: getExportField(name, formItemType, _props)
   });
+};
+
+/**
+ * 合并两个数组，并且数据顺序以arr2为准
+ * @param arr1
+ * @param arr2
+ * @param rowKey
+ */
+export var mergeAndSort = function mergeAndSort(arr1, arr2, rowKey) {
+  // 将a2转换为一个Map，便于快速查找
+  var a2Map = new Map(arr2.map(function (item) {
+    return [item[rowKey], item];
+  }));
+  // 创建一个新的数组，按a2的顺序填充元素，同时包含a1中不在a2中的元素
+  var mergedArray = arr2.map(function (item) {
+    var a1Item = arr1.find(function (a1) {
+      return a1[rowKey] === item[rowKey];
+    });
+    return a1Item ? _objectSpread(_objectSpread({}, item), a1Item) : item;
+  });
+  // 将a1中未出现在a2中的元素追加到合并后的数组末尾
+  mergedArray.push.apply(mergedArray, _toConsumableArray(arr1.filter(function (a1Item) {
+    return !a2Map.has(a1Item[rowKey]);
+  })));
+  return mergedArray;
 };

package/es/utils/grid.js

@@ -122,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)),

package/lib/components/Builder/index.js

@@ -52,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)));
@@ -116,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: '模块信息加载失败'
     });

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", "pageProxy"];
+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,
@@ -71,9 +73,11 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     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) {
@@ -94,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
@@ -102,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;
     }, []);
@@ -119,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/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,
@@ -102,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) : {};
 
   /**
    * 优先级
@@ -118,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) {
@@ -126,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 () {

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", "pageProxy"];
+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,
@@ -73,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) {
@@ -113,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,
@@ -121,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;

package/lib/helper/form.js

@@ -77,9 +77,15 @@ function translator() {
     label: allConfig.fieldName,
     config: {
       required: !!allConfig.isNotNull,
-      disabled: !!allConfig.isReadOnly
+      disabled: !!allConfig.isReadOnly,
+      placeholder: allConfig.placeholder,
+      rows: allConfig.rows
     },
     layout: 'block',
+    align: allConfig.align,
+    headerAlign: allConfig.headerAlign,
+    width: allConfig.width,
+    tip: allConfig.tip,
     col: allConfig.col || 1,
     row: allConfig.row || 1
   };

package/lib/helper/ldBuilder.js

@@ -27,6 +27,8 @@ var builder = function builder(wrapped) {
       actions = _ref.actions,
       _ref$dataSets = _ref.dataSets,
       dataSets = _ref$dataSets === void 0 ? [] : _ref$dataSets,
+      _ref$moduleUiList = _ref.moduleUiList,
+      moduleUiList = _ref$moduleUiList === void 0 ? {} : _ref$moduleUiList,
       _ref$isTree = _ref.isTree,
       isTree = _ref$isTree === void 0 ? [] : _ref$isTree,
       doAction = _ref.doAction,
@@ -67,7 +69,8 @@ var builder = function builder(wrapped) {
       resources: resources,
       actions: actions,
       doAction: doAction,
-      moduleCode: moduleCode
+      moduleCode: moduleCode,
+      uiSettings: moduleUiList[dataSetKey] // form和grid的页面配置信息
     });
     return wrapped(wrappedProps);
   };

package/lib/services.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.noAuthTransformCode = noAuthTransformCode;
 exports.readModlue = readModlue;
+exports.readUI = readUI;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _utils = require("@luck-design-biz/base/utils");
@@ -29,22 +30,39 @@ function _readModlue() {
   }));
   return _readModlue.apply(this, arguments);
 }
-function noAuthTransformCode(_x2) {
-  return _noAuthTransformCode.apply(this, arguments);
+function readUI(_x2) {
+  return _readUI.apply(this, arguments);
 }
-function _noAuthTransformCode() {
-  _noAuthTransformCode = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(params) {
+function _readUI() {
+  _readUI = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(get) {
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.BASE_HOST, "/page/option/noAuthTransformCode"), {
-            params: params
-          }));
+          return _context2.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.LUCKDA_HOST, "/ui/builder/noAuthFetchModuleDataSetUI?").concat(stringify(get))));
         case 1:
         case "end":
           return _context2.stop();
       }
     }, _callee2);
   }));
+  return _readUI.apply(this, arguments);
+}
+function noAuthTransformCode(_x3) {
+  return _noAuthTransformCode.apply(this, arguments);
+}
+function _noAuthTransformCode() {
+  _noAuthTransformCode = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(params) {
+    return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          return _context3.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.BASE_HOST, "/page/option/noAuthTransformCode"), {
+            params: params
+          }));
+        case 1:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
   return _noAuthTransformCode.apply(this, arguments);
 }

package/lib/utils/form.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getFormColumn = exports.formItemDataFormat = exports.dataFormat = void 0;
 exports.getFormItem = getFormItem;
+exports.mergeAndSort = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -30,6 +32,7 @@ var _excluded = ["comName", "property"],
  * 根据动态表单配置项生成formItem
  * @param {动态表单配置项} props
  * @param {自定义动态表单配置项} customProps
+ * @param {formUi配置项} formUiPreset
  * @returns <BasicForm name='' ... />
  */
 function getFormItem() {
@@ -38,10 +41,11 @@ function getFormItem() {
     property = _ref.property,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var formUiPreset = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!property) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
   if (property === 'sint' || property === 'number' || property === 'long') props.opt_decimal = 0;
   var comType = comName || _form.defaultComName[property];
-  var _translator = (0, _form.translator)(props),
+  var _translator = (0, _form.translator)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), formUiPreset)),
     name = _translator.name,
     translateProps = (0, _objectWithoutProperties2.default)(_translator, _excluded2);
   var _merge = (0, _lodash.merge)(
@@ -210,8 +214,12 @@ var dataFormat = exports.dataFormat = function dataFormat() {
 /**
  *
  * @param formType
+ * @param comName
+ * @param property
  * @param props
+ * @param formItemRewrite
  * @param customProps
+ * @param gridUiPreset
  * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
  */
 var getFormColumn = exports.getFormColumn = function getFormColumn() {
@@ -224,9 +232,10 @@ var getFormColumn = exports.getFormColumn = function getFormColumn() {
   var _ref5 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
     formItemRewrite = _ref5.formItemRewrite,
     customProps = (0, _objectWithoutProperties2.default)(_ref5, _excluded7);
+  var gridUiPreset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var formItemType = comName || _form.defaultComName[property];
   if (formItemType === 'radio') formItemType = 'select';
-  var _translator2 = (0, _form.translator)(props),
+  var _translator2 = (0, _form.translator)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), gridUiPreset)),
     name = _translator2.name,
     translateProps = (0, _objectWithoutProperties2.default)(_translator2, _excluded8);
   var _merge2 = (0, _lodash.merge)(
@@ -237,7 +246,7 @@ var getFormColumn = exports.getFormColumn = function getFormColumn() {
     _props = (0, _objectWithoutProperties2.default)(_merge2, _excluded9);
   var columnRender = (0, _grid.getColumnRender)(name, formItemType, _props);
   if (formType !== 'writer') _props.name = name;
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
     title: translateProps.label,
     editable: formType === 'writer' && {
       required: _props.required || ((_props$config = _props.config) === null || _props$config === void 0 ? void 0 : _props$config.required)
@@ -267,4 +276,29 @@ var getFormColumn = exports.getFormColumn = function getFormColumn() {
     field: name,
     exportField: (0, _grid.getExportField)(name, formItemType, _props)
   });
+};
+
+/**
+ * 合并两个数组，并且数据顺序以arr2为准
+ * @param arr1
+ * @param arr2
+ * @param rowKey
+ */
+var mergeAndSort = exports.mergeAndSort = function mergeAndSort(arr1, arr2, rowKey) {
+  // 将a2转换为一个Map，便于快速查找
+  var a2Map = new Map(arr2.map(function (item) {
+    return [item[rowKey], item];
+  }));
+  // 创建一个新的数组，按a2的顺序填充元素，同时包含a1中不在a2中的元素
+  var mergedArray = arr2.map(function (item) {
+    var a1Item = arr1.find(function (a1) {
+      return a1[rowKey] === item[rowKey];
+    });
+    return a1Item ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), a1Item) : item;
+  });
+  // 将a1中未出现在a2中的元素追加到合并后的数组末尾
+  mergedArray.push.apply(mergedArray, (0, _toConsumableArray2.default)(arr1.filter(function (a1Item) {
+    return !a2Map.has(a1Item[rowKey]);
+  })));
+  return mergedArray;
 };

package/lib/utils/grid.js

@@ -130,12 +130,13 @@ var getGridColumn = exports.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 || _form.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 = (0, _form.translator)(props),
+  var _translator = (0, _form.translator)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), gridUiPreset)),
     name = _translator.name,
     translateProps = (0, _objectWithoutProperties2.default)(_translator, _excluded2);
   var _merge = (0, _lodash.merge)(translateProps, (0, _form.formatCustomProps)(comType, customProps)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "1.0.2-20",
+  "version": "1.0.2-20temp",
   "description": "前端配置管理中心业务组件库",
   "scripts": {
     "start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",