@luck-design-biz/luckda 0.0.24-2 → 0.0.24-3

package/es/lowcode/view/lc-components/Table/index.js

@@ -1,243 +1,23 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["context", "id", "className", "dataset", "width", "height", "bordered", "zebra", "autoLoad", "readOnly", "suppressActions", "actionsColumnWidth", "actions", "pagination", "pageSize", "showSizeChanger", "showQuickJumper", "hideOnSinglePage", "paginationSimple", "suppressPreset"];
+var _excluded = ["id"];
 import React, { useRef } from 'react';
-import PropTypes from 'prop-types';
-import { useMemoizedFn, useCreation, useUpdateEffect, useLatest } from 'ahooks';
-import LdGrid from "../../../../components/LdGrid";
-import classNames from 'classnames';
+import { useMemoizedFn } from 'ahooks';
 import Wrapper from "../Wrapper";
-import { omitBadProps } from "../../../engine/tools/helper";
-import defaultMeta from "../../../engine/meta/table.props.default.json";
 var LCTable = function LCTable(_ref) {
-  var context = _ref.context,
-    id = _ref.id,
-    className = _ref.className,
-    dataset = _ref.dataset,
-    width = _ref.width,
-    height = _ref.height,
-    bordered = _ref.bordered,
-    zebra = _ref.zebra,
-    autoLoad = _ref.autoLoad,
-    readOnly = _ref.readOnly,
-    suppressActions = _ref.suppressActions,
-    actionsColumnWidth = _ref.actionsColumnWidth,
-    actions = _ref.actions,
-    pagination = _ref.pagination,
-    pageSize = _ref.pageSize,
-    showSizeChanger = _ref.showSizeChanger,
-    showQuickJumper = _ref.showQuickJumper,
-    hideOnSinglePage = _ref.hideOnSinglePage,
-    paginationSimple = _ref.paginationSimple,
-    suppressPreset = _ref.suppressPreset,
+  var id = _ref.id,
     props = _objectWithoutProperties(_ref, _excluded);
   var ref = useRef();
-  var latestZebra = useLatest(zebra);
-  var _pagination = useCreation(function () {
-    return {
-      isFlow: !pagination,
-      pagination: pagination ? {
-        pageSize: pageSize,
-        pageSizeOptions: ["".concat(pageSize), "".concat(pageSize * 2), "".concat(pageSize * 3)],
-        showSizeChanger: showSizeChanger,
-        showQuickJumper: showQuickJumper,
-        hideOnSinglePage: hideOnSinglePage,
-        simple: paginationSimple
-      } : null
-    };
-  }, [pagination, pageSize, showSizeChanger, showQuickJumper, hideOnSinglePage, paginationSimple]);
-  var _actionsColumn = useCreation(function () {
-    return {
-      actionsColumn: suppressActions ? null : {
-        width: actionsColumnWidth,
-        maxCount: actions.max,
-        type: actions.type,
-        getActions: function getActions() {
-          return actions.todoList.map(function (_action) {
-            return {
-              title: _action.name,
-              action: function action(d) {
-                console.log('doAction', d, _action);
-              },
-              resource: _action.serial,
-              style: _action.riskLevel === 'default' ? null : {
-                color: {
-                  danger: '#ff7875',
-                  destroy: '#820014'
-                }[_action.riskLevel]
-              }
-            };
-          });
-        }
-      }
-    };
-  }, [suppressActions, actionsColumnWidth, actions]);
-  useUpdateEffect(function () {
-    var itemsToUpdate = [];
-    ref.current.gridApi.api.forEachNode(function (rowNode) {
-      if (rowNode.rowIndex % 2 === 0) itemsToUpdate.push(rowNode.data);
-    });
-    ref.current.gridApi.api.updateRowData({
-      update: itemsToUpdate
-    });
-  }, [zebra]);
   var getTargetDom = useMemoizedFn(function () {
-    return ref.current.wrapperRef.current;
+    return ref.current;
   });
   return /*#__PURE__*/React.createElement(Wrapper, {
     id: id,
     getTargetDom: getTargetDom
-  }, /*#__PURE__*/React.createElement(LdGrid, _extends({
+  }, /*#__PURE__*/React.createElement("div", {
     ref: ref,
-    width: width,
-    height: height,
-    bordered: bordered,
-    id: id,
-    className: classNames(_defineProperty({}, className, !!className)),
-    ldId: id,
-    dataSetKey: dataset,
-    readOnly: readOnly,
-    suppressInit: !autoLoad,
-    getRowStyle: function getRowStyle(params) {
-      return latestZebra.current && params.node.rowIndex % 2 === 0 ? {
-        'background-color': latestZebra.current
-      } : {
-        'background-color': '#fff'
-      };
-    },
-    suppressPreset: suppressPreset
-    // operates={resources}
-  }, _pagination, _actionsColumn)));
-};
-LCTable.propTypes = {
-  /**
-   * @name 唯一标识
-   * @type string
-   * @disabled true
-   */
-  id: PropTypes.string.isRequired,
-  /**
-   * @name 数据集
-   * @type _DataSetSelector
-   */
-  dataset: PropTypes.string,
-  /**
-   * @name 自动加载
-   * @desc 首次数据是否自动加载，若存在必须带搜索条件再加载的情况，需要关闭
-   * @type switch
-   * @default true
-   */
-  autoLoad: PropTypes.bool,
-  /**
-   * @name 只读
-   * @type switch
-   * @default false
-   */
-  readOnly: PropTypes.bool,
-  /**
-   * @name 关闭预设
-   * @type switch
-   * @default false
-   */
-  suppressPreset: PropTypes.bool,
-  /**
-   * @name 宽度
-   * @type _WidthHeight
-   * @default 100%
-   * @group styleSetting
-   */
-  width: PropTypes.string,
-  /**
-   * @name 高度
-   * @type _WidthHeight
-   * @default 100%
-   * @group styleSetting
-   */
-  height: PropTypes.string,
-  /**
-   * @name 边框线
-   * @type switch
-   * @default false
-   * @group styleSetting
-   */
-  border: PropTypes.bool,
-  /**
-   * @name 斑马纹
-   * @type switch
-   * @default false
-   * @group styleSetting
-   */
-  zebra: PropTypes.oneOfType[(PropTypes.bool, PropTypes.string)],
-  /**
-   * @name 开启分页
-   * @type switch
-   * @default true
-   * @group paginationSetting
-   */
-  pagination: PropTypes.bool,
-  /**
-   * @name 每页条数
-   * @type number
-   * @default 30
-   * @group paginationSetting
-   */
-  pageSize: PropTypes.number,
-  /**
-   * @name 分页器
-   * @type switch
-   * @default true
-   * @group paginationSetting
-   */
-  showSizeChanger: PropTypes.bool,
-  /**
-   * @name 快速跳转
-   * @type switch
-   * @default true
-   * @group paginationSetting
-   */
-  showQuickJumper: PropTypes.bool,
-  /**
-   * @name 单页无分页器
-   * @type switch
-   * @default false
-   * @group paginationSetting
-   */
-  hideOnSinglePage: PropTypes.bool,
-  /**
-   * @name 简单模式
-   * @type switch
-   * @default false
-   * @group paginationSetting
-   */
-  paginationSimple: PropTypes.bool,
-  /**
-   * @name 隐藏操作列
-   * @type switch
-   * @default false
-   * @groupNext actionsColumn
-   */
-  suppressActions: PropTypes.bool,
-  /**
-   * @name 隐藏操作列
-   * @type number
-   * @default 160
-   * @groupNext actionsColumn
-   */
-  actionsColumnWidth: PropTypes.number,
-  /**
-   * @name 最大显示数
-   * @type number
-   * @default 2
-   * @groupNext actionsColumn
-   */
-  maxActionsCount: PropTypes.number,
-  /**
-   * @name 操作项
-   * @type _TableActions
-   * @groupNext actionsColumn
-   */
-  actions: PropTypes.array
+    style: {
+      padding: 8
+    }
+  }, "LCTable-", id));
 };
-LCTable.defaultProps = omitBadProps(defaultMeta, ['actionsColumn']);
 export default LCTable;

package/es/lowcode/view/lc-components/Wrapper.js

@@ -1,8 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { useEffect } from 'react';
-import { useLatest, useCreation } from 'ahooks';
+import { useEffect, useRef } from 'react';
 import { useLDContext } from "../../engine/provider/ContextProvider";
-import { findNodeAndParent, getPathNodesById } from "../../engine/tools/dataProcess";
+import { findNodeAndParent } from "../../engine/tools/dataProcess";
 import { CELL_CLASS_NAME } from "../../constants";
 var LCWrapper = function LCWrapper(_ref) {
   var id = _ref.id,
@@ -10,37 +9,29 @@ var LCWrapper = function LCWrapper(_ref) {
     getTargetDom = _ref.getTargetDom,
     api = _ref.api;
   var context = useLDContext();
-  var _pageData = useLatest(context.pageData);
-  var _api = useCreation(function () {
-    return {
-      getSelfAndParentLCData: function getSelfAndParentLCData() {
-        return findNodeAndParent(id, _pageData.current);
-      },
-      getLevelNodes: function getLevelNodes() {
-        return getPathNodesById(_pageData.current, id);
-      }
-    };
-  }, []);
+  var _apiRef = useRef({
+    getSelfAndParentLCData: function getSelfAndParentLCData() {
+      return findNodeAndParent(id, context.pageData);
+    }
+  });
   useEffect(function () {
-    setTimeout(function () {
-      var dom = getTargetDom();
-      if (dom) {
-        dom.setAttribute('id', id);
-        dom.classList.add(CELL_CLASS_NAME);
-      }
-      context.register(id, new Proxy({
-        dom: dom
-      }, {
-        get: function get(target, property, receiver) {
-          if (property === 'api') {
-            return api ? _objectSpread(_objectSpread({}, _api), api.current) : _api;
-          }
-          return Reflect.get(target, property, receiver);
+    var dom = getTargetDom();
+    if (dom) {
+      dom.setAttribute('id', id);
+      dom.classList.add(CELL_CLASS_NAME);
+    }
+    context.register(id, new Proxy({
+      dom: dom
+    }, {
+      get: function get(target, property, receiver) {
+        if (property === 'api') {
+          return api ? _objectSpread(_objectSpread({}, _apiRef.current), api.current) : _apiRef.current;
         }
-      }));
-      context.$publisher(context.topics.COMPONENT_MOUNT, {
-        id: id
-      });
+        return Reflect.get(target, property, receiver);
+      }
+    }));
+    context.$publisher(context.topics.COMPONENT_MOUNT, {
+      id: id
     });
     return function () {
       context.unregister(id);

package/es/lowcode/view/style/page.less

@@ -2,4 +2,5 @@
   position: relative;
   width: 100%;
   height: 100%;
+  overflow: hidden;
 }

package/es/services.js

@@ -20,15 +20,32 @@ function _readModlue() {
   }));
   return _readModlue.apply(this, arguments);
 }
-export function readBehaviorCall(_x2, _x3) {
-  return _readBehaviorCall.apply(this, arguments);
+export function readUI(_x2) {
+  return _readUI.apply(this, arguments);
 }
-function _readBehaviorCall() {
-  _readBehaviorCall = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(get, post) {
+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.LUCKDA_HOST, "/to/behavior/call?").concat(stringify(get)), {
+          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 readBehaviorCall(_x3, _x4) {
+  return _readBehaviorCall.apply(this, arguments);
+}
+function _readBehaviorCall() {
+  _readBehaviorCall = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(get, post) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          return _context3.abrupt("return", request("".concat(api.LUCKDA_HOST, "/to/behavior/call?").concat(stringify(get)), {
             method: 'POST',
             body: post,
             headers: {
@@ -37,9 +54,9 @@ function _readBehaviorCall() {
           }));
         case 1:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return _readBehaviorCall.apply(this, arguments);
 }

package/es/upload/Form/gridForm.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 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 = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
+var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "supportTypes", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
 import React, { useState, useRef, forwardRef } from 'react';
 import { getDvaApp } from 'umi';
 import { useMemoizedFn, useCreation } from 'ahooks';
@@ -55,6 +55,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     operates = _ref$operates === void 0 ? ['read', 'add', 'delete', 'download'] : _ref$operates,
     loading = _ref.loading,
     uploadUrl = _ref.uploadUrl,
+    supportTypes = _ref.supportTypes,
     _ref$forbiddenTypes = _ref.forbiddenTypes,
     forbiddenTypes = _ref$forbiddenTypes === void 0 ? [] : _ref$forbiddenTypes,
     _beforeUpload = _ref.beforeUpload,
@@ -78,8 +79,8 @@ var UploadGridForm = function UploadGridForm(_ref) {
   var _getDvaApp$_store$get = (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
     currentUser = _getDvaApp$_store$get.currentUser;
   var supportUploadTypes = useCreation(function () {
-    return getSupportUploadTypes(forbiddenTypes);
-  }, [forbiddenTypes]);
+    return getSupportUploadTypes(forbiddenTypes, supportTypes);
+  }, [forbiddenTypes, supportTypes]);
 
   // 下载
   var downloadFile = function downloadFile(filenames, tag) {
@@ -377,7 +378,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
         return _beforeUpload2({
           file: file,
           fileList: fileList,
-          supportUploadTypes: supportUploadTypes,
+          forbiddenTypes: forbiddenTypes,
           beforeUpload: _beforeUpload
         });
       }

package/es/upload/FormItem/index.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "forbiddenTypes", "children", "dataFormat", "listType"];
+var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "supportTypes", "forbiddenTypes", "children", "dataFormat", "listType"];
 import React from 'react';
 import { BasicFormItem } from 'luck-design';
 import { formatMessage, beforeUpload as _beforeUpload, getSupportUploadTypes } from '@luck-design-biz/base/utils';
@@ -35,6 +35,7 @@ function buildComponent(props) {
     note = _props$note === void 0 ? '' : _props$note,
     _props$config = props.config,
     config = _props$config === void 0 ? {} : _props$config,
+    supportTypes = props.supportTypes,
     forbiddenTypes = props.forbiddenTypes,
     children = props.children,
     dataFormat = props.dataFormat,
@@ -44,8 +45,8 @@ function buildComponent(props) {
     return "".concat(window.appConfig.OSS_HOST_V3, "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "&note=").concat(note);
   };
   var supportUploadTypes = useCreation(function () {
-    return getSupportUploadTypes(forbiddenTypes);
-  }, [forbiddenTypes]);
+    return getSupportUploadTypes(forbiddenTypes, supportTypes);
+  }, [forbiddenTypes, supportTypes]);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({
     extra: "".concat(formatMessage({
       id: 'app.upload.supportUpload',

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,9 +32,10 @@ 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') props.opt_decimal = 0;
-  var _translator = translator(props),
+  var _translator = translator(_objectSpread(_objectSpread({}, props), formUiPreset)),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
   var _merge = merge(
@@ -40,6 +43,7 @@ export function getFormItem() {
     translateProps, formatCustomProps(customProps)),
     type = _merge.type,
     _props = _objectWithoutProperties(_merge, _excluded3);
+  console.log('getFormItem', translateProps, _props);
   if (customProps.renderBasicFormItem) {
     var com = customProps.renderBasicFormItem(_props);
     var comProps = merge(_props, com.props);
@@ -189,8 +193,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() {
@@ -203,9 +211,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(
@@ -216,7 +225,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)
@@ -245,4 +254,29 @@ export var getFormColumn = function getFormColumn() {
     },
     field: name
   });
+};
+
+/**
+ * 合并两个数组，并且数据顺序以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

@@ -4,9 +4,8 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["comName", "property"],
   _excluded2 = ["name"],
   _excluded3 = ["filter", "filterParams"];
-import React from 'react';
 import { getDvaApp } from 'umi';
-import { merge, isNil, isArray, includes, capitalize, isString } from 'lodash';
+import { merge, isNil, isArray, includes, capitalize } from 'lodash';
 import { Switch, Tag } from 'luck-design/antd';
 import moment from 'moment';
 import UploadGridCell from "../upload/GridCell";
@@ -69,9 +68,9 @@ export function getColumnRender(name, type) {
       break;
     case 'region':
       render = function render(text, record) {
-        return record["".concat(name, "_virtual")] || (text ? (isString(text) ? JSON.parse(text) : text).map(function (i) {
+        return record["".concat(name, "_virtual")] || text ? text.map(function (i) {
           return i.name;
-        }).join('/') : undefined);
+        }).join('/') : undefined;
       };
       break;
     case 'upload':
@@ -115,11 +114,12 @@ 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 _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(customProps)),
@@ -127,11 +127,12 @@ export var getGridColumn = function getGridColumn() {
     filterParams = _merge.filterParams,
     _props = _objectWithoutProperties(_merge, _excluded3);
   var _extra = JSON.parse(extra) || {};
-  var data = _objectSpread(_objectSpread({}, _props), {}, {
+  var data = _objectSpread(_objectSpread({
+    headerAlign: getAlign(_extra, 'sheading_alignment_virtual'),
+    align: getAlign(_extra, 'scell_alignment_virtual')
+  }, _props), {}, {
     field: name,
     title: _props.label,
-    headerAlign: getAlign(_extra, 'sheading_alignment_virtual'),
-    align: getAlign(_extra, 'scell_alignment_virtual'),
     render: _props.render || getColumnRender(name, comName || defaultComName[property], _props)
   });
   if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region', 'file'], comName || defaultComName[property])) data.sortable = false;

package/lib/components/Builder/index.js

@@ -19,7 +19,7 @@ var _action2 = require("../../helper/action");
 var _utils = require("@luck-design-biz/base/utils");
 var LuckDaContext = exports.LuckDaContext = /*#__PURE__*/(0, _react.createContext)();
 var builder = function builder(WrappedComponent, moduleCode) {
-  var Component = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var Component = function Component(props) {
     if (!moduleCode) return (0, _utils.formatMessage)({
       id: 'luckda.paramMiss.moduleCode',
       label: '缺少模块Key'
@@ -36,21 +36,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;
+      loading1 = _useRequest.loading,
+      moduleResult = _useRequest.data;
+    var _useRequest2 = (0, _ahooks.useRequest)(_services.readUI, {
+        defaultParams: [{
+          moduleCode: moduleCode
+        }]
+      }),
+      loading2 = _useRequest2.loading,
+      uiResult = _useRequest2.data;
+    (0, _react.useEffect)(function () {
+      if (!loading1 && !loading2 && (moduleResult === null || moduleResult === void 0 ? void 0 : moduleResult.code) === 1 && (uiResult === null || uiResult === void 0 ? void 0 : uiResult.code) === 1) {
+        setModuleData({
+          actions: moduleResult.data.actions || {},
+          dataSets: moduleResult.data.dataSets || {},
+          isTree: moduleResult.data.isTree || [],
+          resources: moduleResult.data.resources || [],
+          moduleUiList: uiResult.data.moduleUiList || {}
+        });
+      }
+    }, [loading1, loading2, moduleResult, uiResult]);
     var openPop = (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)));
@@ -100,7 +107,7 @@ 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 (loading1 || loading2) return null;
     if (!moduleData) return (0, _utils.formatMessage)({
       id: 'luckda.module.loadFailed',
       label: '模块信息加载失败'
@@ -118,9 +125,7 @@ var builder = function builder(WrappedComponent, moduleCode) {
         setFieldProps: setFieldProps,
         moduleCode: moduleCode
       })
-    }, /*#__PURE__*/_react.default.createElement(WrappedComponent, (0, _extends2.default)({
-      ref: ref
-    }, moduleData || {}, {
+    }, /*#__PURE__*/_react.default.createElement(WrappedComponent, (0, _extends2.default)({}, moduleData || {}, {
       doAction: doAction,
       openPop: openPop,
       closePop: closePop
@@ -136,7 +141,7 @@ var builder = function builder(WrappedComponent, moduleCode) {
         }, pops[ldId])
       });
     }));
-  });
+  };
   return Component;
 };
 var _default = exports.default = builder;