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

package/lib/lowcode/view/lc-components/Layout/index.js

@@ -1,25 +1,20 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
 var _ahooks = require("ahooks");
 var _Wrapper = _interopRequireDefault(require("../Wrapper"));
-var _index = _interopRequireDefault(require("./index.less"));
-var _layoutPropsDefault = _interopRequireDefault(require("../../../engine/meta/layout.props.default.json"));
+var _excluded = ["id", "children"];
 var LCLayout = function LCLayout(_ref) {
   var id = _ref.id,
     children = _ref.children,
-    columnRatio = _ref.columnRatio,
-    columnSpacing = _ref.columnSpacing,
-    lineSpacing = _ref.lineSpacing,
-    style = _ref.style;
+    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var ref = (0, _react.useRef)();
   var getTargetDom = (0, _ahooks.useMemoizedFn)(function () {
     return ref.current;
@@ -29,37 +24,9 @@ var LCLayout = function LCLayout(_ref) {
     getTargetDom: getTargetDom
   }, /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
-    className: _index.default['lc-component-layout'],
-    style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, style), {}, {
-      gap: "".concat(columnSpacing, "px ").concat(lineSpacing, "px")
-    })
-  }, children));
-};
-LCLayout.propTypes = {
-  /**
-   * @name 唯一标识
-   * @type string
-   * @disabled true
-   */
-  id: _propTypes.default.string.isRequired,
-  /**
-   * @name 列比例
-   * @type string
-   * @default 12:3:9
-   */
-  columnRatio: _propTypes.default.string,
-  /**
-   * @name 列间距
-   * @type number
-   * @default 16
-   */
-  columnSpacing: _propTypes.default.number,
-  /**
-   * @name 行间距
-   * @type number
-   * @default 8
-   */
-  lineSpacing: _propTypes.default.number
+    style: {
+      padding: 8
+    }
+  }, "LCLayout-", id, children));
 };
-LCLayout.defaultProps = (0, _objectSpread2.default)({}, _layoutPropsDefault.default);
 var _default = exports.default = LCLayout;

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

@@ -6,156 +6,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
-var _luckda = require("@luck-design-biz/luckda");
-var _utils = require("@luck-design-biz/base/utils");
-var _classnames = _interopRequireDefault(require("classnames"));
 var _Wrapper = _interopRequireDefault(require("../Wrapper"));
-var _excluded = ["id", "doAction", "className", "dataset"];
+var _excluded = ["id"];
 var LCTable = function LCTable(_ref) {
   var id = _ref.id,
-    doAction = _ref.doAction,
-    className = _ref.className,
-    dataset = _ref.dataset,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var ref = (0, _react.useRef)();
   var getTargetDom = (0, _ahooks.useMemoizedFn)(function () {
-    return ref.current.wrapperRef.current;
+    return ref.current;
   });
   return /*#__PURE__*/_react.default.createElement(_Wrapper.default, {
     id: id,
     getTargetDom: getTargetDom
-  }, /*#__PURE__*/_react.default.createElement(_luckda.LdGrid, {
+  }, /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
-    id: id,
-    className: (0, _classnames.default)((0, _defineProperty2.default)({}, className, !!className)),
-    height: "100%"
-    /**
-     * @description 组件唯一key,项目全局唯一
-     * @require true
-     * @default -
-     */,
-    ldId: id
-    /**
-     * @description 数据集key(可传树形数据集，传树形数据集自动转为树形表格)
-     * @require true
-     * @default -
-     */,
-    dataSetKey: dataset
-    /**
-     * @description 批量配置项
-     * @require false
-     * @default -
-     */,
-    batchOperations: [{
-      key: 'delete',
-      title: (0, _utils.formatMessage)({
-        id: 'app.base.operate.delete'
-      }),
-      resource: 'delete'
-    }]
-    /**
-     * @description 批量操作方法
-     * @require false
-     * @default -
-     */,
-    onBatchOperationsClick: function onBatchOperationsClick(key, selectedRows) {}
-    /**
-     * @description 同gridList的actionsColumn,getActions的返回值可配置resource
-     * @require false
-     * @default -
-     */,
-    actionsColumn: {
-      getActions: function getActions(data) {
-        return [{
-          title: (0, _utils.formatMessage)({
-            id: 'app.base.operate.update'
-          }),
-          action: function action() {},
-          resource: 'update'
-        }, {
-          title: (0, _utils.formatMessage)({
-            id: 'app.base.operate.delete'
-          }),
-          style: {
-            color: 'var(--luck-color-danger)'
-          },
-          action: function action() {},
-          resource: 'delete'
-        }];
-      }
-    },
-    rowSelection: "multiple"
-    /* ----------------------------其他可用配置开始 !!!不使用请删除!!!------------------------------ */
-    /**
-     * @description 是否只读
-     * @require false
-     * @default false
-     */
-    // readOnly={false}
-    /**
-     * @description 抑制初始化自动加载数据
-     * @require false
-     * @default -
-     */
-    // suppressInit={true}
-    /**
-     * @description 初始化后的回调
-     * @require false
-     * @default -
-     */
-    // afterInit={(res, dispatch, props)=>console.log(res, dispatch, props)}
-    /**
-     * @description 获取过滤条件
-     * @require false
-     * @default -
-     */
-    // readFilter={(params, filters)=>{}}
-    /**
-     * @description columns中的字段的覆写
-     * @require false
-     * @default -
-     */
-    // columnsRewrite={[{
-    //   field:'事例', // 必填,用于匹配覆写元素
-    //   title:'demo',
-    // }]}
-    /**
-     * @description columns中的字段的完全自定义，优先级大于columnsRewrite
-     * @require false
-     * @default -
-     */
-    // columnsReset={[]}
-    /**
-     * @description 格式化表格数据
-     * @require false
-     * @default -
-     */
-    // formatDataSource={(list, detail) => list.map(i => ({ ...detail[i], demo: 'test' }))}
-    /**
-     * @description 同树形表格getDataPath用法，用于构建树形表格层级关系
-     * @require false
-     * @default data =>data.sidcc?.substring(1, data.sidcc.length - 1).split(‘/‘)
-     */
-    // getDataPath={data =>data.sidcc?.substring(1, data.sidcc.length - 1).split(‘/‘)}
-    /**
-     * @description 复写model参数
-     * @require false
-     * @default -
-     */
-    // overModel={{ unclosableSet: ['ilinkno'] }}
-    /**
-     * @description 读取数据源后的回调,返回所有接口中所有
-     * @require false
-     * @default -
-     */
-    // afterQuery={(res) => console.log('afterQuery', res)}
-
-    // ... gridTable组件的其他可用属性
-    /* ----------------------------其他可用配置结束 !!!不使用请删除!!!------------------------------ */
-  }));
+    style: {
+      padding: 8
+    }
+  }, "LCTable-", id));
 };
-var _default = exports.default = (0, _luckda.ldModuleBuild)(LCTable, 'moduleWmsMaterialsData' /* 模块key,对应配置管理中心模块key */);
+var _default = exports.default = LCTable;

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = require("react");
-var _ahooks = require("ahooks");
 var _ContextProvider = require("../../engine/provider/ContextProvider");
 var _dataProcess = require("../../engine/tools/dataProcess");
 var _constants = require("../../constants");
@@ -17,37 +16,29 @@ var LCWrapper = function LCWrapper(_ref) {
     getTargetDom = _ref.getTargetDom,
     api = _ref.api;
   var context = (0, _ContextProvider.useLDContext)();
-  var _pageData = (0, _ahooks.useLatest)(context.pageData);
-  var _api = (0, _ahooks.useCreation)(function () {
-    return {
-      getSelfAndParentLCData: function getSelfAndParentLCData() {
-        return (0, _dataProcess.findNodeAndParent)(id, _pageData.current);
-      },
-      getLevelNodes: function getLevelNodes() {
-        return (0, _dataProcess.getPathNodesById)(_pageData.current, id);
-      }
-    };
-  }, []);
+  var _apiRef = (0, _react.useRef)({
+    getSelfAndParentLCData: function getSelfAndParentLCData() {
+      return (0, _dataProcess.findNodeAndParent)(id, context.pageData);
+    }
+  });
   (0, _react.useEffect)(function () {
-    setTimeout(function () {
-      var dom = getTargetDom();
-      if (dom) {
-        dom.setAttribute('id', id);
-        dom.classList.add(_constants.CELL_CLASS_NAME);
-      }
-      context.register(id, new Proxy({
-        dom: dom
-      }, {
-        get: function get(target, property, receiver) {
-          if (property === 'api') {
-            return api ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _api), api.current) : _api;
-          }
-          return Reflect.get(target, property, receiver);
+    var dom = getTargetDom();
+    if (dom) {
+      dom.setAttribute('id', id);
+      dom.classList.add(_constants.CELL_CLASS_NAME);
+    }
+    context.register(id, new Proxy({
+      dom: dom
+    }, {
+      get: function get(target, property, receiver) {
+        if (property === 'api') {
+          return api ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _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/lib/lowcode/view/style/page.less

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

package/lib/services.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.readBehaviorCall = readBehaviorCall;
 exports.readModlue = readModlue;
+exports.readUI = readUI;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _querystring = require("querystring");
@@ -28,15 +29,32 @@ function _readModlue() {
   }));
   return _readModlue.apply(this, arguments);
 }
-function readBehaviorCall(_x2, _x3) {
-  return _readBehaviorCall.apply(this, arguments);
+function readUI(_x2) {
+  return _readUI.apply(this, arguments);
 }
-function _readBehaviorCall() {
-  _readBehaviorCall = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(get, post) {
+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.LUCKDA_HOST, "/to/behavior/call?").concat((0, _querystring.stringify)(get)), {
+          return _context2.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.LUCKDA_HOST, "/ui/builder/noAuthFetchModuleDataSetUI?").concat((0, _querystring.stringify)(get))));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _readUI.apply(this, arguments);
+}
+function readBehaviorCall(_x3, _x4) {
+  return _readBehaviorCall.apply(this, arguments);
+}
+function _readBehaviorCall() {
+  _readBehaviorCall = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(get, post) {
+    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.LUCKDA_HOST, "/to/behavior/call?").concat((0, _querystring.stringify)(get)), {
             method: 'POST',
             body: post,
             headers: {
@@ -45,9 +63,9 @@ function _readBehaviorCall() {
           }));
         case 1:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return _readBehaviorCall.apply(this, arguments);
 }

package/lib/upload/Form/gridForm.js

@@ -20,7 +20,7 @@ var _luckDesign = require("luck-design");
 var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
 var _FormList = require("@luck-design-biz/base/FormList");
 var _utils = require("@luck-design-biz/base/utils");
-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"];
 var columns = [{
   field: 'name',
   title: '附件名称'
@@ -63,6 +63,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,
@@ -86,8 +87,8 @@ var UploadGridForm = function UploadGridForm(_ref) {
   var _getDvaApp$_store$get = (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
     currentUser = _getDvaApp$_store$get.currentUser;
   var supportUploadTypes = (0, _ahooks.useCreation)(function () {
-    return (0, _utils.getSupportUploadTypes)(forbiddenTypes);
-  }, [forbiddenTypes]);
+    return (0, _utils.getSupportUploadTypes)(forbiddenTypes, supportTypes);
+  }, [forbiddenTypes, supportTypes]);
 
   // 下载
   var downloadFile = function downloadFile(filenames, tag) {
@@ -385,7 +386,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
         return (0, _utils.beforeUpload)({
           file: file,
           fileList: fileList,
-          supportUploadTypes: supportUploadTypes,
+          forbiddenTypes: forbiddenTypes,
           beforeUpload: _beforeUpload
         });
       }

package/lib/upload/FormItem/index.js

@@ -12,7 +12,7 @@ var _react = _interopRequireDefault(require("react"));
 var _luckDesign = require("luck-design");
 var _utils = require("@luck-design-biz/base/utils");
 var _ahooks = require("ahooks");
-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"];
 /**
  * 表单类型富文本上传
  * 是否实体字段： 是
@@ -41,6 +41,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,
@@ -50,8 +51,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 = (0, _ahooks.useCreation)(function () {
-    return (0, _utils.getSupportUploadTypes)(forbiddenTypes);
-  }, [forbiddenTypes]);
+    return (0, _utils.getSupportUploadTypes)(forbiddenTypes, supportTypes);
+  }, [forbiddenTypes, supportTypes]);
   return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({
     extra: "".concat((0, _utils.formatMessage)({
       id: 'app.upload.supportUpload',

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,9 +41,10 @@ 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') props.opt_decimal = 0;
-  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)(
@@ -48,6 +52,7 @@ function getFormItem() {
     translateProps, (0, _form.formatCustomProps)(customProps)),
     type = _merge.type,
     _props = (0, _objectWithoutProperties2.default)(_merge, _excluded3);
+  console.log('getFormItem', translateProps, _props);
   if (customProps.renderBasicFormItem) {
     var com = customProps.renderBasicFormItem(_props);
     var comProps = (0, _lodash.merge)(_props, com.props);
@@ -197,8 +202,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() {
@@ -211,9 +220,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)(
@@ -224,7 +234,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)
@@ -253,4 +263,29 @@ var getFormColumn = exports.getFormColumn = function getFormColumn() {
     },
     field: name
   });
+};
+
+/**
+ * 合并两个数组，并且数据顺序以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

@@ -10,7 +10,6 @@ exports.getGridColumn = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _react = _interopRequireDefault(require("react"));
 var _umi = require("umi");
 var _lodash = require("lodash");
 var _antd = require("luck-design/antd");
@@ -62,7 +61,7 @@ function getColumnRender(name, type) {
       break;
     case 'switch':
       render = function render(text) {
-        return /*#__PURE__*/_react.default.createElement(_antd.Switch, {
+        return /*#__PURE__*/React.createElement(_antd.Switch, {
           checked: !!text,
           size: "small"
         });
@@ -70,16 +69,16 @@ function getColumnRender(name, type) {
       break;
     case 'color':
       render = function render(text) {
-        return /*#__PURE__*/_react.default.createElement(_antd.Tag, {
+        return /*#__PURE__*/React.createElement(_antd.Tag, {
           color: text
         }, text);
       };
       break;
     case 'region':
       render = function render(text, record) {
-        return record["".concat(name, "_virtual")] || (text ? ((0, _lodash.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':
@@ -92,7 +91,7 @@ function getColumnRender(name, type) {
             previewUrl: "".concat(_ApiConfig.default.LUCKDA_HOST).concat(file.previewUrl)
           };
         });
-        return /*#__PURE__*/_react.default.createElement(_GridCell.default, {
+        return /*#__PURE__*/React.createElement(_GridCell.default, {
           fileList: fileList
         });
       };
@@ -123,11 +122,12 @@ 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 _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)(customProps)),
@@ -135,11 +135,12 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
     filterParams = _merge.filterParams,
     _props = (0, _objectWithoutProperties2.default)(_merge, _excluded3);
   var _extra = JSON.parse(extra) || {};
-  var data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+  var data = (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    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 || _form.defaultComName[property], _props)
   });
   if (isTreeGrid || isVirtual || (0, _lodash.includes)(['user', 'select', 'group', 'switch', 'color', 'region', 'file'], comName || _form.defaultComName[property])) data.sortable = false;