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

package/es/utils/grid.js

@@ -116,7 +116,6 @@ 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,
@@ -124,7 +123,7 @@ export var getGridColumn = function getGridColumn() {
   var _translator = translator(props),
     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);
@@ -132,11 +131,11 @@ export var getGridColumn = function getGridColumn() {
   var data = _objectSpread(_objectSpread({}, _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)
+    headerAlign: getAlign(_extra, 'sheading_alignment_virtual'),
+    align: getAlign(_extra, 'scell_alignment_virtual'),
+    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 +148,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 +249,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 +266,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)({

package/lib/components/LDActions/index.js

@@ -7,6 +7,7 @@ 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"));
@@ -54,7 +55,7 @@ var LDActions = function LDActions(_ref2) {
       _base.Modal.confirm({
         title: "\u786E\u8BA4\u6267\u884C".concat(action.name, "\u884C\u4E3A\u64CD\u4F5C\u5417\uFF1F"),
         onOk: function onOk() {
-          return doAction(action.actionPool);
+          return doAction(action);
         }
       });
     } else if (action.riskLevel === 'destroy') {
@@ -62,30 +63,31 @@ var LDActions = function LDActions(_ref2) {
         title: "\u786E\u8BA4\u6267\u884C".concat(action.name, "\u884C\u4E3A\u64CD\u4F5C\u5417\uFF1F"),
         checkWords: "\u6267\u884C".concat(action.name),
         onOk: function onOk() {
-          return doAction(action.actionPool);
+          return doAction(action);
         }
       });
     } else {
-      doAction(action.actionPool);
+      doAction(action);
     }
   });
   var actionMap = (0, _ahooks.useCreation)(function () {
     return (0, _lodash.reduce)(todoList, function (ret, action, index) {
-      if (!(0, _lodash.isNil)(action.serial) && !ret[action.serial]) {
-        ret[action.serial] = Math.pow(2, index);
-      }
+      ret[action.serial] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, action), {}, {
+        serialValue: Math.pow(2, index)
+      });
       return ret;
     }, {});
   }, [todoList]);
   var mySerialsValue = (0, _ahooks.useCreation)(function () {
     return (0, _lodash.reduce)(resources, function (ret, resKey) {
-      ret |= actionMap[resKey] || 0;
+      var _actionMap$resKey;
+      ret |= ((_actionMap$resKey = actionMap[resKey]) === null || _actionMap$resKey === void 0 ? void 0 : _actionMap$resKey.serialValue) || 0;
       return ret;
     }, 0);
   }, [resources, actionMap]);
   var _useCreation = (0, _ahooks.useCreation)(function () {
-      var approvedActions = (0, _lodash.reduce)(todoList, function (ret, action) {
-        if ((0, _lodash.isNil)(action.serial) || mySerialsValue & actionMap[action.serial]) {
+      var approvedActions = (0, _lodash.reduce)(actionMap, function (ret, action) {
+        if (mySerialsValue & action.serialValue) {
           ret.push(action);
         } else if (action.serialEffect === 'disable') {
           ret.push(action);
@@ -95,7 +97,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, todoList]),
+    }, [max, mySerialsValue, actionMap]),
     _useCreation2 = (0, _slicedToArray2.default)(_useCreation, 2),
     permanent = _useCreation2[0],
     more = _useCreation2[1];
@@ -121,11 +123,8 @@ var LDActions = function LDActions(_ref2) {
     }, more.map(function (action) {
       return /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
         key: action.id,
-        action: action,
-        disabled: action.serialEffect === 'disable'
-      }, /*#__PURE__*/_react.default.createElement("span", {
-        className: (0, _classnames.default)(_index.default[action.riskLevel], _index.default.menuItem)
-      }, action.name));
+        action: action
+      }, action.name);
     }))
   }, /*#__PURE__*/_react.default.createElement(DisplayComp, {
     display: display,

package/lib/components/LDActions/index.less

@@ -1,68 +1,48 @@
-@spanDefault: #262626;
-@spanPrimary: var(--ant-primary-color);
-@spanDanger: #ff4d4f;
-@spanDestroy: #820014;
-
-.ldActions {
-
-  button:not(:last-child) {
-    margin-right: 4px;
-  }
-  button:not(:first-child) {
-    margin-left: 4px;
-  }
-  span {
-    cursor: pointer;
-  }
-
-  button.default {
-    background-color: white;
-  }
-  span.default {
-    color: @spanDefault;
-  }
-
-  button.primary {
-    background-color: var(--ant-primary-color);
-    border-color: var(--ant-primary-color);
-    color: white;
-  }
-  span.primary {
-    color: @spanPrimary;
-  }
-
-  button.danger {
-    background-color: #ff4d4f;
-    border-color: #ff4d4f;
-    color: white;
-  }
-  span.danger {
-    color: @spanDanger;
-  }
-
-  button.destroy {
-    background-color: #820014;
-    border-color: #820014;
-    color: white;
-  }
-  span.destroy {
-    color: @spanDestroy;
-  }
-
-  span.disabled {
-    color: #bfbfbf;
-    cursor: not-allowed;
-  }
-}
-span.default.menuItem {
-  color: @spanDefault;
-}
-span.primary.menuItem {
-  color: @spanPrimary;
-}
-span.danger.menuItem {
-  color: @spanDanger;
-}
-span.destroy.menuItem {
-  color: @spanDestroy;
-}
+.ldActions {
+
+  button:not(:last-child) {
+    margin-right: 8px;
+  }
+  span {
+    cursor: pointer;
+  }
+
+  button.default {
+    background-color: white;
+  }
+  span.default {
+    color: #262626;
+  }
+
+  button.primary {
+    background-color: var(--luck-color-primary);
+    border-color: var(--luck-color-primary);
+    color: white;
+  }
+  span.primary {
+    color: var(--luck-color-primary);
+  }
+
+  button.danger {
+    background-color: #ff4d4f;
+    border-color: #ff4d4f;
+    color: white;
+  }
+  span.danger {
+    color: #ff4d4f;
+  }
+
+  button.destroy {
+    background-color: #820014;
+    border-color: #820014;
+    color: white;
+  }
+  span.destroy {
+    color: #820014;
+  }
+
+  span.disabled {
+    color: #bfbfbf;
+    cursor: not-allowed;
+  }
+}

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", "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,
@@ -50,49 +49,31 @@ 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.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)(columns, 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)({
+        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']))
+          }
         })));
       }
-      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 +83,7 @@ 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))
   };
   var onOperate = function onOperate() {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -148,9 +127,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';

package/lib/components/LdFormList/index.js

@@ -17,8 +17,6 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireWildcard(require("react"));
 var _umi = require("umi");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _lodash = require("lodash");
-var _bpm = require("@luck-design-biz/bpm");
 var _ahooks = require("ahooks");
 var _luckDesign = require("luck-design");
 var _utils = require("@luck-design-biz/base/utils");
@@ -30,10 +28,13 @@ var _Builder = require("../Builder");
 var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
-var _useTodo3 = _interopRequireDefault(require("../../lowcode/engine/tools/useTodo"));
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps", "setVerifyRules"],
+var _lodash = require("lodash");
+var _bpm = require("@luck-design-biz/bpm");
+var _services = require("../../services");
+var _querystring = require("querystring");
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
   _excluded2 = ["dataSets", "doAction", "resources"],
-  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
+  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded4 = ["ldId", "initData", "overModel"];
 // 组件
 var LdFormList = function LdFormList(_ref) {
@@ -62,10 +63,8 @@ var LdFormList = function LdFormList(_ref) {
     } : _ref$renderFormExtra,
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
-    setVerifyRules = _ref.setVerifyRules,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
-  var currentValueRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     submitLoading = _useState2[0],
@@ -78,10 +77,6 @@ var LdFormList = function LdFormList(_ref) {
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     bizData = _useState6[0],
     setBizData = _useState6[1];
-  var _useTodo = (0, _useTodo3.default)(),
-    _useTodo2 = (0, _slicedToArray2.default)(_useTodo, 2),
-    _ = _useTodo2[0],
-    callBehavior = _useTodo2[1];
   var luckTheme = (0, _ahooks.useCreation)(function () {
     return document.body.getAttribute('luck-theme');
   }, []);
@@ -95,9 +90,6 @@ var LdFormList = function LdFormList(_ref) {
   var formListRef = (0, _react.useRef)(null);
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
-      getCValue: function getCValue() {
-        return currentValueRef.current || props.formData;
-      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         if (props.formMode !== 'add') {
@@ -110,8 +102,7 @@ var LdFormList = function LdFormList(_ref) {
           });
           formListRef.current.doQuery();
         }
-      },
-      ticketData: props.ticketData
+      }
     });
   });
   var handleValueChange = (0, _ahooks.useMemoizedFn)(function (change) {
@@ -122,7 +113,6 @@ var LdFormList = function LdFormList(_ref) {
       var getValue = ((_formRefs$key = formRefs[key]) !== null && _formRefs$key !== void 0 && (_formRefs$key = _formRefs$key.formRef) !== null && _formRefs$key !== void 0 && _formRefs$key.current ? formRefs[key].getData : null) || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
       return (0, _defineProperty2.default)({}, key, getValue && getValue());
     });
-    currentValueRef.current = data;
     onValueChange(change, data);
   });
   var renderExtra = (0, _ahooks.useMemoizedFn)(function (formId, extraConfig, type) {
@@ -142,7 +132,7 @@ var LdFormList = function LdFormList(_ref) {
     }, bpmButtonProps)));
   };
   (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var _props$formData$mainF, _params, response, _yield$callBehavior, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
+    var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -152,14 +142,13 @@ var LdFormList = function LdFormList(_ref) {
           }
           _params = {
             indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
-            mainDataSetKey: mainDataSetKey
-          }; // 请求是否有工作流服务
-          _context.next = 4;
-          return callBehavior({
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
+            mainDataSetKey: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
-          }, _params);
+          }; // 请求是否有工作流服务
+          _context.next = 4;
+          return (0, _services.readBehaviorCall)(_params);
         case 4:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
@@ -167,15 +156,13 @@ var LdFormList = function LdFormList(_ref) {
             break;
           }
           _context.next = 8;
-          return callBehavior({
-            moduleCode: rest.moduleCode,
-            datasetCode: mainDataSetKey,
+          return (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _params), {}, {
             behaviorKey: 'readBpm'
-          }, _params);
+          }));
         case 8:
-          _yield$callBehavior = _context.sent;
-          code = _yield$callBehavior.code;
-          data = _yield$callBehavior.data;
+          _yield$readBehaviorCa = _context.sent;
+          code = _yield$readBehaviorCa.code;
+          data = _yield$readBehaviorCa.data;
           if (code == 1 && data) {
             bpmInfoObj = data.bpmInfo;
             tempObj = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.formData[mainFormLdId]), {}, {
@@ -243,11 +230,7 @@ var LdFormList = function LdFormList(_ref) {
     renderExtra: renderExtra
   });
   var formList = (0, _ahooks.useCreation)(function () {
-    var _list = renderFormList(formConfig);
-    return (0, _lodash.reduce)(_list, function (result, item) {
-      if (!item.serial || item.serialEffect === 'disable' || (0, _lodash.includes)(resources, item.serial)) result.push(item);
-      return result;
-    }, []);
+    return renderFormList(formConfig);
   }, [formConfig]);
   var formExtra = (0, _ahooks.useCreation)(function () {
     return renderFormExtra && (0, _lodash.isArray)(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
@@ -255,7 +238,7 @@ var LdFormList = function LdFormList(_ref) {
   var mainDataSetKey = (_formList$find = formList.find(function (i) {
     return i.id === mainFormLdId;
   })) === null || _formList$find === void 0 ? void 0 : _formList$find.dataSetKey;
-  return formList.length > 0 ? /*#__PURE__*/_react.default.createElement(_FormList.FormList, (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_FormList.FormList, (0, _extends2.default)({
     editFlow: true,
     formState: formState,
     formMode: formMode,
@@ -282,32 +265,30 @@ var LdFormList = function LdFormList(_ref) {
     var _o$props;
     return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
   }).map(function (formProps) {
-    var _formProps$type = formProps.type,
-      type = _formProps$type === void 0 ? 'auto' : _formProps$type;
-    if ((0, _lodash.includes)(['auto', 'writer', 'grid'], type)) {
+    if (formProps.dataSetKey) {
       var _ref8 = formProps || {},
         ldId = _ref8.id,
         _ref8$header = _ref8.header,
         header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
         title = _ref8.title,
-        selfReadOnly = _ref8.readOnly,
+        _readOnly = _ref8.readOnly,
         _ref8$extraConfig = _ref8.extraConfig,
         extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
         _ref8$renderTopLeft = _ref8.renderTopLeft,
         _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
         } : _ref8$renderTopLeft,
-        serial = _ref8.serial,
         _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
+      var _props$type = _props.type,
+        type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
-      var _readOnly = selfReadOnly || serial && !(0, _lodash.includes)(resources, serial);
       if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
         title: title || ldId,
-        extra: type === 'auto' && formProps.dataSetKey && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
+        extra: type === 'auto' && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
         id: ldId,
         key: ldId,
         mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
-      }, formProps.dataSetKey && renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+      }, renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -316,19 +297,18 @@ var LdFormList = function LdFormList(_ref) {
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
           return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
-        },
-        setVerifyRules: setVerifyRules
+        }
       })));
       return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
         key: ldId
       }, header === 'divider' && /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
         title: title || ldId,
         id: ldId
-      }), type === 'auto' && formProps.dataSetKey && /*#__PURE__*/_react.default.createElement("div", {
+      }), type === 'auto' && /*#__PURE__*/_react.default.createElement("div", {
         style: {
           textAlign: 'right'
         }
-      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), formProps.dataSetKey && renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -337,8 +317,7 @@ var LdFormList = function LdFormList(_ref) {
         ticketData: props.ticketData,
         renderTopLeft: function renderTopLeft() {
           return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'), _renderTopLeft()];
-        },
-        setVerifyRules: setVerifyRules
+        }
       })));
     }
     return _utils.ChildrenUtil.deepMap(formProps, function (child) {
@@ -347,7 +326,7 @@ var LdFormList = function LdFormList(_ref) {
         mode: child.props.mode || 'tab'
       }) : child.props);
     })[0];
-  })) : null;
+  }));
 };
 
 // 构建带有model的组件