@luck-design-biz/luckda 0.0.25-7 → 0.0.25-9

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

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
@@ -22,7 +23,8 @@ var _index = require("../../../../index");
 var _helper = require("../../../engine/tools/helper");
 var _treePropsDefault = _interopRequireDefault(require("../../../engine/meta/tree.props.default.json"));
 var _index2 = _interopRequireDefault(require("./index.less"));
-var _excluded = ["id", "wrapperRef", "className", "dataset", "width", "height", "showLine", "defaultExpandDeep", "actions", "editable", "showRootAdd", "onlyRoot", "rootAddSetting", "doubleClickExpand", "onDoubleClick", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "onTreeNodeRender", "treeNodeIcon", "advance"];
+var _excluded = ["id", "wrapperRef", "className", "dataset", "width", "height", "showLine", "defaultExpandDeep", "actions", "editable", "showRootAdd", "onlyRoot", "rootAddSetting", "doubleClickExpand", "onDoubleClick", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "onTreeNodeRender", "treeNodeIcon", "advance", "cancelSelect", "defaultSelect"];
+var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
 var LCTree = function LCTree(_ref) {
   var id = _ref.id,
     wrapperRef = _ref.wrapperRef,
@@ -45,16 +47,41 @@ var LCTree = function LCTree(_ref) {
     onTreeNodeRender = _ref.onTreeNodeRender,
     _treeNodeIcon = _ref.treeNodeIcon,
     advance = _ref.advance,
+    cancelSelect = _ref.cancelSelect,
+    defaultSelect = _ref.defaultSelect,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var ctx = (0, _ContextProvider.useContext)();
   var boxRef = (0, _react.useRef)();
+  var apiRef = (0, _react.useRef)();
   var treeRef = (0, _react.useRef)();
+  var _useState = (0, _react.useState)([]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    selectedKeys = _useState2[0],
+    setSelectedKeys = _useState2[1];
   var getTargetDom = (0, _ahooks.useMemoizedFn)(function () {
     return boxRef.current;
   });
-  (0, _react.useImperativeHandle)(wrapperRef, function () {
-    return treeRef.current;
+  (0, _react.useImperativeHandle)(apiRef, function () {
+    return {
+      getInstance: function getInstance() {
+        return treeRef.current;
+      }
+    };
   });
+  (0, _react.useEffect)(function () {
+    var tid = ctx.$subscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED).on(function (_ref2) {
+      var resource = _ref2.resource,
+        prevResource = _ref2.prevResource;
+      ctx.doAction(advance.events.onPagePublicResourceChanged, {
+        resource: resource,
+        prevResource: prevResource,
+        instance: treeRef.current
+      });
+    }).watch();
+    return function () {
+      ctx.$unsubscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED, tid);
+    };
+  }, []);
   var handleMount = (0, _ahooks.useMemoizedFn)(function (params) {
     ctx.doAction(advance.events.onMount, {
       params: params
@@ -80,6 +107,12 @@ var LCTree = function LCTree(_ref) {
       e: e
     });
   });
+  var handleDrop = (0, _ahooks.useMemoizedFn)(function (info, dragInfo) {
+    ctx.doAction(advance.events.onCheck, {
+      info: info,
+      dragInfo: dragInfo
+    });
+  });
   var events = (0, _ahooks.useCreation)(function () {
     if (advance !== null && advance !== void 0 && advance.events) {
       var _events = {};
@@ -88,29 +121,59 @@ var LCTree = function LCTree(_ref) {
       if (advance.events.processDataSource) _events.dataToTreeFormat = handleProcessDataSource;
       if (advance.events.onDoubleClick) _events.onNodeDoubleClick = handleNodeDoubleClick;
       if (advance.events.onCheck) _events.onCheck = handleCheck;
+      if (advance.events.onDrop) _events.onDrop = handleDrop;
       return _events;
     }
     return {};
   }, [advance === null || advance === void 0 ? void 0 : advance.events]);
-  var handleDrop = (0, _ahooks.useMemoizedFn)(function (info, dragInfo) {
-    if (dragInfo !== false) {
-      // ctx.doAction(advance.events.onDoubleClick, { e, rowData });
-      // doAction('drag', {
-      //   get: { datasetCode: dataSetKey },
-      //   post: {
-      //     fromId: info.dragNode.props.dataRef[PRIMARY],
-      //     toId: info.node.props.dataRef[PRIMARY],
-      //   }
-      // }, {
-      //   showConfirm: false,
-      //   callback: (success) => success && onLdQuery()
-      // });
+  var handleSelect = (0, _ahooks.useMemoizedFn)(function (_selectedKeys, e) {
+    if (cancelSelect || e.selected) {
+      setSelectedKeys(_selectedKeys);
+      ctx.setPagePublicResource((0, _defineProperty2.default)({}, id, {
+        selectedNodes: e.selectedNodes.map(function (i) {
+          var _i$props;
+          return (i === null || i === void 0 || (_i$props = i.props) === null || _i$props === void 0 ? void 0 : _i$props.dataRef) || i;
+        })
+      }));
     }
+    ctx.doAction(advance.events.onSelect, {
+      checkedKeys: _selectedKeys,
+      e: e
+    });
   });
+  var afterInit = (0, _ahooks.useMemoizedFn)(function (treeData, data) {
+    var selected = !(0, _lodash.isNil)(defaultSelect) ? (0, _helper.executeCode)(ctx, defaultSelect, ['treeData'], treeData) : null;
+    selected && handleSelect(selected, {
+      selected: true,
+      selectedNodes: selected.map(function (key) {
+        return (0, _lodash.keyBy)(data, PRIMARY)[key];
+      })
+    });
+  });
+  var handleAction = function handleAction(action, params) {
+    var doAction = function doAction() {
+      ctx.doAction(action.actionPool, params);
+    };
+    if (action.riskLevel === 'danger') {
+      _base.Modal.confirm({
+        title: "\u786E\u8BA4\u6267\u884C".concat(action.name, "\u884C\u4E3A\u64CD\u4F5C\u5417\uFF1F"),
+        onOk: doAction
+      });
+    } else if (action.riskLevel === 'destroy') {
+      (0, _base.recheck)({
+        title: "\u786E\u8BA4\u6267\u884C".concat(action.name, "\u884C\u4E3A\u64CD\u4F5C\u5417\uFF1F"),
+        checkWords: "\u6267\u884C".concat(action.name),
+        onOk: doAction
+      });
+    } else {
+      doAction();
+    }
+  };
   return /*#__PURE__*/_react.default.createElement(_Wrapper.default, {
     id: id,
     displayName: "Tree",
-    getTargetDom: getTargetDom
+    getTargetDom: getTargetDom,
+    api: apiRef
   }, /*#__PURE__*/_react.default.createElement("div", {
     ref: boxRef,
     style: {
@@ -141,8 +204,9 @@ var LCTree = function LCTree(_ref) {
           key: (0, _utils.suid)(),
           name: action.name,
           onClick: function onClick(_, data) {
-            ctx.doAction(action.actionPool, {
-              data: data
+            handleAction(action, {
+              data: data,
+              datasetCode: dataset === null || dataset === void 0 ? void 0 : dataset.code
             });
           },
           resource: action.serial,
@@ -183,7 +247,9 @@ var LCTree = function LCTree(_ref) {
     onTreeNodeRender: onTreeNodeRender ? function (title, i) {
       return (0, _helper.executeCode)(ctx, onTreeNodeRender, ['title', 'item'], title, i);
     } : null,
-    onDrop: handleDrop
+    selectedKeys: selectedKeys,
+    onSelect: handleSelect,
+    afterInit: afterInit
   }, events, props))));
 };
 LCTree.propTypes = {
@@ -340,11 +406,12 @@ LCTree.propTypes = {
    * @name 复选框选择事件
    * @type _JSEditor
    */
-  onCheck: _propTypes.default.string
+  onCheck: _propTypes.default.string,
+  /**
+   * @name 选中事件
+   * @type _JSEditor
+   */
+  onSelect: _propTypes.default.string
 };
 LCTree.defaultProps = (0, _helper.omitBadProps)(_treePropsDefault.default);
-var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  return /*#__PURE__*/_react.default.createElement(LCTree, (0, _extends2.default)({
-    wrapperRef: ref
-  }, props));
-});
+var _default = exports.default = LCTree;

package/lib/lowcode/view/lc-components/Tree/meta.json

@@ -17,7 +17,18 @@
       "key": "dataset",
       "name": "数据集",
       "desc": "选择系统中的可用树形数据集",
-      "type": "_DataSetSelector"
+      "type": "_DataSetSelector",
+      "component": "tree",
+      "next": {
+        "name": "字段配置",
+        "props": [
+          {
+            "key": "fields",
+            "name": "#字段配置器",
+            "type": "_FieldsSetting"
+          }
+        ]
+      }
     },
     {
       "key": "title",
@@ -118,6 +129,31 @@
           "default": "0"
         }
       ]
+    }, {
+      "key": "selectSetting",
+      "name": "选中设置",
+      "type": "group",
+      "props": [
+        {
+          "key": "cancelSelect",
+          "name": "取消选中",
+          "desc": "是否可以取消选中",
+          "type": "switch",
+          "default": true
+        },
+        {
+          "key": "defaultSelect",
+          "name": "默认选中",
+          "desc": "返回默认选中的数据主键",
+          "type": "_JSEditor",
+          "defaultCode": "function defaultSelect(treeData) { \n return []; \n}",
+          "mustConfirm": true,
+          "wrapper": "collapse",
+          "wrapperProps": {
+            "suppressIcon": true
+          }
+        }
+      ]
     },
     {
       "key": "IconSetting",
@@ -191,6 +227,7 @@
             "default": {
               "todoList": []
             },
+            "defaultCode": "function onActionClick(data) {\n\n}",
             "suppressDisplay": true,
             "suppressMax": true,
             "suppressMore": true,
@@ -277,32 +314,50 @@
         "key": "onMount",
         "name": "组件首次渲染时",
         "desc": "在组件首次渲染时，执行方法",
-        "func": "(params)=>{\n\t\n}"
+        "func": "function onMount(params) {\n\t\n}"
       },
       {
         "key": "onUnmount",
         "name": "组件卸载时",
         "desc": "在组件卸载时，执行方法。",
-        "func": "()=>{\n\t\n}"
+        "func": "function onUnmount() {\n\t\n}"
       },
       {
         "key": "processDataSource",
         "name": "数据预处理",
         "desc": "数据渲染前预处理",
-        "func": "(data)=>{\n\t\n}"
+        "func": "function processDataSource(data) {\n\t\n}"
       },
       {
         "key": "onDoubleClick",
         "name": "双击事件",
         "desc": "树节点双击事件",
-        "func": "(e, rowData)=>{\n\t\n}"
+        "func": "function onDoubleClick(e, rowData) {\n\t\n}"
       },
       {
         "key": "onCheck",
         "name": "复选框选择事件",
         "desc": "点击复选框触发",
-        "func": "(checkedKeys, e)=>{\n\t\n}"
+        "func": "function onCheck(checkedKeys, e) {\n\t\n}"
+      },
+      {
+        "key": "onSelect",
+        "name": "选中事件",
+        "desc": "节点选中事件",
+        "func": "function onSelect(checkedKeys, e) {\n\t\n}"
+      },
+      {
+        "key": "onDrop",
+        "name": "拖拽事件",
+        "desc": "节点拖拽事件",
+        "func": "function onDrop(info, dragInfo) {\n\t\n}"
+      },
+      {
+        "key": "onPagePublicResourceChanged",
+        "name": "页面共享资源变化后",
+        "desc": "当页面共享资源发生变化后（pagePublicResourceChanged），执行方法",
+        "func": "function onPagePublicResourceChanged(resource, prevResource, instance) {\n\t\n}"
       }
     ]
   }
-}
+}

package/lib/upload/FilesWall/index.js

@@ -21,11 +21,11 @@ var _lodash = require("lodash");
 var _luckDesign = require("luck-design");
 var _index = _interopRequireDefault(require("./index.less"));
 var _excluded = ["rowKey", "formMode", "beforeUpload", "onUploadChange", "moduleCode", "docUid", "bucket", "operates", "zipName", "showNote", "tag", "maxLength"];
-/**
- * 附件墙
- * @param props
- * @returns {JSX.Element}
- * @constructor
+/**
+ * 附件墙
+ * @param props
+ * @returns {JSX.Element}
+ * @constructor
  */
 var FilesWall = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$rowKey = props.rowKey,
@@ -294,10 +294,10 @@ var FilesWall = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     }
   }, "\u5220\u9664"));
 
-  /**
-   * 删除
-   * @param selectedRows 选择的数据
-   * @param isCheck 是否批量勾选
+  /**
+   * 删除
+   * @param selectedRows 选择的数据
+   * @param isCheck 是否批量勾选
    */
   var handleDelete = function handleDelete(selectedRows, isCheck) {
     setState({
@@ -341,10 +341,10 @@ var FilesWall = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     });
   };
 
-  /**
-   * 下载附件
-   * @param filenames
-   * @param tag downloadOne：下载单个，其他批量
+  /**
+   * 下载附件
+   * @param filenames
+   * @param tag downloadOne：下载单个，其他批量
    */
   var downloadFile = function downloadFile(filenames, tag) {
     saveAs("".concat(getUrl('download'), "&fileName=").concat(filenames[0]));

package/lib/upload/FilesWall/index.less

@@ -1,74 +1,74 @@
-.operates {
-  display: flex;
-  margin-bottom: 8px;
-}
-
-.filesWall {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-  width: 100%;
-  box-sizing: border-box;
-
-  .fileContent {
-    position: relative;
-
-    .check {
-      position: absolute;
-      right: 8px;
-      top: -3px;
-    }
-
-    .img {
-      position: relative;
-      padding: 8px;
-      border: 1px solid #d9d9d9;
-      border-radius: 4px 0 4px 4px;
-      display: table;
-      float: left;
-      width: 104px;
-      height: 104px;
-      margin-right: 8px;
-      margin-bottom: 8px;
-      text-align: center;
-      vertical-align: top;
-      cursor: pointer;
-      -webkit-transition: border-color 0.3s ease;
-      transition: border-color 0.3s ease;
-    }
-  }
-
-  .actions {
-    width: 104px !important;
-    height: 104px !important;
-    position: absolute;
-    background-color: rgba(0, 0, 0, 0.4);
-    border-radius: 4px;
-    display: none !important;
-
-    .actionsChild {
-      margin-top: 35%;
-    }
-  }
-
-  .fileContent:hover + .actions,
-  .actions:hover {
-    display: block !important;
-  }
-
-  :global {
-    .ant-upload-select-picture-card i {
-      font-size: 32px;
-      color: #999;
-    }
-
-    .ant-upload-select-picture-card .ant-upload-text {
-      margin-top: 8px;
-      color: #666;
-    }
-
-    .ant-upload-picture-card-wrapper {
-      width: auto;
-    }
-  }
-}
+.operates {
+  display: flex;
+  margin-bottom: 8px;
+}
+
+.filesWall {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  width: 100%;
+  box-sizing: border-box;
+
+  .fileContent {
+    position: relative;
+
+    .check {
+      position: absolute;
+      right: 8px;
+      top: -3px;
+    }
+
+    .img {
+      position: relative;
+      padding: 8px;
+      border: 1px solid #d9d9d9;
+      border-radius: 4px 0 4px 4px;
+      display: table;
+      float: left;
+      width: 104px;
+      height: 104px;
+      margin-right: 8px;
+      margin-bottom: 8px;
+      text-align: center;
+      vertical-align: top;
+      cursor: pointer;
+      -webkit-transition: border-color 0.3s ease;
+      transition: border-color 0.3s ease;
+    }
+  }
+
+  .actions {
+    width: 104px !important;
+    height: 104px !important;
+    position: absolute;
+    background-color: rgba(0, 0, 0, 0.4);
+    border-radius: 4px;
+    display: none !important;
+
+    .actionsChild {
+      margin-top: 35%;
+    }
+  }
+
+  .fileContent:hover + .actions,
+  .actions:hover {
+    display: block !important;
+  }
+
+  :global {
+    .ant-upload-select-picture-card i {
+      font-size: 32px;
+      color: #999;
+    }
+
+    .ant-upload-select-picture-card .ant-upload-text {
+      margin-top: 8px;
+      color: #666;
+    }
+
+    .ant-upload-picture-card-wrapper {
+      width: auto;
+    }
+  }
+}

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,
@@ -87,7 +88,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     currentUser = _getDvaApp$_store$get.currentUser;
   var supportUploadTypes = (0, _ahooks.useCreation)(function () {
     return (0, _utils.getSupportUploadTypes)(forbiddenTypes);
-  }, [forbiddenTypes]);
+  }, [forbiddenTypes, supportTypes]);
 
   // 下载
   var downloadFile = function downloadFile(filenames, tag) {

package/lib/upload/FormItem/index.js

@@ -11,9 +11,8 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _luckDesign = require("luck-design");
 var _utils = require("@luck-design-biz/base/utils");
-var _ahooks = require("ahooks");
 var _apiUrl = require("../../lowcode/constants/api-url");
-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"];
 /**
  * 表单类型富文本上传
  * 是否实体字段： 是
@@ -42,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,9 +50,7 @@ function buildComponent(props) {
   var getUrl = function getUrl(behaviorKey) {
     return "".concat((0, _apiUrl.getBehaviorUrl)(), "?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]);
+  var supportUploadTypes = (0, _utils.getSupportUploadTypes)(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

@@ -40,12 +40,13 @@ function getFormItem() {
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!property) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
   if (property === 'sint' || property === 'number') props.opt_decimal = 0;
+  var comType = comName || _form.defaultComName[property];
   var _translator = (0, _form.translator)(props),
     name = _translator.name,
     translateProps = (0, _objectWithoutProperties2.default)(_translator, _excluded2);
   var _merge = (0, _lodash.merge)(
     // 移除type，不能删除type,会导致查询renderInfo的时候报错
-    translateProps, (0, _form.formatCustomProps)(customProps)),
+    translateProps, (0, _form.formatCustomProps)(comType, customProps)),
     type = _merge.type,
     _props = (0, _objectWithoutProperties2.default)(_merge, _excluded3);
   if (customProps.renderBasicFormItem) {
@@ -56,7 +57,7 @@ function getFormItem() {
       key: name
     }), com.props.children);
   }
-  var getFormItemUtils = formItemUtils["get".concat((0, _lodash.capitalize)(comName || _form.defaultComName[property]), "Item")];
+  var getFormItemUtils = formItemUtils["get".concat((0, _lodash.capitalize)(comType), "Item")];
   return getFormItemUtils((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
     name: name,
     key: name
@@ -85,9 +86,15 @@ var formItemDataFormat = exports.formItemDataFormat = function formItemDataForma
       case 'date':
         result[name] = values["".concat(name, "_virtual")] ? (0, _moment.default)(values["".concat(name, "_virtual")], 'YYYY-MM-DD HH:mm:ss') : undefined;
         break;
+      case 'dict':
+        if (props.display === 'radio') {
+          result[name] = values[name] || void 0;
+          break;
+        }
       case 'user':
       case 'select':
       case 'group':
+      case 'complex':
         if (translatorProps.multiple) {
           result[name] = (0, _form.splitStrToObj)(values[name], values["".concat(name, "_virtual")]);
         } else {
@@ -155,9 +162,15 @@ var dataFormat = exports.dataFormat = function dataFormat() {
       case 'date':
         result[name] = values[name] ? (0, _moment.default)(values[name]).valueOf() : null;
         break;
+      case 'dict':
+        if (props.display === 'radio') {
+          result[name] = values[name] || null;
+          break;
+        }
       case 'user':
       case 'select':
       case 'group':
+      case 'complex':
         if ((0, _lodash.isArray)(values[name])) result[name] = values[name].map(function (v) {
           return v.value || v.key;
         }).join(',');else result[name] = !(0, _lodash.isNil)((_values$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.value) ? values[name].value : ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.key) || null;
@@ -218,7 +231,7 @@ var getFormColumn = exports.getFormColumn = function getFormColumn() {
     translateProps = (0, _objectWithoutProperties2.default)(_translator2, _excluded8);
   var _merge2 = (0, _lodash.merge)(
     // mode=writer移除type，不能删除type,会导致查询renderInfo的时候报错
-    translateProps, (0, _form.formatCustomProps)(formItemRewrite)),
+    translateProps, (0, _form.formatCustomProps)(formItemType, formItemRewrite)),
     type = _merge2.type,
     _ = _merge2.name,
     _props = (0, _objectWithoutProperties2.default)(_merge2, _excluded9);