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

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;
       }

package/lib/components/LdFormList/index.js

@@ -30,8 +30,8 @@ var _Builder = require("../Builder");
 var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
-var _services = require("../../services");
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
+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"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft", "serial"],
   _excluded4 = ["ldId", "initData", "overModel"];
@@ -62,8 +62,10 @@ 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],
@@ -76,6 +78,10 @@ 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');
   }, []);
@@ -89,6 +95,9 @@ 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') {
@@ -101,7 +110,8 @@ var LdFormList = function LdFormList(_ref) {
           });
           formListRef.current.doQuery();
         }
-      }
+      },
+      ticketData: props.ticketData
     });
   });
   var handleValueChange = (0, _ahooks.useMemoizedFn)(function (change) {
@@ -112,6 +122,7 @@ 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) {
@@ -131,7 +142,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$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
+    var _props$formData$mainF, _params, response, _yield$callBehavior, 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:
@@ -141,13 +152,14 @@ 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'
-          }; // 请求是否有工作流服务
-          _context.next = 4;
-          return (0, _services.readBehaviorCall)(_params);
+          }, _params);
         case 4:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
@@ -155,13 +167,15 @@ var LdFormList = function LdFormList(_ref) {
             break;
           }
           _context.next = 8;
-          return (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _params), {}, {
+          return callBehavior({
+            moduleCode: rest.moduleCode,
+            datasetCode: mainDataSetKey,
             behaviorKey: 'readBpm'
-          }));
+          }, _params);
         case 8:
-          _yield$readBehaviorCa = _context.sent;
-          code = _yield$readBehaviorCa.code;
-          data = _yield$readBehaviorCa.data;
+          _yield$callBehavior = _context.sent;
+          code = _yield$callBehavior.code;
+          data = _yield$callBehavior.data;
           if (code == 1 && data) {
             bpmInfoObj = data.bpmInfo;
             tempObj = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.formData[mainFormLdId]), {}, {
@@ -268,7 +282,9 @@ 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) {
-    if (formProps.dataSetKey) {
+    var _formProps$type = formProps.type,
+      type = _formProps$type === void 0 ? 'auto' : _formProps$type;
+    if ((0, _lodash.includes)(['auto', 'writer', 'grid'], type)) {
       var _ref8 = formProps || {},
         ldId = _ref8.id,
         _ref8$header = _ref8.header,
@@ -283,17 +299,15 @@ var LdFormList = function LdFormList(_ref) {
         } : _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' && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
+        extra: type === 'auto' && formProps.dataSetKey && renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic'),
         id: ldId,
         key: ldId,
         mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
-      }, renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+      }, formProps.dataSetKey && renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -302,18 +316,19 @@ 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' && /*#__PURE__*/_react.default.createElement("div", {
+      }), type === 'auto' && formProps.dataSetKey && /*#__PURE__*/_react.default.createElement("div", {
         style: {
           textAlign: 'right'
         }
-      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
+      }, renderExtra(ldId, extraConfig, luckTheme === 'base' ? 'text' : 'graphic')), formProps.dataSetKey && renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
         ldId: ldId,
         mainFormLdId: mainFormLdId,
         mainDataSetKey: mainDataSetKey,
@@ -322,7 +337,8 @@ 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) {