@luck-design-biz/luckda 0.0.25-1 → 0.0.25-11

package/es/upload/FormItem/index.js

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

package/es/upload/index.js

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

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 { readBehaviorCall } from "../services";
+import { fetchCallBehavior } from "../lowcode/constants/api-url";
 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", readBehaviorCall(_objectSpread(_objectSpread({}, get), {}, {
+          return _context.abrupt("return", fetchCallBehavior(_objectSpread(_objectSpread({}, get), {}, {
             datasetCode: datasetCode || Object.keys(post).join(',')
           }), post));
         case 4:

package/es/utils/form.js

@@ -32,12 +32,13 @@ 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(customProps)),
+    translateProps, formatCustomProps(comType, customProps)),
     type = _merge.type,
     _props = _objectWithoutProperties(_merge, _excluded3);
   if (customProps.renderBasicFormItem) {
@@ -48,7 +49,7 @@ export function getFormItem() {
       key: name
     }), com.props.children);
   }
-  var getFormItemUtils = formItemUtils["get".concat(capitalize(comName || defaultComName[property]), "Item")];
+  var getFormItemUtils = formItemUtils["get".concat(capitalize(comType), "Item")];
   return getFormItemUtils(_objectSpread(_objectSpread({}, _props), {}, {
     name: name,
     key: name
@@ -77,9 +78,15 @@ 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':
+      case 'complex':
         if (translatorProps.multiple) {
           result[name] = splitStrToObj(values[name], values["".concat(name, "_virtual")]);
         } else {
@@ -147,9 +154,15 @@ 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;
@@ -210,7 +223,7 @@ export var getFormColumn = function getFormColumn() {
     translateProps = _objectWithoutProperties(_translator2, _excluded8);
   var _merge2 = merge(
     // mode=writer移除type，不能删除type,会导致查询renderInfo的时候报错
-    translateProps, formatCustomProps(formItemRewrite)),
+    translateProps, formatCustomProps(formItemType, formItemRewrite)),
     type = _merge2.type,
     _ = _merge2.name,
     _props = _objectWithoutProperties(_merge2, _excluded9);

package/es/utils/grid.js

@@ -44,6 +44,7 @@ export function getColumnRender(name, type) {
     case 'user':
     case 'select':
     case 'group':
+    case 'complex':
       render = function render(text, record) {
         if (record["".concat(name, "_virtual")]) return record["".concat(name, "_virtual")];
         if (isArray(text)) return text.map(function (i) {
@@ -115,6 +116,7 @@ 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 comType = comName || defaultComName[property];
   var _props$isVirtual = props.isVirtual,
     isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual,
     _props$extra = props.extra,
@@ -122,7 +124,7 @@ export var getGridColumn = function getGridColumn() {
   var _translator = translator(props),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
-  var _merge = merge(translateProps, formatCustomProps(customProps)),
+  var _merge = merge(translateProps, formatCustomProps(comType, customProps)),
     filter = _merge.filter,
     filterParams = _merge.filterParams,
     _props = _objectWithoutProperties(_merge, _excluded3);
@@ -132,9 +134,9 @@ export var getGridColumn = function getGridColumn() {
     title: _props.label,
     headerAlign: _props.headerAlign || getAlign(_extra, 'sheading_alignment_virtual'),
     align: _props.align || getAlign(_extra, 'scell_alignment_virtual'),
-    render: _props.render || getColumnRender(name, comName || defaultComName[property], _props)
+    render: _props.render || getColumnRender(name, comType, _props)
   });
-  if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region', 'file'], comName || defaultComName[property])) data.sortable = false;
+  if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region', 'file', 'complex'], comType)) data.sortable = false;
   // data.filter = false;
   if (!isNil(filter)) {
     // 因为后端升级问题，暂时关闭过滤功能
@@ -147,7 +149,7 @@ export var getGridColumn = function getGridColumn() {
       data.filter = 'text';
       return data;
     }
-    switch (comName || defaultComName[property]) {
+    switch (comType) {
       case 'switch':
         data.filter = 'select';
         data.filterParams = {
@@ -248,7 +250,7 @@ export var getGridColumn = function getGridColumn() {
       required: true
     } : true;
     if (_props.cellWriter) data.cellWriter = _props.cellWriter;else {
-      var formItemCom = capitalize(comName || defaultComName[property]) === 'Textarea' ? 'String' : capitalize(comName || defaultComName[property]);
+      var formItemCom = capitalize(comType) === 'Textarea' ? 'String' : capitalize(comType);
       var getFormItemUtils = formItemUtils["get".concat(formItemCom, "Item")];
       var formItemProps = {};
       switch (formItemCom) {
@@ -265,6 +267,7 @@ export var getGridColumn = function getGridColumn() {
         case 'user':
         case 'select':
         case 'group':
+        case 'complex':
           if (translateProps.multiple) {
             formItemProps = {
               dataFormat: function dataFormat(value) {

package/lib/components/ComplexItem/index.js

@@ -0,0 +1,100 @@
+"use strict";
+
+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 _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _react = _interopRequireWildcard(require("react"));
+var _umi = require("umi");
+var _antd = require("luck-design/antd");
+var _lodash = require("lodash");
+var _base = require("@luck-design-biz/base");
+var _utils = require("@luck-design-biz/base/utils");
+var _luckDesign = require("luck-design");
+var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
+var _service = require("./service");
+var _excluded = ["wrapperRef", "config", "renderInfoMode", "complexConfig"];
+var Index = function Index(_ref) {
+  var wrapperRef = _ref.wrapperRef,
+    _ref$config = _ref.config,
+    config = _ref$config === void 0 ? {} : _ref$config,
+    renderInfoMode = _ref.renderInfoMode,
+    _ref$complexConfig = _ref.complexConfig,
+    _ref$complexConfig$is = _ref$complexConfig.isTree,
+    isTree = _ref$complexConfig$is === void 0 ? false : _ref$complexConfig$is,
+    moduleCode = _ref$complexConfig.moduleCode,
+    dataModel = _ref$complexConfig.dataModel,
+    dataSetCode = _ref$complexConfig.dataSetCode,
+    keyField = _ref$complexConfig.keyField,
+    valueField = _ref$complexConfig.valueField,
+    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var _useState = (0, _react.useState)([]),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    dataSource = _useState2[0],
+    setDataSource = _useState2[1];
+  var handleFocus = function handleFocus() {
+    if (!dataSource || dataSource.length === 0) {
+      (0, _service.fetchContent)(dataModel, {
+        datasetCode: dataSetCode,
+        moduleCode: moduleCode
+      }).then(function (res) {
+        var code = res.code,
+          data = res.data;
+        if (code === 1) {
+          var formatData = data.map(function (i) {
+            return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, i), {}, {
+              key: i[keyField],
+              value: i[keyField],
+              label: valueField.length > 0 ? valueField.split(',').map(function (val) {
+                return i[val];
+              }).join('-') : '',
+              title: valueField.length > 0 ? valueField.split(',').map(function (val) {
+                return i[val];
+              }).join('-') : ''
+            });
+          });
+          if (isTree) {
+            setDataSource((0, _utils.dataToTree)(formatData, null, 'uid', 'parent_uid'));
+          } else setDataSource(formatData);
+        }
+      });
+    }
+  };
+  return renderInfoMode ? renderInfoMode(function (value) {
+    return (config.multiple || config.mode === 'multiple') && (0, _lodash.isArray)(value) ? value.map(function (item) {
+      return /*#__PURE__*/_react.default.createElement(_antd.Tag, {
+        key: item.key
+      }, item.label || item.value || item.key);
+    }) : /*#__PURE__*/_react.default.createElement("span", null, value.label || value.value || value.key);
+  }) : /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({}, props, {
+    type: isTree ? 'treeSelect' : 'select',
+    ref: wrapperRef,
+    config: (0, _objectSpread3.default)((0, _objectSpread3.default)({
+      required: false,
+      placeholder: (0, _utils.formatMessage)({
+        id: 'app.base.tip.select'
+      }),
+      message: (0, _utils.formatMessage)({
+        id: 'app.base.tip.select'
+      })
+    }, config), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({
+      showSearch: true,
+      optionFilterProp: 'title',
+      treeNodeFilterProp: 'label'
+    }, isTree ? 'treeData' : 'dataSource', dataSource), "onFocus", handleFocus))
+  }));
+};
+var RefCom = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({
+    wrapperRef: ref
+  }, props));
+});
+RefCom.displayName = 'BasicFormItem';
+var _default = exports.default = RefCom;

package/lib/{lowcode/painter/services/toolbar.js → components/ComplexItem/service.js}

@@ -4,29 +4,25 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updatePageData = updatePageData;
+exports.fetchContent = void 0;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _qs = require("qs");
 var _utils = require("@luck-design-biz/base/utils");
 var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
-function updatePageData(_x, _x2) {
-  return _updatePageData.apply(this, arguments);
-}
-function _updatePageData() {
-  _updatePageData = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(params, body) {
+var fetchContent = exports.fetchContent = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(dmCode, get) {
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.BASE_HOST, "/page/data/update?").concat((0, _qs.stringify)(params)), {
-            method: 'POST',
-            body: body
-          }));
+          return _context.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.API_HOST, "/").concat(dmCode, "/ui/builder/complex/noAuthFetchContent?").concat((0, _qs.stringify)(get))));
         case 1:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return _updatePageData.apply(this, arguments);
-}
+  return function fetchContent(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();

package/lib/components/LDActions/index.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -72,22 +71,21 @@ var LDActions = function LDActions(_ref2) {
   });
   var actionMap = (0, _ahooks.useCreation)(function () {
     return (0, _lodash.reduce)(todoList, function (ret, action, index) {
-      ret[action.serial] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, action), {}, {
-        serialValue: Math.pow(2, index)
-      });
+      if (!(0, _lodash.isNil)(action.serial) && !ret[action.serial]) {
+        ret[action.serial] = Math.pow(2, index);
+      }
       return ret;
     }, {});
   }, [todoList]);
   var mySerialsValue = (0, _ahooks.useCreation)(function () {
     return (0, _lodash.reduce)(resources, function (ret, resKey) {
-      var _actionMap$resKey;
-      ret |= ((_actionMap$resKey = actionMap[resKey]) === null || _actionMap$resKey === void 0 ? void 0 : _actionMap$resKey.serialValue) || 0;
+      ret |= actionMap[resKey] || 0;
       return ret;
     }, 0);
   }, [resources, actionMap]);
   var _useCreation = (0, _ahooks.useCreation)(function () {
-      var approvedActions = (0, _lodash.reduce)(actionMap, function (ret, action) {
-        if (mySerialsValue & action.serialValue) {
+      var approvedActions = (0, _lodash.reduce)(todoList, function (ret, action) {
+        if ((0, _lodash.isNil)(action.serial) || mySerialsValue & actionMap[action.serial]) {
           ret.push(action);
         } else if (action.serialEffect === 'disable') {
           ret.push(action);
@@ -97,7 +95,7 @@ var LDActions = function LDActions(_ref2) {
       var _length = approvedActions.length;
       var _permanent = approvedActions.splice(0, max >= _length ? _length : max - 1);
       return [_permanent, approvedActions];
-    }, [max, mySerialsValue, actionMap]),
+    }, [max, mySerialsValue, actionMap, todoList]),
     _useCreation2 = (0, _slicedToArray2.default)(_useCreation, 2),
     permanent = _useCreation2[0],
     more = _useCreation2[1];

package/lib/components/LDActions/index.less

@@ -1,12 +1,15 @@
 @spanDefault: #262626;
-@spanPrimary: var(--luck-color-primary);
+@spanPrimary: var(--ant-primary-color);
 @spanDanger: #ff4d4f;
 @spanDestroy: #820014;
 
 .ldActions {
 
   button:not(:last-child) {
-    margin-right: 8px;
+    margin-right: 4px;
+  }
+  button:not(:first-child) {
+    margin-left: 4px;
   }
   span {
     cursor: pointer;
@@ -20,8 +23,8 @@
   }
 
   button.primary {
-    background-color: var(--luck-color-primary);
-    border-color: var(--luck-color-primary);
+    background-color: var(--ant-primary-color);
+    border-color: var(--ant-primary-color);
     color: white;
   }
   span.primary {

package/lib/components/LdAutoForm/index.js

@@ -12,11 +12,12 @@ var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _lodash = require("lodash");
+var _luckDesign = require("luck-design");
 var _FormList = require("@luck-design-biz/base/FormList");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils = require("../../utils");
 var _Builder = require("../Builder");
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules"];
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -49,28 +50,46 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
     _ref$relationKey = _ref.relationKey,
     relationKey = _ref$relationKey === void 0 ? window.appConfig.constraintKeys.PRIMARY : _ref$relationKey,
+    fields = _ref.fields,
+    setVerifyRules = _ref.setVerifyRules,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = /*#__PURE__*/(0, _react.createRef)();
+  var defaultValues = /*#__PURE__*/(0, _react.createRef)({});
   var isMain = ldId === mainFormLdId;
   var basicItems = function () {
+    var fieldsObj = (0, _lodash.keyBy)(fields, 'field');
+    var columnsObj = (0, _lodash.keyBy)(columns, 'field');
+    var keys = (0, _lodash.isEmpty)(fields) ? Object.keys(columnsObj) : (0, _lodash.union)(Object.keys(fieldsObj), Object.keys(columnsObj));
     var _defaultValues = {};
-    var _nodes = (0, _lodash.transform)(columns, function (result, col) {
-      if (col.isShowInForm) {
-        var customFiled = filedsRewrite.find(function (field) {
-          return field.name === col.aliaName;
+    var _nodes = (0, _lodash.reduce)(keys, function (result, key) {
+      var setting = fieldsObj[key];
+      var col = columnsObj[key];
+      if ((setting === null || setting === void 0 ? void 0 : setting._type) === 'divider') {
+        result.push( /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
+          title: setting === null || setting === void 0 ? void 0 : setting.aliasName
+        }));
+      } else if (col !== null && col !== void 0 && col.isShowInForm) {
+        var customFiled = filedsRewrite.find(function (_field) {
+          return _field.name === col.aliaName;
         }) || {};
         _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
-        result.push((0, _utils.getFormItem)(col, (0, _objectSpread3.default)((0, _objectSpread3.default)({
+        var defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
+        var newCol = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, col), {}, {
+          setVerifyRules: setVerifyRules,
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
+        }, (0, _lodash.pick)(setting, defaultSet));
+        result.push((0, _utils.getFormItem)(newCol, (0, _objectSpread3.default)((0, _objectSpread3.default)({
           formId: ldId,
           moduleCode: moduleCode
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.aliaName, value)));
-          }
+          },
+          setting: (0, _lodash.omit)(setting, [].concat(defaultSet, ['uid', 'field']))
         })));
       }
+      return result;
     }, []);
     defaultValues.current = _defaultValues;
     setFieldProps && setFieldProps((0, _defineProperty2.default)({}, ldId, _nodes.map(function (i) {
@@ -83,7 +102,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var formConfig = {
     formId: ldId,
     isMain: isMain,
-    defaultDataSource: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
+    defaultDataSource: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns.map(function (c) {
+      return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
+    }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
   };
   var onOperate = function onOperate() {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -127,7 +148,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }
     }, onQuery), {}, {
       format: function format(data, res) {
-        var formItemData = (0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, data));
+        var formItemData = (0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns.map(function (c) {
+          return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, c), (0, _lodash.keyBy)(fields, 'field')[c.field]);
+        }), data));
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
         return formItemData;
       }