@luck-design-biz/luckda 0.0.25-9 → 0.0.25-af-2

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

@@ -1,69 +1,54 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import { useLatest, useCreation } from 'ahooks';
-import { omit } from 'lodash';
-import { useContext, useGet, getLevelNodes as _getLevelNodes, getSelfAndParent } from "../../engine/provider/ContextProvider";
-import { LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT, RUNTIME } from "../../constants";
-import DragDropWrapper from "../../painter/components/DragDrop/DragDropWrapper";
+import { useLDContext } from "../../engine/provider/ContextProvider";
+import { findNodeAndParent, getPathNodesById } from "../../engine/tools/dataProcess";
+import { CELL_CLASS_NAME } from "../../constants";
 var LCWrapper = function LCWrapper(_ref) {
   var id = _ref.id,
-    displayName = _ref.displayName,
     children = _ref.children,
     getTargetDom = _ref.getTargetDom,
     api = _ref.api;
-  var ctx = useContext();
-  var selfData = useGet({
-    id: id
-  });
-  var _selfData = useLatest(selfData);
-  useCreation(function () {
-    var meta = displayName ? require("../../engine/meta/".concat(displayName.toLowerCase(), ".props.json")) : {};
-    var _api = {
-      self: children,
-      getSelfData: function getSelfData() {
-        return _selfData.current;
-      },
-      getSelfDom: getTargetDom,
-      getSelfAndParentData: function getSelfAndParentData() {
-        return getSelfAndParent(id);
+  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 _getLevelNodes(id);
+        return getPathNodesById(_pageData.current, id);
       }
     };
-    ctx._register(id, new Proxy({
-      meta: omit(meta, ['props', 'css', 'advance'])
-    }, {
-      get: function get(target, property, receiver) {
-        if (property === 'api') {
-          return api ? _objectSpread(_objectSpread({}, _api), api.current) : _api;
-        }
-        return Reflect.get(target, property, receiver);
-      }
-    }));
   }, []);
   useEffect(function () {
-    var dom = getTargetDom();
-    if (dom) {
-      dom.setAttribute('id', id);
-      dom.setAttribute(LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT);
-    }
-    ctx.$publisher(ctx.topics.COMPONENT_MOUNT, {
-      id: id
+    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);
+        }
+      }));
+      context.$publisher(context.topics.COMPONENT_MOUNT, {
+        id: id
+      });
     });
     return function () {
-      ctx._unregister(id);
-      ctx.$publisher(ctx.topics.COMPONENT_UNMOUNT, {
+      context._unregister(id);
+      context.$publisher(context.topics.COMPONENT_UNMOUNT, {
         id: id
       });
     };
   }, []);
-  if (ctx.runtime === RUNTIME.DESIGN) {
-    return /*#__PURE__*/React.createElement(DragDropWrapper, {
-      id: id,
-      getTargetDom: getTargetDom
-    }, children);
-  }
   return children;
 };
 export default LCWrapper;

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

@@ -1,5 +1,5 @@
-.lc-view-canvas {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
+.lc-view-canvas {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}

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

@@ -1,84 +1,84 @@
-.lc-painter-loading {
-  position: absolute;
-  height: 64px;
-  width: 64px;
-  left: calc(50% - 32px);
-  top: calc(50% - 32px);
-  -webkit-transform: translateX(-50%) translateY(-50%);
-  transform: translateX(-50%) translateY(-50%);
-  -webkit-perspective: 400px;
-  perspective: 400px;
-}
-.cube {
-  height: 64px;
-  width: 64px;
-  -webkit-transform-origin: 50% 50%;
-  transform-origin: 50% 50%;
-  -webkit-transform-style: preserve-3d;
-  transform-style: preserve-3d;
-  -webkit-animation: rotate 4s infinite ease-in-out;
-  animation: rotate 4s infinite ease-in-out;
-}
-.side {
-  position: absolute;
-  display: block;
-  height: 64px;
-  width: 64px;
-  border-radius: 4px;
-}
-.side1 {
-  background: #41c3ac;
-  -webkit-transform: translateZ(46px);
-  transform: translateZ(46px);
-}
-.side2 {
-  background: #ff884d;
-  -webkit-transform: rotateY(90deg) translateZ(46px);
-  transform: rotateY(90deg) translateZ(46px);
-}
-.side3 {
-  background: #32526e;
-  -webkit-transform: rotateY(180deg) translateZ(46px);
-  transform: rotateY(180deg) translateZ(46px);
-}
-.side4 {
-  background: #65a2c5;
-  -webkit-transform: rotateY(-90deg) translateZ(46px);
-  transform: rotateY(-90deg) translateZ(46px);
-}
-.side5 {
-  background: #ffcc5c;
-  -webkit-transform: rotateX(90deg) translateZ(46px);
-  transform: rotateX(90deg) translateZ(46px);
-}
-.side6 {
-  background: #ff6b57;
-  -webkit-transform: rotateX(-90deg) translateZ(46px);
-  transform: rotateX(-90deg) translateZ(46px);
-}
-
-@-webkit-keyframes rotate {
-  0% {
-    -webkit-transform: rotateX(0deg) rotateY(0deg) rotateZ(0deg);
-  }
-  33.33% {
-    -webkit-transform: rotateX(360deg) rotateY(0deg) rotateZ(0deg);
-  }
-  66.66% {
-    -webkit-transform: rotateX(360deg) rotateY(360deg) rotateZ(0deg);
-  }
-  100% {
-    -webkit-transform: rotateX(360deg) rotateY(360deg) rotateZ(360deg);
-  }
-}
-@keyframes rotate {
-  0% {
-    transform: rotateX(0deg) rotateY(0deg);
-  }
-  50% {
-    transform: rotateX(360deg) rotateY(0deg);
-  }
-  100% {
-    transform: rotateX(360deg) rotateY(360deg);
-  }
-}
+.lc-painter-loading {
+  position: absolute;
+  height: 64px;
+  width: 64px;
+  left: calc(50% - 32px);
+  top: calc(50% - 32px);
+  -webkit-transform: translateX(-50%) translateY(-50%);
+  transform: translateX(-50%) translateY(-50%);
+  -webkit-perspective: 400px;
+  perspective: 400px;
+}
+.cube {
+  height: 64px;
+  width: 64px;
+  -webkit-transform-origin: 50% 50%;
+  transform-origin: 50% 50%;
+  -webkit-transform-style: preserve-3d;
+  transform-style: preserve-3d;
+  -webkit-animation: rotate 4s infinite ease-in-out;
+  animation: rotate 4s infinite ease-in-out;
+}
+.side {
+  position: absolute;
+  display: block;
+  height: 64px;
+  width: 64px;
+  border-radius: 4px;
+}
+.side1 {
+  background: #41c3ac;
+  -webkit-transform: translateZ(46px);
+  transform: translateZ(46px);
+}
+.side2 {
+  background: #ff884d;
+  -webkit-transform: rotateY(90deg) translateZ(46px);
+  transform: rotateY(90deg) translateZ(46px);
+}
+.side3 {
+  background: #32526e;
+  -webkit-transform: rotateY(180deg) translateZ(46px);
+  transform: rotateY(180deg) translateZ(46px);
+}
+.side4 {
+  background: #65a2c5;
+  -webkit-transform: rotateY(-90deg) translateZ(46px);
+  transform: rotateY(-90deg) translateZ(46px);
+}
+.side5 {
+  background: #ffcc5c;
+  -webkit-transform: rotateX(90deg) translateZ(46px);
+  transform: rotateX(90deg) translateZ(46px);
+}
+.side6 {
+  background: #ff6b57;
+  -webkit-transform: rotateX(-90deg) translateZ(46px);
+  transform: rotateX(-90deg) translateZ(46px);
+}
+
+@-webkit-keyframes rotate {
+  0% {
+    -webkit-transform: rotateX(0deg) rotateY(0deg) rotateZ(0deg);
+  }
+  33.33% {
+    -webkit-transform: rotateX(360deg) rotateY(0deg) rotateZ(0deg);
+  }
+  66.66% {
+    -webkit-transform: rotateX(360deg) rotateY(360deg) rotateZ(0deg);
+  }
+  100% {
+    -webkit-transform: rotateX(360deg) rotateY(360deg) rotateZ(360deg);
+  }
+}
+@keyframes rotate {
+  0% {
+    transform: rotateX(0deg) rotateY(0deg);
+  }
+  50% {
+    transform: rotateX(360deg) rotateY(0deg);
+  }
+  100% {
+    transform: rotateX(360deg) rotateY(360deg);
+  }
+}

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

@@ -1,8 +1,5 @@
-.lc-view-page {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
-.lc-view-page.isloading {
-  overflow: hidden;
-}
+.lc-view-page {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}

package/es/services.js

@@ -1,18 +1,17 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import { stringify } from 'querystring';
 import { request } from '@luck-design-biz/base/utils';
 import api from "@/services/ApiConfig";
 export function readModlue(_x) {
   return _readModlue.apply(this, arguments);
 }
 function _readModlue() {
-  _readModlue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+  _readModlue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(get) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", request("".concat(api.LUCKDA_HOST, "/ui/builder/noAuthFetchModule"), {
-            params: params
-          }));
+          return _context.abrupt("return", request("".concat(api.LUCKDA_HOST, "/ui/builder/noAuthFetchModule?").concat(stringify(get))));
         case 1:
         case "end":
           return _context.stop();
@@ -20,4 +19,27 @@ function _readModlue() {
     }, _callee);
   }));
   return _readModlue.apply(this, arguments);
+}
+export function readBehaviorCall(_x2, _x3) {
+  return _readBehaviorCall.apply(this, arguments);
+}
+function _readBehaviorCall() {
+  _readBehaviorCall = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(get, post) {
+    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)), {
+            method: 'POST',
+            body: post,
+            headers: {
+              'Content-Type': 'application/json;charset=UTF-8'
+            }
+          }));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  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", "supportTypes", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
+var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "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,7 +55,6 @@ 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,
@@ -80,7 +79,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     currentUser = _getDvaApp$_store$get.currentUser;
   var supportUploadTypes = useCreation(function () {
     return getSupportUploadTypes(forbiddenTypes);
-  }, [forbiddenTypes, supportTypes]);
+  }, [forbiddenTypes]);
 
   // 下载
   var downloadFile = function downloadFile(filenames, tag) {
@@ -271,6 +270,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
 
   // 预览
   var resetActionsColumn = useMemoizedFn(function (data, index, _actions, params) {
+    if (resetActions) {
+      return resetActions(data, index, actionList, params);
+    }
     var actions = _actions.filter(function (item) {
       return item.wanted !== 'update' && item.wanted !== 'add';
     });
@@ -311,9 +313,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
         });
       }
     });
-    if (resetActions) {
-      return resetActions(data, index, actions, params);
-    }
     return actions;
   });
   var handleBatchOperationsClick = useMemoizedFn(function (key, selectedRows, cb) {
@@ -381,10 +380,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
           supportUploadTypes: supportUploadTypes,
           beforeUpload: _beforeUpload
         });
-      },
-      onChange: function onChange(e) {
-        handleUploadChange(e);
-        rest.onChange && rest.onChange(e);
       }
     })
   }), /*#__PURE__*/React.createElement(BasicFormItem, {

package/es/upload/Form/index.js

@@ -6,7 +6,6 @@ import { omitBy, isNil } from 'lodash';
 import { stringify } from 'querystring';
 import GridForm from "./gridForm";
 import { request } from '@luck-design-biz/base/utils';
-import { getBehaviorUrl } from "../../lowcode/constants/api-url";
 function buildComponent(props) {
   var _formId = props.formId,
     moduleCode = props.moduleCode,
@@ -30,7 +29,7 @@ function buildComponent(props) {
       active: !(behaviorKey === 'loadFileGrid' || rest.formMode === 'add' || rest.formMode === 'update'),
       docUid: docUid || formData[mainFormLdId] && formData[mainFormLdId][PRIMARY_KEY] || ticketData && ticketData[PRIMARY_KEY]
     }, isNil);
-    return "".concat(getBehaviorUrl(), "?").concat(stringify(params));
+    return "".concat(window.appConfig.OSS_HOST_V3, "?").concat(stringify(params));
   };
   return /*#__PURE__*/React.createElement(GridForm, _extends({
     formId: formId,

package/es/upload/Form/index.less

@@ -1,7 +1,7 @@
-.fileGrid {
-  :global {
-    .ag-root-wrapper-body.ag-layout-normal {
-      height: 100% !important;
-    }
-  }
-}
+.fileGrid {
+  :global {
+    .ag-root-wrapper-body.ag-layout-normal {
+      height: 100% !important;
+    }
+  }
+}

package/es/upload/FormItem/index.js

@@ -1,27 +1,27 @@
 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", "supportTypes", "forbiddenTypes", "children", "dataFormat", "listType"];
+var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "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';
-import { getBehaviorUrl } from "../../lowcode/constants/api-url";
+import { useCreation } from 'ahooks';
 
-/**
- * 表单类型富文本上传
- * 是否实体字段： 是
- * 是否接受tag： 是
- * 是否虚拟主键： 否
- * 接受参数： 
- *    name: 附件名称逗号拼接
- *    name_virtual: [{...// 附件所有参数}]
- *    ### name=name_virtual ###
- * 传参： 
- *    name: [{objectName, marker},...]
- * 其他需求： 
- *  支持beforeUpload禁止附加类型
- *  =>beforeUpload禁止类型全覆盖
- *  =>forbiddenTypes和配置管理中禁止类型合并
+/**
+ * 表单类型富文本上传
+ * 是否实体字段： 是
+ * 是否接受tag： 是
+ * 是否虚拟主键： 否
+ * 接受参数： 
+ *    name: 附件名称逗号拼接
+ *    name_virtual: [{...// 附件所有参数}]
+ *    ### name=name_virtual ###
+ * 传参： 
+ *    name: [{objectName, marker},...]
+ * 其他需求： 
+ *  支持beforeUpload禁止附加类型
+ *  =>beforeUpload禁止类型全覆盖
+ *  =>forbiddenTypes和配置管理中禁止类型合并
  */
 
 function buildComponent(props) {
@@ -35,16 +35,17 @@ 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,
     listType = props.listType,
     rest = _objectWithoutProperties(props, _excluded);
   var getUrl = function getUrl(behaviorKey) {
-    return "".concat(getBehaviorUrl(), "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "&note=").concat(note);
+    return "".concat(window.appConfig.OSS_HOST_V3, "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "&note=").concat(note);
   };
-  var supportUploadTypes = getSupportUploadTypes(forbiddenTypes, supportTypes);
+  var supportUploadTypes = useCreation(function () {
+    return getSupportUploadTypes(forbiddenTypes);
+  }, [forbiddenTypes]);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({
     extra: "".concat(formatMessage({
       id: 'app.upload.supportUpload',

package/es/upload/index.js

@@ -1,4 +1,3 @@
 export { default as buildUploadForm } from "./Form";
 export { default as buildUploadFormItem } from "./FormItem";
-export { default as UploadGridCell } from "./GridCell";
-export { default as UploadFilesWall } from "./FilesWall";
+export { default as UploadGridCell } from "./GridCell";

package/es/utils/action.js

@@ -2,7 +2,7 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 // 行为请求同一接口
-import { fetchCallBehavior } from "../lowcode/constants/api-url";
+import { readBehaviorCall } from "../services";
 export function behaviorCall() {
   return _behaviorCall.apply(this, arguments);
 }
@@ -18,7 +18,7 @@ function _behaviorCall() {
           get = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
           post = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
           datasetCode = get.datasetCode;
-          return _context.abrupt("return", fetchCallBehavior(_objectSpread(_objectSpread({}, get), {}, {
+          return _context.abrupt("return", readBehaviorCall(_objectSpread(_objectSpread({}, get), {}, {
             datasetCode: datasetCode || Object.keys(post).join(',')
           }), post));
         case 4:

package/es/utils/form.js

@@ -18,11 +18,11 @@ import { defaultComName, translator, splitStrToObj, formatCustomProps } from "..
 import { getColumnRender } from "./grid";
 import * as formItemUtils from "../helper/FromItems";
 
-/**
- * 根据动态表单配置项生成formItem
- * @param {动态表单配置项} props
- * @param {自定义动态表单配置项} customProps
- * @returns <BasicForm name='' ... />
+/**
+ * 根据动态表单配置项生成formItem
+ * @param {动态表单配置项} props
+ * @param {自定义动态表单配置项} customProps
+ * @returns <BasicForm name='' ... />
  */
 export function getFormItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -32,13 +32,12 @@ export function getFormItem() {
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!property) return /*#__PURE__*/React.createElement(React.Fragment, null);
   if (property === 'sint' || property === 'number') props.opt_decimal = 0;
-  var comType = comName || defaultComName[property];
   var _translator = translator(props),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
   var _merge = merge(
     // 移除type，不能删除type,会导致查询renderInfo的时候报错
-    translateProps, formatCustomProps(comType, customProps)),
+    translateProps, formatCustomProps(customProps)),
     type = _merge.type,
     _props = _objectWithoutProperties(_merge, _excluded3);
   if (customProps.renderBasicFormItem) {
@@ -49,18 +48,18 @@ export function getFormItem() {
       key: name
     }), com.props.children);
   }
-  var getFormItemUtils = formItemUtils["get".concat(capitalize(comType), "Item")];
+  var getFormItemUtils = formItemUtils["get".concat(capitalize(comName || defaultComName[property]), "Item")];
   return getFormItemUtils(_objectSpread(_objectSpread({}, _props), {}, {
     name: name,
     key: name
   }));
 }
 
-/**
- * 根据后端返回数据组装表单数据
- * @param {数组---动态表单配置参数列表} propsList
- * @param {对象---后端返回的未处理数据} values
- * @returns
+/**
+ * 根据后端返回数据组装表单数据
+ * @param {数组---动态表单配置参数列表} propsList
+ * @param {对象---后端返回的未处理数据} values
+ * @returns
  */
 export var formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -78,11 +77,6 @@ export var formItemDataFormat = function formItemDataFormat() {
       case 'date':
         result[name] = values["".concat(name, "_virtual")] ? moment(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':
@@ -130,11 +124,11 @@ export var formItemDataFormat = function formItemDataFormat() {
   return _objectSpread(_objectSpread({}, omitValues), data);
 };
 
-/**
- * 数据格式化
- * @param {数组---动态表单配置参数列表} propsList
- * @param {对象---表单获取到的未处理数据} values
- * @returns
+/**
+ * 数据格式化
+ * @param {数组---动态表单配置参数列表} propsList
+ * @param {对象---表单获取到的未处理数据} values
+ * @returns
  */
 export var dataFormat = function dataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -154,15 +148,9 @@ export var dataFormat = function dataFormat() {
       case 'date':
         result[name] = values[name] ? moment(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 (isArray(values[name])) result[name] = values[name].map(function (v) {
           return v.value || v.key;
         }).join(',');else result[name] = !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;
@@ -199,12 +187,12 @@ export var dataFormat = function dataFormat() {
   return _objectSpread(_objectSpread({}, values), data);
 };
 
-/**
- *
- * @param formType
- * @param props
- * @param customProps
- * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
+/**
+ *
+ * @param formType
+ * @param props
+ * @param customProps
+ * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
  */
 export var getFormColumn = function getFormColumn() {
   var _props$config;
@@ -223,7 +211,7 @@ export var getFormColumn = function getFormColumn() {
     translateProps = _objectWithoutProperties(_translator2, _excluded8);
   var _merge2 = merge(
     // mode=writer移除type，不能删除type,会导致查询renderInfo的时候报错
-    translateProps, formatCustomProps(formItemType, formItemRewrite)),
+    translateProps, formatCustomProps(formItemRewrite)),
     type = _merge2.type,
     _ = _merge2.name,
     _props = _objectWithoutProperties(_merge2, _excluded9);