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

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,44 @@ function _readModlue() {
     }, _callee);
   }));
   return _readModlue.apply(this, arguments);
+}
+export function readUI(_x2) {
+  return _readUI.apply(this, arguments);
+}
+function _readUI() {
+  _readUI = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(get) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", request("".concat(api.LUCKDA_HOST, "/ui/builder/noAuthFetchModuleDataSetUI?").concat(stringify(get))));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _readUI.apply(this, arguments);
+}
+export function readBehaviorCall(_x3, _x4) {
+  return _readBehaviorCall.apply(this, arguments);
+}
+function _readBehaviorCall() {
+  _readBehaviorCall = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(get, post) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          return _context3.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 _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return _readBehaviorCall.apply(this, arguments);
 }

package/es/upload/Form/gridForm.js

@@ -79,7 +79,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
   var _getDvaApp$_store$get = (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
     currentUser = _getDvaApp$_store$get.currentUser;
   var supportUploadTypes = useCreation(function () {
-    return getSupportUploadTypes(forbiddenTypes);
+    return getSupportUploadTypes(forbiddenTypes, supportTypes);
   }, [forbiddenTypes, supportTypes]);
 
   // 下载
@@ -271,6 +271,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 +314,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
         });
       }
     });
-    if (resetActions) {
-      return resetActions(data, index, actions, params);
-    }
     return actions;
   });
   var handleBatchOperationsClick = useMemoizedFn(function (key, selectedRows, cb) {
@@ -378,13 +378,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
         return _beforeUpload2({
           file: file,
           fileList: fileList,
-          supportUploadTypes: supportUploadTypes,
+          forbiddenTypes: forbiddenTypes,
           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/FormItem/index.js

@@ -5,7 +5,7 @@ var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "
 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';
 
 /**
  * 表单类型富文本上传
@@ -42,9 +42,11 @@ function buildComponent(props) {
     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, supportTypes);
+  }, [forbiddenTypes, supportTypes]);
   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

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -22,6 +23,7 @@ import * as formItemUtils from "../helper/FromItems";
  * 根据动态表单配置项生成formItem
  * @param {动态表单配置项} props
  * @param {自定义动态表单配置项} customProps
+ * @param {formUi配置项} formUiPreset
  * @returns <BasicForm name='' ... />
  */
 export function getFormItem() {
@@ -30,17 +32,18 @@ export function getFormItem() {
     property = _ref.property,
     props = _objectWithoutProperties(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var formUiPreset = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!property) return /*#__PURE__*/React.createElement(React.Fragment, null);
   if (property === 'sint' || property === 'number') props.opt_decimal = 0;
-  var comType = comName || defaultComName[property];
-  var _translator = translator(props),
+  var _translator = translator(_objectSpread(_objectSpread({}, props), formUiPreset)),
     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);
+  console.log('getFormItem', translateProps, _props);
   if (customProps.renderBasicFormItem) {
     var com = customProps.renderBasicFormItem(_props);
     var comProps = merge(_props, com.props);
@@ -49,7 +52,7 @@ 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
@@ -78,15 +81,9 @@ 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 {
@@ -154,15 +151,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;
@@ -202,8 +193,12 @@ export var dataFormat = function dataFormat() {
 /**
  *
  * @param formType
+ * @param comName
+ * @param property
  * @param props
+ * @param formItemRewrite
  * @param customProps
+ * @param gridUiPreset
  * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
  */
 export var getFormColumn = function getFormColumn() {
@@ -216,20 +211,21 @@ export var getFormColumn = function getFormColumn() {
   var _ref5 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
     formItemRewrite = _ref5.formItemRewrite,
     customProps = _objectWithoutProperties(_ref5, _excluded7);
+  var gridUiPreset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var formItemType = comName || defaultComName[property];
   if (formItemType === 'radio') formItemType = 'select';
-  var _translator2 = translator(props),
+  var _translator2 = translator(_objectSpread(_objectSpread({}, props), gridUiPreset)),
     name = _translator2.name,
     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);
   var columnRender = getColumnRender(name, formItemType, _props);
   if (formType !== 'writer') _props.name = name;
-  return _objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread({}, _props), {}, {
     title: translateProps.label,
     editable: formType === 'writer' && {
       required: _props.required || ((_props$config = _props.config) === null || _props$config === void 0 ? void 0 : _props$config.required)
@@ -258,4 +254,29 @@ export var getFormColumn = function getFormColumn() {
     },
     field: name
   });
+};
+
+/**
+ * 合并两个数组，并且数据顺序以arr2为准
+ * @param arr1
+ * @param arr2
+ * @param rowKey
+ */
+export var mergeAndSort = function mergeAndSort(arr1, arr2, rowKey) {
+  // 将a2转换为一个Map，便于快速查找
+  var a2Map = new Map(arr2.map(function (item) {
+    return [item[rowKey], item];
+  }));
+  // 创建一个新的数组，按a2的顺序填充元素，同时包含a1中不在a2中的元素
+  var mergedArray = arr2.map(function (item) {
+    var a1Item = arr1.find(function (a1) {
+      return a1[rowKey] === item[rowKey];
+    });
+    return a1Item ? _objectSpread(_objectSpread({}, item), a1Item) : item;
+  });
+  // 将a1中未出现在a2中的元素追加到合并后的数组末尾
+  mergedArray.push.apply(mergedArray, _toConsumableArray(arr1.filter(function (a1Item) {
+    return !a2Map.has(a1Item[rowKey]);
+  })));
+  return mergedArray;
 };

package/es/utils/grid.js

@@ -6,7 +6,7 @@ var _excluded = ["comName", "property"],
   _excluded3 = ["filter", "filterParams"];
 import React from 'react';
 import { getDvaApp } from 'umi';
-import { merge, isNil, isArray, includes, capitalize, isString } from 'lodash';
+import { merge, isNil, isArray, includes, capitalize } from 'lodash';
 import { Switch, Tag } from 'luck-design/antd';
 import moment from 'moment';
 import UploadGridCell from "../upload/GridCell";
@@ -44,7 +44,6 @@ 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) {
@@ -70,9 +69,9 @@ export function getColumnRender(name, type) {
       break;
     case 'region':
       render = function render(text, record) {
-        return record["".concat(name, "_virtual")] || (text ? (isString(text) ? JSON.parse(text) : text).map(function (i) {
+        return record["".concat(name, "_virtual")] || text ? text.map(function (i) {
           return i.name;
-        }).join('/') : undefined);
+        }).join('/') : undefined;
       };
       break;
     case 'upload':
@@ -116,27 +115,28 @@ 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 gridUiPreset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
   var _props$isVirtual = props.isVirtual,
     isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual,
     _props$extra = props.extra,
     extra = _props$extra === void 0 ? {} : _props$extra;
-  var _translator = translator(props),
+  var _translator = translator(_objectSpread(_objectSpread({}, props), gridUiPreset)),
     name = _translator.name,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
-  var _merge = merge(translateProps, formatCustomProps(comType, customProps)),
+  var _merge = merge(translateProps, formatCustomProps(customProps)),
     filter = _merge.filter,
     filterParams = _merge.filterParams,
     _props = _objectWithoutProperties(_merge, _excluded3);
   var _extra = JSON.parse(extra) || {};
-  var data = _objectSpread(_objectSpread({}, _props), {}, {
+  var data = _objectSpread(_objectSpread({
+    headerAlign: getAlign(_extra, 'sheading_alignment_virtual'),
+    align: getAlign(_extra, 'scell_alignment_virtual')
+  }, _props), {}, {
     field: name,
     title: _props.label,
-    headerAlign: _props.headerAlign || getAlign(_extra, 'sheading_alignment_virtual'),
-    align: _props.align || getAlign(_extra, 'scell_alignment_virtual'),
-    render: _props.render || getColumnRender(name, comType, _props)
+    render: _props.render || getColumnRender(name, comName || defaultComName[property], _props)
   });
-  if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region', 'file', 'complex'], comType)) data.sortable = false;
+  if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region', 'file'], comName || defaultComName[property])) data.sortable = false;
   // data.filter = false;
   if (!isNil(filter)) {
     // 因为后端升级问题，暂时关闭过滤功能
@@ -149,7 +149,7 @@ export var getGridColumn = function getGridColumn() {
       data.filter = 'text';
       return data;
     }
-    switch (comType) {
+    switch (comName || defaultComName[property]) {
       case 'switch':
         data.filter = 'select';
         data.filterParams = {
@@ -250,7 +250,7 @@ export var getGridColumn = function getGridColumn() {
       required: true
     } : true;
     if (_props.cellWriter) data.cellWriter = _props.cellWriter;else {
-      var formItemCom = capitalize(comType) === 'Textarea' ? 'String' : capitalize(comType);
+      var formItemCom = capitalize(comName || defaultComName[property]) === 'Textarea' ? 'String' : capitalize(comName || defaultComName[property]);
       var getFormItemUtils = formItemUtils["get".concat(formItemCom, "Item")];
       var formItemProps = {};
       switch (formItemCom) {
@@ -267,7 +267,6 @@ export var getGridColumn = function getGridColumn() {
         case 'user':
         case 'select':
         case 'group':
-        case 'complex':
           if (translateProps.multiple) {
             formItemProps = {
               dataFormat: function dataFormat(value) {

package/lib/components/Builder/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useLDCtx = exports.default = exports.LuckDaContext = void 0;
+exports.default = exports.LuckDaContext = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -18,9 +18,6 @@ var _services = require("../../services");
 var _action2 = require("../../helper/action");
 var _utils = require("@luck-design-biz/base/utils");
 var LuckDaContext = exports.LuckDaContext = /*#__PURE__*/(0, _react.createContext)();
-var useLDCtx = exports.useLDCtx = function useLDCtx() {
-  return (0, _react.useContext)(LuckDaContext);
-};
 var builder = function builder(WrappedComponent, moduleCode) {
   var Component = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     if (!moduleCode) return (0, _utils.formatMessage)({
@@ -39,21 +36,28 @@ var builder = function builder(WrappedComponent, moduleCode) {
     var _useRequest = (0, _ahooks.useRequest)(_services.readModlue, {
         defaultParams: [{
           moduleCode: moduleCode
-        }],
-        onSuccess: function onSuccess(res) {
-          var code = res.code,
-            data = res.data;
-          if (code === 1) {
-            setModuleData({
-              actions: data.actions || {},
-              dataSets: data.dataSets || {},
-              isTree: data.isTree || [],
-              resources: data.resources || []
-            });
-          }
-        }
+        }]
+      }),
+      loading1 = _useRequest.loading,
+      moduleResult = _useRequest.data;
+    var _useRequest2 = (0, _ahooks.useRequest)(_services.readUI, {
+        defaultParams: [{
+          moduleCode: moduleCode
+        }]
       }),
-      loading = _useRequest.loading;
+      loading2 = _useRequest2.loading,
+      uiResult = _useRequest2.data;
+    (0, _react.useEffect)(function () {
+      if (!loading1 && !loading2 && (moduleResult === null || moduleResult === void 0 ? void 0 : moduleResult.code) === 1 && (uiResult === null || uiResult === void 0 ? void 0 : uiResult.code) === 1) {
+        setModuleData({
+          actions: moduleResult.data.actions || {},
+          dataSets: moduleResult.data.dataSets || {},
+          isTree: moduleResult.data.isTree || [],
+          resources: moduleResult.data.resources || [],
+          moduleUiList: uiResult.data.moduleUiList || {}
+        });
+      }
+    }, [loading1, loading2, moduleResult, uiResult]);
     var openPop = (0, _ahooks.useMemoizedFn)(function (ldId, params) {
       setPops(function (prev) {
         return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, prev), {}, (0, _defineProperty2.default)({}, ldId, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, prev[ldId]), params)));
@@ -103,7 +107,7 @@ var builder = function builder(WrappedComponent, moduleCode) {
       var _props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       fieldProps.current = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, fieldProps.current), _props);
     };
-    if (loading) return null;
+    if (loading1 || loading2) return null;
     if (!moduleData) return (0, _utils.formatMessage)({
       id: 'luckda.module.loadFailed',
       label: '模块信息加载失败'

package/lib/components/LdAutoForm/index.js

@@ -12,12 +12,11 @@ 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", "fields", "setVerifyRules"];
+var _excluded = ["columns", "resources", "actions", "doAction", "uiSettings", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey"];
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -27,6 +26,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     actions = _ref$actions === void 0 ? {} : _ref$actions,
     _ref$doAction = _ref.doAction,
     doAction = _ref$doAction === void 0 ? function () {} : _ref$doAction,
+    _ref$uiSettings = _ref.uiSettings,
+    uiSettings = _ref$uiSettings === void 0 ? {} : _ref$uiSettings,
     ldId = _ref.ldId,
     dataSetKey = _ref.dataSetKey,
     _ref$filedsRewrite = _ref.filedsRewrite,
@@ -50,49 +51,38 @@ 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 formPreset = uiSettings && uiSettings.form && uiSettings.form[0] && uiSettings.form[0].preset ? JSON.parse(uiSettings.form[0].preset) : {};
+  var mergedArray = (0, _utils.mergeAndSort)(columns, formPreset.formFieldPreset || [], 'field');
   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.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;
+    var _nodes = (0, _lodash.transform)(mergedArray, function (result, col) {
+      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']));
-        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)({
+
+        // 该字段配置的表单显示信息
+        var colUiData = formPreset.formFieldPreset ? formPreset.formFieldPreset.find(function (c) {
+          return c.field === col.field;
+        }) : {};
+        result.push((0, _utils.getFormItem)(col, (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']))
-        })));
+          }
+        }), colUiData));
       }
-      return result;
     }, []);
     defaultValues.current = _defaultValues;
-    setFieldProps && setFieldProps((0, _defineProperty2.default)({}, ldId, _nodes.map(function (i) {
+    setFieldProps((0, _defineProperty2.default)({}, ldId, _nodes.map(function (i) {
       return (0, _objectSpread3.default)({
         component: i.type.comName || i.type.displayName
       }, i.props);
@@ -102,9 +92,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var formConfig = {
     formId: ldId,
     isMain: isMain,
-    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))
+    defaultDataSource: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current)),
+    col: formPreset.formCol
   };
   var onOperate = function onOperate() {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -148,9 +137,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }
     }, onQuery), {}, {
       format: function format(data, res) {
-        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));
+        var formItemData = (0, _objectSpread3.default)({}, (0, _utils.formItemDataFormat)(columns, data));
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
         return formItemData;
       }

package/lib/components/LdCom/index.js

@@ -10,7 +10,6 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _antd = require("luck-design/antd");
 var _base = require("@luck-design-biz/base");
-var _IconFont = _interopRequireDefault(require("../IconFont"));
 var _ldComBuild = require("../../helper/ldComBuild");
 var _excluded = ["options"];
 var LdButton = exports.LdButton = (0, _ldComBuild.ldComBuilder)(_antd.Button);
@@ -23,7 +22,7 @@ var LdButtonRadio = exports.LdButtonRadio = function LdButtonRadio(_ref) {
     options: (0, _ldComBuild.filterOptions)(options)
   }));
 };
-var LdIconFont = exports.LdIconFont = (0, _ldComBuild.ldComBuilder)(_IconFont.default);
+var LdIconFont = exports.LdIconFont = (0, _ldComBuild.ldComBuilder)(_base.IconFont);
 var LdTabs = exports.LdTabs = (0, _ldComBuild.deepFilterCom)(_antd.Tabs, function (child) {
   var _child$type;
   return (child === null || child === void 0 || (_child$type = child.type) === null || _child$type === void 0 ? void 0 : _child$type.displayName) === 'TabPane';