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

package/es/services.js

@@ -1,6 +1,5 @@
 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) {
@@ -21,27 +20,4 @@ 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.API_HOST, "/lowcode/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/FilesWall/index.js

@@ -0,0 +1,422 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+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 = ["rowKey", "formMode", "beforeUpload", "onUploadChange", "moduleCode", "docUid", "bucket", "operates", "zipName", "showNote", "tag", "maxLength"];
+import React, { forwardRef, useEffect, useImperativeHandle } from 'react';
+import { Button, Checkbox, Dropdown, Icon, Modal, Upload } from 'luck-design/antd';
+import { useSetState } from 'ahooks';
+import PropTypes from 'prop-types';
+import { canPreview, formatMessage, patchDownload, request, showPop } from '@luck-design-biz/base/utils';
+import { getDvaApp } from 'umi';
+import { last, lowerCase, split } from 'lodash';
+import { Box, Permission, PermissionGroup } from 'luck-design';
+import styles from "./index.less";
+
+/**
+ * 附件墙
+ * @param props
+ * @returns {JSX.Element}
+ * @constructor
+ */
+var FilesWall = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _props$rowKey = props.rowKey,
+    rowKey = _props$rowKey === void 0 ? 'indocno' : _props$rowKey,
+    formMode = props.formMode,
+    beforeUpload = props.beforeUpload,
+    onUploadChange = props.onUploadChange,
+    moduleCode = props.moduleCode,
+    docUid = props.docUid,
+    _props$bucket = props.bucket,
+    bucket = _props$bucket === void 0 ? '' : _props$bucket,
+    _props$operates = props.operates,
+    operates = _props$operates === void 0 ? ['read', 'add', 'delete', 'download'] : _props$operates,
+    _props$zipName = props.zipName,
+    zipName = _props$zipName === void 0 ? 'download.zip' : _props$zipName,
+    _props$showNote = props.showNote,
+    showNote = _props$showNote === void 0 ? false : _props$showNote,
+    _props$tag = props.tag,
+    tag = _props$tag === void 0 ? '' : _props$tag,
+    maxLength = props.maxLength,
+    rest = _objectWithoutProperties(props, _excluded);
+  var _useSetState = useSetState({
+      dataSource: [],
+      loading: false,
+      checkedList: [],
+      selectAll: true
+    }),
+    _useSetState2 = _slicedToArray(_useSetState, 2),
+    state = _useSetState2[0],
+    setState = _useSetState2[1];
+  useEffect(function () {
+    if (formMode !== 'add') {
+      onQuery();
+    }
+  }, []);
+  var onQuery = function onQuery() {
+    setState({
+      loading: true
+    });
+    request(getUrl('loadFileGrid')).then(function (res) {
+      var code = res.code,
+        list = res.list,
+        detail = res.detail;
+      if (code === 1) {
+        var dataSource = list.map(function (i) {
+          return _objectSpread(_objectSpread({}, detail[i]), {}, {
+            name: detail[i].origFileName,
+            size: detail[i].fileSize,
+            spath: detail[i].previewUrl
+          });
+        });
+        setState({
+          dataSource: dataSource
+        });
+        setState({
+          loading: false
+        });
+      }
+    });
+  };
+  useImperativeHandle(ref, function () {
+    return {
+      getDataSource: function getDataSource() {
+        return state.dataSource;
+      },
+      refreshList: function refreshList() {
+        return onQuery();
+      }
+    };
+  });
+  var getUrl = function getUrl(behaviorKey) {
+    return "".concat(window.appConfig.OSS_HOST_V3, "?moduleCode=").concat(moduleCode, "&bucket=").concat(bucket, "&docUid=").concat(docUid, "&behaviorKey=").concat(behaviorKey, "&tag=").concat(tag);
+  };
+
+  // 预览
+  var handlePreview = function handlePreview(file) {
+    var files = [];
+    state.dataSource.forEach(function (data) {
+      var nodePreviewUrl = data.previewUrl;
+      files.push({
+        uid: data.indocno || data.uid,
+        fileExt: data.fileExt || data.fileExt,
+        name: data.name,
+        previewUrl: "/minioPreview".concat(nodePreviewUrl),
+        url: data.spath
+      });
+    });
+    var activeIndex = files.findIndex(function (item) {
+      return item.uid === (file.indocno || file.uid);
+    });
+    window.openPreviewV3(files, {
+      activeIndex: activeIndex
+    });
+  };
+  var handleBeforeUpload = function handleBeforeUpload(file, fileList) {
+    var _getDvaApp;
+    setState({
+      loading: true
+    });
+    var uploadConfig = (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().settings.upload_config;
+    var suffix = lowerCase(last(split(file.name, '.')));
+    var flag = uploadConfig && uploadConfig[suffix] && +uploadConfig[suffix] * 1024 * 1024 < file.size;
+    if (flag) {
+      showPop("".concat(file.name).concat(formatMessage({
+        id: 'app.exception.fileTooLarge',
+        label: '文件过大'
+      })));
+    }
+    return !flag && (beforeUpload ? beforeUpload(file, fileList) : true);
+  };
+  var handleUploadChange = function handleUploadChange(e) {
+    var file = e.file,
+      fileList = e.fileList;
+    if (file.status === 'error' || file.response && file.response.code !== 1) {
+      var _file$response = file.response,
+        msg = _file$response.msg,
+        message = _file$response.message;
+      showPop(msg || message, null, 'error');
+    }
+    console.log('handleUploadChange', e);
+    setState({
+      loading: false
+    });
+    if (file.status === 'done' && file.response && file.response.code === 1) {
+      onQuery();
+    }
+    setState({
+      dataSource: _toConsumableArray(fileList)
+    });
+    onUploadChange && onUploadChange(e);
+  };
+  var formItemProps = _objectSpread(_objectSpread({}, rest), {}, {
+    action: getUrl('upload'),
+    // 上传地址
+    headers: {
+      Authorization: "Bearer ".concat(window.cookie.get(window.appConfig.authSaveKey))
+    },
+    // 请求头
+    name: 'files',
+    multiple: true,
+    showUploadList: false,
+    beforeUpload: handleBeforeUpload,
+    onChange: function onChange(e) {
+      handleUploadChange(e);
+    }
+  });
+  var uploadButton = /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Icon, {
+    type: "plus"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "ant-upload-text"
+  }, formatMessage({
+    id: 'sys.attr.type.upload'
+  })));
+
+  // 勾选附件
+  var onFileCheck = function onFileCheck(e, item) {
+    var checkedList = state.checkedList;
+    if (e.target.checked) {
+      checkedList.push(item);
+      setState({
+        checkedList: checkedList
+      });
+    } else {
+      var tempList = checkedList.filter(function (c) {
+        return c.indocno !== item.indocno;
+      });
+      setState({
+        checkedList: tempList
+      });
+    }
+  };
+  var isImage = function isImage(fileExt) {
+    return ['.png', '.jpg', '.jpeg', '.gif', '.bmp'].includes(fileExt === null || fileExt === void 0 ? void 0 : fileExt.toLowerCase());
+  };
+
+  // 自定义附件列表
+  var renderFileList = function renderFileList() {
+    return state.dataSource.map(function (f) {
+      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+        className: styles.fileContent
+      }, /*#__PURE__*/React.createElement("img", {
+        className: styles.img,
+        src: isImage(f.fileExt) ? "/minioPreview".concat(f.previewUrl) : require("./file.png"),
+        alt: ""
+      }), /*#__PURE__*/React.createElement(Checkbox, {
+        onChange: function onChange(e) {
+          return onFileCheck(e, f);
+        },
+        checked: state.checkedList.findIndex(function (l) {
+          return l.indocno === f.indocno;
+        }) > -1,
+        className: styles.check
+      })), /*#__PURE__*/React.createElement(Box, {
+        className: styles.actions,
+        justify: "center",
+        align: "center"
+      }, /*#__PURE__*/React.createElement(Box, {
+        justify: "space-around",
+        className: styles.actionsChild
+      }, /*#__PURE__*/React.createElement(Permission, {
+        userPermission: operates || [],
+        hasDefaultWord: false
+      }, /*#__PURE__*/React.createElement(Icon, {
+        wanted: canPreview(f) && 'read',
+        type: "eye",
+        style: {
+          color: 'white'
+        },
+        onClick: function onClick() {
+          return handlePreview(f);
+        }
+      }), /*#__PURE__*/React.createElement(Icon, {
+        wanted: "download",
+        type: "download",
+        style: {
+          color: 'white'
+        },
+        onClick: function onClick() {
+          return handleDownload([f]);
+        }
+      }), /*#__PURE__*/React.createElement(Icon, {
+        wanted: formMode !== 'info' && 'delete',
+        type: "delete",
+        style: {
+          color: 'white'
+        },
+        onClick: function onClick() {
+          return handleDelete([f], false);
+        }
+      })))));
+    });
+  };
+  var menu = /*#__PURE__*/React.createElement(PermissionGroup, {
+    userPermission: operates,
+    modeStyle: "menu"
+  }, /*#__PURE__*/React.createElement("a", {
+    wanted: "download",
+    name: "download",
+    disabled: state.checkedList.length === 0,
+    onClick: function onClick() {
+      return handleDownload(state.checkedList, true);
+    }
+  }, "\u4E0B\u8F7D"), /*#__PURE__*/React.createElement("a", {
+    wanted: formMode !== 'info' && 'delete',
+    name: "delete",
+    disabled: state.checkedList.length === 0,
+    onClick: function onClick() {
+      Modal.confirm({
+        title: formatMessage({
+          id: 'app.base.operate.delete'
+        }),
+        content: formatMessage({
+          id: 'app.base.confirm.delete'
+        }),
+        okText: formatMessage({
+          id: 'app.base.operate.ok'
+        }),
+        okType: 'danger',
+        cancelText: formatMessage({
+          id: 'app.base.operate.cancel'
+        }),
+        onOk: function onOk() {
+          handleDelete(state.checkedList, true);
+        }
+      });
+    }
+  }, "\u5220\u9664"));
+
+  /**
+   * 删除
+   * @param selectedRows 选择的数据
+   * @param isCheck 是否批量勾选
+   */
+  var handleDelete = function handleDelete(selectedRows, isCheck) {
+    setState({
+      loading: true
+    });
+    request(getUrl('removeFile'), {
+      method: 'POST',
+      body: {
+        fileNames: selectedRows.map(function (row) {
+          return row.fileName;
+        })
+      }
+    }).then(function () {
+      setState({
+        loading: false
+      });
+      isCheck && setState({
+        checkedList: []
+      });
+      onQuery();
+    });
+  };
+  var handleDownload = function handleDownload(selectedRows, isCheck) {
+    if (selectedRows.length === 1) {
+      var filenames = selectedRows.map(function (item) {
+        return item.fileName;
+      });
+      downloadFile(filenames, 'downloadOne');
+    } else {
+      var files = selectedRows.map(function (item) {
+        return _objectSpread(_objectSpread({}, item), {}, {
+          sname: item.fileName,
+          downloadUrl: "".concat(getUrl('download'), "&fileName=").concat(item.fileName),
+          stype: item.fileExt
+        });
+      });
+      patchDownload(files);
+    }
+    isCheck && setState({
+      checkedList: []
+    });
+  };
+
+  /**
+   * 下载附件
+   * @param filenames
+   * @param tag downloadOne：下载单个，其他批量
+   */
+  var downloadFile = function downloadFile(filenames, tag) {
+    saveAs("".concat(getUrl('download'), "&fileName=").concat(filenames[0]));
+  };
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    className: styles.operates
+  }, /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    loading: state.loading,
+    style: {
+      marginRight: 8
+    },
+    onClick: function onClick() {
+      return state.selectAll ? setState({
+        checkedList: state.dataSource,
+        selectAll: false
+      }) : setState({
+        checkedList: [],
+        selectAll: true
+      });
+    },
+    disabled: state.dataSource.length === 0
+  }, state.selectAll ? formatMessage({
+    id: 'app.base.operate.selectAll',
+    label: '全选'
+  }) : formatMessage({
+    id: 'app.base.operate.selectNone',
+    label: '全不选'
+  })), /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    loading: state.loading,
+    style: {
+      marginRight: 8
+    },
+    onClick: function onClick() {
+      return handleDownload(state.dataSource);
+    },
+    disabled: state.dataSource.length === 0
+  }, formatMessage({
+    id: 'app.base.operate.downloadAll',
+    label: '下载全部'
+  })), state.checkedList.length > 0 && /*#__PURE__*/React.createElement(Dropdown, {
+    overlay: menu,
+    trigger: ['hover']
+  }, /*#__PURE__*/React.createElement(Button, null, "\u6279\u91CF\u64CD\u4F5C"))), /*#__PURE__*/React.createElement("div", {
+    className: styles.filesWall
+  }, renderFileList(), /*#__PURE__*/React.createElement(Upload, _extends({
+    listType: "picture-card"
+  }, formItemProps, {
+    fileList: state.dataSource,
+    onPreview: handlePreview,
+    showUploadList: false
+  }), state.dataSource.length >= maxLength || formMode === 'info' || !operates.includes('add') ? null : uploadButton)));
+});
+FilesWall.propTypes = {
+  moduleCode: PropTypes.string.isRequired,
+  // 模块code
+  docUid: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  // 单据主键，新增模式下前端生成
+  formMode: PropTypes.string,
+  // 表单formMode
+  operates: PropTypes.array,
+  // 表单操作权限
+  zipName: PropTypes.string,
+  // 打包下载文件名
+  bucket: PropTypes.string,
+  tag: PropTypes.string,
+  // 附件tag标识
+  showNote: PropTypes.bool,
+  // 是否填写附件备注
+  beforeUpload: PropTypes.func,
+  // 上传前回调
+  onUploadChange: PropTypes.func,
+  // 上传后回调
+  maxLength: PropTypes.number // 最大上传数量
+};
+FilesWall.defaultProps = {
+  bucket: '',
+  showNote: false,
+  maxLength: 999
+};
+export default FilesWall;

package/es/upload/FilesWall/index.less

@@ -0,0 +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;
+    }
+  }
+}

package/es/upload/Form/index.js

@@ -6,6 +6,7 @@ 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,
@@ -29,7 +30,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(window.appConfig.OSS_HOST_V3, "?").concat(stringify(params));
+    return "".concat(getBehaviorUrl(), "?").concat(stringify(params));
   };
   return /*#__PURE__*/React.createElement(GridForm, _extends({
     formId: formId,

package/es/upload/FormItem/index.js

@@ -6,6 +6,7 @@ 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";
 
 /**
  * 表单类型富文本上传
@@ -41,7 +42,7 @@ function buildComponent(props) {
     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);

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/lib/components/LDActions/index.less

@@ -6,7 +6,7 @@
 .ldActions {
 
   button:not(:last-child) {
-    margin-right: 8px;
+    margin-right: 2px;
   }
   span {
     cursor: pointer;

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"];
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -49,20 +50,33 @@ 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,
     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) : Object.keys(fieldsObj);
     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.fieldAliasName
+        }));
+      } else if (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 newCol = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, col), {}, {
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
+        }, (0, _lodash.pick)(setting, ['col', 'row', 'note', 'tip', 'placeholder']));
+        result.push((0, _utils.getFormItem)(newCol, (0, _objectSpread3.default)((0, _objectSpread3.default)({
           formId: ldId,
           moduleCode: moduleCode
         }, customFiled), {}, {
@@ -71,6 +85,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           }
         })));
       }
+      ;
+      return result;
     }, []);
     defaultValues.current = _defaultValues;
     setFieldProps && setFieldProps((0, _defineProperty2.default)({}, ldId, _nodes.map(function (i) {