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

package/es/components/LdTree/index.js

@@ -1,9 +1,10 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service", "dataToTreeFormat", "boxRef", "doubleClickExpand", "onNodeDoubleClick", "width", "height", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "treeNodeIcon", "asyncLoad", "parentKey", "onMount", "onUnmount", "onDataSetChange", "onTreeNodeRender"],
+var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service", "dataToTreeFormat", "boxRef", "doubleClickExpand", "onNodeDoubleClick", "width", "height", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "treeNodeIcon", "asyncLoad", "parentKey", "onMount", "onUnmount", "onDataSetChange", "onTreeNodeRender", "onlyRoot"],
   _excluded2 = ["onClick"];
 import React, { useState, useRef, useImperativeHandle, forwardRef, useLayoutEffect } from 'react';
 import { isFunction, isNumber, transform, includes, remove, cloneDeep, isNil } from 'lodash';
@@ -61,6 +62,7 @@ var LdTree = function LdTree(_ref) {
     onUnmount = _ref.onUnmount,
     onDataSetChange = _ref.onDataSetChange,
     onTreeNodeRender = _ref.onTreeNodeRender,
+    onlyRoot = _ref.onlyRoot,
     props = _objectWithoutProperties(_ref, _excluded);
   if (!includes(isTree, dataSetKey)) return formatMessage({
     id: 'luckda.ldTree.notTrees',
@@ -75,6 +77,7 @@ var LdTree = function LdTree(_ref) {
     defaultExpandedProps = _useState4[0],
     setDefaultExpandedProps = _useState4[1];
   var treeRef = useRef(null);
+  var onceRef = useRef(true);
   var defaultParams = useCreation(function () {
     var _params = [_objectSpread({
       moduleCode: moduleCode,
@@ -112,7 +115,8 @@ var LdTree = function LdTree(_ref) {
           }
           var treeData = dataToTreeFormat ? dataToTreeFormat(data) : dataToTree(data, null, window.appConfig.constraintKeys.PRIMARY, window.appConfig.constraintKeys.PARENT);
           setDataSource(treeData);
-          afterInit && afterInit(treeData);
+          onceRef.current && afterInit && afterInit(treeData, data);
+          onceRef.current = false;
         }
       }
     }),
@@ -218,10 +222,25 @@ var LdTree = function LdTree(_ref) {
   });
   var handleDrop = useMemoizedFn(function (info) {
     var dragInfo = dragTreeData(info, dataSource);
-    onDrop && onDrop(info, dragInfo);
+    if (onDrop) onDrop(info, dragInfo);else if (dragInfo !== false) {
+      doAction('drag', {
+        get: {
+          datasetCode: dataSetKey
+        },
+        post: {
+          fromId: info.dragNode.props.dataRef[PRIMARY],
+          toId: info.node.props.dataRef[PRIMARY]
+        }
+      }, {
+        showConfirm: false,
+        callback: function callback(success) {
+          return success && onLdQuery();
+        }
+      });
+    }
   });
   var onAdd = useCreation(function () {
-    return !(readOnly || !rootAdd || rootAdd.resource && !includes(resources, rootAdd.resource)) ? function () {
+    return !(readOnly || !rootAdd || rootAdd.resource && !includes(resources, rootAdd.resource) || onlyRoot && (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) > 0) ? function () {
       return handleMenuClick(rootAdd);
     } : null;
   }, [readOnly, rootAdd, resources]);
@@ -233,18 +252,17 @@ var LdTree = function LdTree(_ref) {
         return;
       }
       (service || behaviorCall)(_objectSpread(_objectSpread({}, params[0]), {}, _defineProperty({}, parentKey, treeNode.props.dataRef[window.appConfig.constraintKeys.PRIMARY]))).then(function (res) {
-        console.log(res);
+        var code = res.code,
+          list = res.list,
+          detail = res.detail;
+        if (code === 1) {
+          treeNode.props.dataRef.children = list.map(function (i) {
+            return detail[i];
+          });
+          setDataSource(_toConsumableArray(dataSource));
+          resolve();
+        }
       });
-      // setTimeout(() => {
-      //   treeNode.props.dataRef.children = [
-      //     { title: 'Child Node', key: `${treeNode.props.eventKey}-0` },
-      //     { title: 'Child Node', key: `${treeNode.props.eventKey}-1` },
-      //   ];
-      //   this.setState({
-      //     treeData: [...this.state.treeData],
-      //   });
-      //   resolve();
-      // }, 1000);
     });
   });
   var asyncLoadData = useCreation(function () {

package/es/helper/FromItems.js

@@ -1,6 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["onBlur"],
   _excluded2 = ["handleValueChange", "config"],
@@ -10,28 +11,35 @@ var _excluded = ["onBlur"],
   _excluded6 = ["handleValueChange", "config"],
   _excluded7 = ["onChange"],
   _excluded8 = ["handleValueChange", "config"],
-  _excluded9 = ["handleValueChange", "onChange"],
+  _excluded9 = ["handleValueChange", "onChange", "params", "extraFilter"],
   _excluded10 = ["onChange"],
   _excluded11 = ["handleValueChange", "config"],
-  _excluded12 = ["renderInfoMode"],
-  _excluded13 = ["onChange"],
-  _excluded14 = ["handleValueChange", "config"],
-  _excluded15 = ["onClose"],
-  _excluded16 = ["handleValueChange", "config"],
-  _excluded17 = ["onChange"],
+  _excluded12 = ["onChange"],
+  _excluded13 = ["handleValueChange", "config", "allowClear"],
+  _excluded14 = ["renderInfoMode"],
+  _excluded15 = ["onChange"],
+  _excluded16 = ["handleValueChange", "config", "selectorProps", "suppressSelect"],
+  _excluded17 = ["onClose"],
   _excluded18 = ["handleValueChange", "config"],
-  _excluded19 = ["handleValueChange"],
+  _excluded19 = ["onChange"],
   _excluded20 = ["handleValueChange", "config"],
-  _excluded21 = ["onBlur"],
+  _excluded21 = ["handleValueChange"],
   _excluded22 = ["handleValueChange", "config"],
-  _excluded23 = ["onBlur"],
-  _excluded24 = ["handleValueChange", "config"];
+  _excluded23 = ["onBlur", "editorConfig"],
+  _excluded24 = ["handleValueChange", "resize", "plugins", "onChange", "config"],
+  _excluded25 = ["onBlur"],
+  _excluded26 = ["handleValueChange", "config"],
+  _excluded27 = ["onChange"],
+  _excluded28 = ["handleValueChange", "config"];
 import React, { useState, useEffect } from 'react';
 import { getDvaApp } from 'umi';
+import { isNil } from 'lodash';
 import { BasicFormItem } from 'luck-design';
 import { TreeSelector, RegionFormItem } from '@luck-design-biz/base';
-import { DatadicDropDown, UserSelectDropDown as UserItem } from '@luck-design-biz/base/sys/dropdown';
+import { DatadicDropDown as DatedicFormItem, UserSelectDropDown as UserItem } from '@luck-design-biz/base/sys/dropdown';
 import buildUploadFormItem from "../upload/FormItem";
+import ComplexItem from "../components/ComplexItem";
+import { LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT } from "../lowcode/constants";
 export var getNumberItem = function getNumberItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref.handleValueChange,
@@ -42,6 +50,7 @@ export var getNumberItem = function getNumberItem() {
     props = _objectWithoutProperties(_ref, _excluded2);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
     type: "input",
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldNumber'),
     config: _objectSpread(_objectSpread({}, _config), {}, {
       type: 'number',
       onBlur: function onBlur(e) {
@@ -51,14 +60,15 @@ export var getNumberItem = function getNumberItem() {
     })
   }));
 };
-export var getStringItem = function getStringItem(_ref2) {
-  var handleValueChange = _ref2.handleValueChange,
-    _ref2$config = _ref2.config,
-    _ref2$config2 = _ref2$config === void 0 ? {} : _ref2$config,
-    _onBlur2 = _ref2$config2.onBlur,
-    _config = _objectWithoutProperties(_ref2$config2, _excluded3),
-    props = _objectWithoutProperties(_ref2, _excluded4);
+export var getStringItem = function getStringItem(_ref3) {
+  var handleValueChange = _ref3.handleValueChange,
+    _ref3$config = _ref3.config,
+    _ref3$config2 = _ref3$config === void 0 ? {} : _ref3$config,
+    _onBlur2 = _ref3$config2.onBlur,
+    _config = _objectWithoutProperties(_ref3$config2, _excluded3),
+    props = _objectWithoutProperties(_ref3, _excluded4);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldString'),
     config: _objectSpread(_objectSpread({}, _config), {}, {
       onBlur: function onBlur(e) {
         handleValueChange && handleValueChange(e.target.value);
@@ -69,14 +79,15 @@ export var getStringItem = function getStringItem(_ref2) {
   }));
 };
 export var getTextareaItem = function getTextareaItem() {
-  var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-    handleValueChange = _ref3.handleValueChange,
-    _ref3$config = _ref3.config,
-    _ref3$config2 = _ref3$config === void 0 ? {} : _ref3$config,
-    _onBlur3 = _ref3$config2.onBlur,
-    _config = _objectWithoutProperties(_ref3$config2, _excluded5),
-    props = _objectWithoutProperties(_ref3, _excluded6);
+  var _ref5 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    handleValueChange = _ref5.handleValueChange,
+    _ref5$config = _ref5.config,
+    _ref5$config2 = _ref5$config === void 0 ? {} : _ref5$config,
+    _onBlur3 = _ref5$config2.onBlur,
+    _config = _objectWithoutProperties(_ref5$config2, _excluded5),
+    props = _objectWithoutProperties(_ref5, _excluded6);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldTextarea'),
     type: "input",
     config: _objectSpread(_objectSpread({}, _config), {}, {
       type: 'textArea',
@@ -88,14 +99,15 @@ export var getTextareaItem = function getTextareaItem() {
   }));
 };
 export var getDateItem = function getDateItem() {
-  var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-    handleValueChange = _ref4.handleValueChange,
-    _ref4$config = _ref4.config,
-    _ref4$config2 = _ref4$config === void 0 ? {} : _ref4$config,
-    _onChange = _ref4$config2.onChange,
-    _config = _objectWithoutProperties(_ref4$config2, _excluded7),
-    props = _objectWithoutProperties(_ref4, _excluded8);
+  var _ref7 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    handleValueChange = _ref7.handleValueChange,
+    _ref7$config = _ref7.config,
+    _ref7$config2 = _ref7$config === void 0 ? {} : _ref7$config,
+    _onChange = _ref7$config2.onChange,
+    _config = _objectWithoutProperties(_ref7$config2, _excluded7),
+    props = _objectWithoutProperties(_ref7, _excluded8);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldDate'),
     type: "datePicker",
     config: _objectSpread(_objectSpread({}, _config), {}, {
       type: 'date',
@@ -106,24 +118,31 @@ export var getDateItem = function getDateItem() {
     })
   }));
 };
-export var getUserItem = function getUserItem(_ref5) {
-  var handleValueChange = _ref5.handleValueChange,
-    _onChange2 = _ref5.onChange,
-    props = _objectWithoutProperties(_ref5, _excluded9);
+export var getUserItem = function getUserItem(_ref9) {
+  var handleValueChange = _ref9.handleValueChange,
+    _onChange2 = _ref9.onChange,
+    _ref9$params = _ref9.params,
+    params = _ref9$params === void 0 ? {} : _ref9$params,
+    extraFilter = _ref9.extraFilter,
+    props = _objectWithoutProperties(_ref9, _excluded9);
   return /*#__PURE__*/React.createElement(UserItem, _extends({}, props, {
+    params: _objectSpread(_objectSpread({}, params), {}, {
+      extraFilter: extraFilter
+    }),
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldUser'),
     onChange: function onChange(value, record) {
       handleValueChange && handleValueChange(value);
       _onChange2 && _onChange2(value, record);
     }
   }));
 };
-export var getSelectItem = function getSelectItem(_ref6) {
-  var handleValueChange = _ref6.handleValueChange,
-    _ref6$config = _ref6.config,
-    _ref6$config2 = _ref6$config === void 0 ? {} : _ref6$config,
-    _onChange3 = _ref6$config2.onChange,
-    _config = _objectWithoutProperties(_ref6$config2, _excluded10),
-    props = _objectWithoutProperties(_ref6, _excluded11);
+export var getSelectItem = function getSelectItem(_ref11) {
+  var handleValueChange = _ref11.handleValueChange,
+    _ref11$config = _ref11.config,
+    _ref11$config2 = _ref11$config === void 0 ? {} : _ref11$config,
+    _onChange3 = _ref11$config2.onChange,
+    _config = _objectWithoutProperties(_ref11$config2, _excluded10),
+    props = _objectWithoutProperties(_ref11, _excluded11);
   var config = _objectSpread(_objectSpread({}, _config), {}, {
     onChange: function onChange(value, e) {
       handleValueChange && handleValueChange(value);
@@ -131,19 +150,41 @@ export var getSelectItem = function getSelectItem(_ref6) {
     }
   });
   if (props.alias) {
-    DatadicDropDown.comName = 'DatadicDropDown';
-    return /*#__PURE__*/React.createElement(DatadicDropDown, _extends({}, props, {
+    DatedicFormItem.comName = 'DatadicDropDown';
+    return /*#__PURE__*/React.createElement(DatedicFormItem, _extends({}, props, {
+      $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldSelect'),
       config: config
     }));
   }
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldSelect'),
     type: "select",
     config: config
   }));
 };
-var DictRadioItem = function DictRadioItem(_ref7) {
-  var renderInfoMode = _ref7.renderInfoMode,
-    props = _objectWithoutProperties(_ref7, _excluded12);
+export var getDictItem = function getDictItem(_ref14) {
+  var handleValueChange = _ref14.handleValueChange,
+    _ref14$config = _ref14.config,
+    _ref14$config2 = _ref14$config === void 0 ? {} : _ref14$config,
+    _onChange4 = _ref14$config2.onChange,
+    _config = _objectWithoutProperties(_ref14$config2, _excluded12),
+    allowClear = _ref14.allowClear,
+    props = _objectWithoutProperties(_ref14, _excluded13);
+  var config = _objectSpread(_objectSpread({}, _config), {}, {
+    allowClear: allowClear,
+    onChange: function onChange(value, e) {
+      handleValueChange && handleValueChange(value);
+      _onChange4 && _onChange4(value, e);
+    }
+  });
+  return /*#__PURE__*/React.createElement(DatedicFormItem, _extends({}, props, {
+    config: config,
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldDict')
+  }));
+};
+var DictRadioItem = function DictRadioItem(_ref16) {
+  var renderInfoMode = _ref16.renderInfoMode,
+    props = _objectWithoutProperties(_ref16, _excluded14);
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     options = _useState2[0],
@@ -167,6 +208,7 @@ var DictRadioItem = function DictRadioItem(_ref7) {
     });
     return /*#__PURE__*/React.createElement("span", null, option === null || option === void 0 ? void 0 : option.label);
   }) : /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldRDatadic'),
     config: _objectSpread(_objectSpread({}, props.config), {}, {
       options: options
     }),
@@ -180,38 +222,47 @@ export var getRadioItem = function getRadioItem() {
     return /*#__PURE__*/React.createElement(DictRadioItem, props);
   }
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldRadio'),
     type: "radio"
   }));
 };
-export var getGroupItem = function getGroupItem(_ref8) {
-  var handleValueChange = _ref8.handleValueChange,
-    _ref8$config = _ref8.config,
-    _ref8$config2 = _ref8$config === void 0 ? {} : _ref8$config,
-    _onChange4 = _ref8$config2.onChange,
-    _config = _objectWithoutProperties(_ref8$config2, _excluded13),
-    props = _objectWithoutProperties(_ref8, _excluded14);
+export var getGroupItem = function getGroupItem(_ref19) {
+  var handleValueChange = _ref19.handleValueChange,
+    _ref19$config = _ref19.config,
+    _ref19$config2 = _ref19$config === void 0 ? {} : _ref19$config,
+    _onChange5 = _ref19$config2.onChange,
+    _config = _objectWithoutProperties(_ref19$config2, _excluded15),
+    _ref19$selectorProps = _ref19.selectorProps,
+    selectorProps = _ref19$selectorProps === void 0 ? {} : _ref19$selectorProps,
+    suppressSelect = _ref19.suppressSelect,
+    props = _objectWithoutProperties(_ref19, _excluded16);
   return /*#__PURE__*/React.createElement(TreeSelector, _extends({}, props, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldGroup'),
     api: "/api/base/group/sysGroupTree/noAuthReadJurisTree?sclassKey=".concat(props.sclassKey),
+    selectorProps: _objectSpread(_objectSpread({}, selectorProps), {}, {
+      suppressSelect: suppressSelect
+    }),
     config: _objectSpread(_objectSpread({}, _config), {}, {
       onChange: function onChange(value, record) {
         handleValueChange && handleValueChange(value);
-        _onChange4 && _onChange4(value, record);
+        _onChange5 && _onChange5(value, record);
       }
     })
   }));
 };
-export var getColorItem = function getColorItem(_ref9) {
-  var handleValueChange = _ref9.handleValueChange,
-    _ref9$config = _ref9.config,
-    _ref9$config2 = _ref9$config === void 0 ? {} : _ref9$config,
-    _onClose = _ref9$config2.onClose,
-    _config = _objectWithoutProperties(_ref9$config2, _excluded15),
-    props = _objectWithoutProperties(_ref9, _excluded16);
+export var getColorItem = function getColorItem(_ref21) {
+  var handleValueChange = _ref21.handleValueChange,
+    _ref21$config = _ref21.config,
+    _ref21$config2 = _ref21$config === void 0 ? {} : _ref21$config,
+    _onClose = _ref21$config2.onClose,
+    _config = _objectWithoutProperties(_ref21$config2, _excluded17),
+    props = _objectWithoutProperties(_ref21, _excluded18);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({
     formOptions: {
       initialValue: '#000000'
     }
   }, props, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldColor'),
     type: "colorPicker",
     config: _objectSpread(_objectSpread({}, _config), {}, {
       onClose: function onClose(value) {
@@ -221,27 +272,29 @@ export var getColorItem = function getColorItem(_ref9) {
     })
   }));
 };
-export var getSwitchItem = function getSwitchItem(_ref10) {
-  var handleValueChange = _ref10.handleValueChange,
-    _ref10$config = _ref10.config,
-    _ref10$config2 = _ref10$config === void 0 ? {} : _ref10$config,
-    _onChange5 = _ref10$config2.onChange,
-    _config = _objectWithoutProperties(_ref10$config2, _excluded17),
-    props = _objectWithoutProperties(_ref10, _excluded18);
+export var getSwitchItem = function getSwitchItem(_ref23) {
+  var handleValueChange = _ref23.handleValueChange,
+    _ref23$config = _ref23.config,
+    _ref23$config2 = _ref23$config === void 0 ? {} : _ref23$config,
+    _onChange6 = _ref23$config2.onChange,
+    _config = _objectWithoutProperties(_ref23$config2, _excluded19),
+    props = _objectWithoutProperties(_ref23, _excluded20);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldSwitch'),
     type: "switch",
     config: _objectSpread(_objectSpread({}, _config), {}, {
       onChange: function onChange(value, event) {
         handleValueChange && handleValueChange(value);
-        _onChange5 && _onChange5(value, event);
+        _onChange6 && _onChange6(value, event);
       }
     })
   }));
 };
-export var getRegionItem = function getRegionItem(_ref11) {
-  var handleValueChange = _ref11.handleValueChange,
-    props = _objectWithoutProperties(_ref11, _excluded19);
+export var getRegionItem = function getRegionItem(_ref25) {
+  var handleValueChange = _ref25.handleValueChange,
+    props = _objectWithoutProperties(_ref25, _excluded21);
   return /*#__PURE__*/React.createElement(RegionFormItem, _extends({}, props, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldRegion'),
     config: _objectSpread(_objectSpread({
       changeOnSelect: true
     }, props.config), {}, {
@@ -254,12 +307,13 @@ export var getRegionItem = function getRegionItem(_ref11) {
   }));
 };
 export var getYearItem = function getYearItem() {
-  var _ref12 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-    handleValueChange = _ref12.handleValueChange,
-    _ref12$config = _ref12.config,
-    config = _ref12$config === void 0 ? {} : _ref12$config,
-    props = _objectWithoutProperties(_ref12, _excluded20);
+  var _ref27 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    handleValueChange = _ref27.handleValueChange,
+    _ref27$config = _ref27.config,
+    config = _ref27$config === void 0 ? {} : _ref27$config,
+    props = _objectWithoutProperties(_ref27, _excluded22);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldYear'),
     type: "datePicker",
     config: _objectSpread(_objectSpread({}, config), {}, {
       type: 'year',
@@ -271,14 +325,23 @@ export var getYearItem = function getYearItem() {
   }));
 };
 export var getEditorItem = function getEditorItem() {
-  var _ref13 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-    handleValueChange = _ref13.handleValueChange,
-    _ref13$config = _ref13.config,
-    _ref13$config2 = _ref13$config === void 0 ? {} : _ref13$config,
-    _onBlur4 = _ref13$config2.onBlur,
-    _config = _objectWithoutProperties(_ref13$config2, _excluded21),
-    props = _objectWithoutProperties(_ref13, _excluded22);
+  var _ref29 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    handleValueChange = _ref29.handleValueChange,
+    resize = _ref29.resize,
+    getPlugins = _ref29.plugins,
+    onChange = _ref29.onChange,
+    _ref29$config = _ref29.config,
+    _ref29$config2 = _ref29$config === void 0 ? {} : _ref29$config,
+    _onBlur4 = _ref29$config2.onBlur,
+    editorConfig = _ref29$config2.editorConfig,
+    _config = _objectWithoutProperties(_ref29$config2, _excluded23),
+    props = _objectWithoutProperties(_ref29, _excluded24);
+  var _editorConfig = editorConfig || {};
+  if (!isNil(resize)) _editorConfig.resize = resize;
+  if (getPlugins) _editorConfig.plugins = getPlugins();
+  if (onChange) _editorConfig.onEditorChange = onChange;
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldEditor'),
     type: "editor",
     config: _objectSpread(_objectSpread({
       language: 'zh-cn',
@@ -286,6 +349,7 @@ export var getEditorItem = function getEditorItem() {
         Authorization: "Bearer "
       }
     }, _config), {}, {
+      editorConfig: _editorConfig,
       onBlur: function onBlur(value) {
         handleValueChange && handleValueChange(value);
         _onBlur4 && _onBlur4(value);
@@ -294,14 +358,15 @@ export var getEditorItem = function getEditorItem() {
   }));
 };
 export var getUploadItem = function getUploadItem() {
-  var _ref14 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-    handleValueChange = _ref14.handleValueChange,
-    _ref14$config = _ref14.config,
-    _ref14$config2 = _ref14$config === void 0 ? {} : _ref14$config,
-    _onBlur5 = _ref14$config2.onBlur,
-    _config = _objectWithoutProperties(_ref14$config2, _excluded23),
-    props = _objectWithoutProperties(_ref14, _excluded24);
+  var _ref31 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    handleValueChange = _ref31.handleValueChange,
+    _ref31$config = _ref31.config,
+    _ref31$config2 = _ref31$config === void 0 ? {} : _ref31$config,
+    _onBlur5 = _ref31$config2.onBlur,
+    _config = _objectWithoutProperties(_ref31$config2, _excluded25),
+    props = _objectWithoutProperties(_ref31, _excluded26);
   return /*#__PURE__*/React.createElement(React.Fragment, null, buildUploadFormItem(_objectSpread(_objectSpread({}, props), {}, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldUpload'),
     config: _objectSpread(_objectSpread({
       listType: 'picture-card'
     }, _config), {}, {
@@ -311,4 +376,22 @@ export var getUploadItem = function getUploadItem() {
       }
     })
   })));
+};
+export var getComplexItem = function getComplexItem(_ref32) {
+  var handleValueChange = _ref32.handleValueChange,
+    _ref32$config = _ref32.config,
+    _ref32$config2 = _ref32$config === void 0 ? {} : _ref32$config,
+    _onChange7 = _ref32$config2.onChange,
+    _config = _objectWithoutProperties(_ref32$config2, _excluded27),
+    props = _objectWithoutProperties(_ref32, _excluded28);
+  var config = _objectSpread(_objectSpread({}, _config), {}, {
+    onChange: function onChange(value, e) {
+      handleValueChange && handleValueChange(value);
+      _onChange7 && _onChange7(value, e);
+    }
+  });
+  return /*#__PURE__*/React.createElement(ComplexItem, _extends({}, props, {
+    $attrs: _defineProperty(_defineProperty({}, LC_COMPONENT_UNIT_KEY, LC_FORMITEM_UNIT), 'data-__component', 'FieldComplex'),
+    config: config
+  }));
 };

package/es/helper/form.js

@@ -1,8 +1,11 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["extra"];
-import { isNil } from 'lodash';
+var _excluded = ["extra", "verifyList", "setVerifyRules"];
+import { isNil, keyBy, pick, omit } from 'lodash';
 import { formatMessage } from '@luck-design-biz/base/utils';
+import { cloneDeep, isEmpty } from 'lodash';
+import props_config from "./props_config";
 
 // 属性类型=》控件
 export var defaultComName = {
@@ -14,7 +17,7 @@ export var defaultComName = {
   text: 'textarea',
   date: 'date',
   user: 'user',
-  dict: 'select',
+  dict: 'dict',
   group: 'group',
   on_off: 'switch',
   code: 'string',
@@ -22,7 +25,8 @@ export var defaultComName = {
   zone: 'region',
   year: 'year',
   rte: 'editor',
-  file: 'upload'
+  file: 'upload',
+  complex: 'complex'
 };
 
 /**
@@ -55,6 +59,8 @@ export var splitStrToObj = function splitStrToObj(keyStr, labelStr) {
 export function translator() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     extra = _ref.extra,
+    verifyList = _ref.verifyList,
+    setVerifyRules = _ref.setVerifyRules,
     props = _objectWithoutProperties(_ref, _excluded);
   var allConfig = _objectSpread(_objectSpread({}, props), JSON.parse(extra || '{}'));
   var _props = {
@@ -64,15 +70,19 @@ export function translator() {
       required: !!allConfig.isNotNull,
       disabled: !!allConfig.isReadOnly
     },
-    layout: 'block'
+    layout: 'block',
+    col: allConfig.col || 1,
+    row: allConfig.row || 1
   };
   if (!isNil(allConfig['dataFormat'])) _props.dataFormat = allConfig['dataFormat'];
-  // if (allConfig.tip) _props.config.placeholder = allConfig.tip;
-  // if (allConfig.note) _props.extra = allConfig.note;
+  if (allConfig.placeholder) _props.config.placeholder = allConfig.placeholder;
+  if (allConfig.note) _props.extra = allConfig.note;
+  if (allConfig.tip) _props.tip = allConfig.tip;
   /* *********************************** extra ******************************* */
-  if (allConfig['opt_length']) _props.config.length = allConfig['opt_length'];
-  if (!isNil(allConfig['opt_number_min'])) _props.config.min = allConfig['opt_number_min'];
-  if (!isNil(allConfig['opt_number_max'])) _props.config.max = allConfig['opt_number_max'];
+  var verifyListObj = keyBy(verifyList, 'verifyType');
+  if (allConfig['opt_length'] && !verifyListObj.length) _props.config.length = allConfig['opt_length'];
+  if (!isNil(allConfig['opt_number_min']) && !verifyListObj.min) _props.config.min = allConfig['opt_number_min'];
+  if (!isNil(allConfig['opt_number_max']) && !verifyListObj.max) _props.config.max = allConfig['opt_number_max'];
   if (!isNil(allConfig['opt_decimal'])) _props.config.precision = allConfig['opt_decimal'];
   // 兼容部分组件多选移至props
   if (!isNil(allConfig['opt_multiple'])) _props.multiple = !!allConfig['opt_multiple'];
@@ -86,7 +96,28 @@ export function translator() {
       label: '不满足验证要求'
     })
   }];
+  // 复核类型参数
+  if (allConfig.opt_data_model) _props.complexConfig = _objectSpread(_objectSpread({}, _props.complexConfig || {}), {}, {
+    dataModel: allConfig.opt_data_model
+  });
+  if (allConfig.opt_module) _props.complexConfig = _objectSpread(_objectSpread({}, _props.complexConfig || {}), {}, {
+    moduleCode: allConfig.opt_module
+  });
+  if (allConfig.opt_dataset) _props.complexConfig = _objectSpread(_objectSpread({}, _props.complexConfig || {}), {}, {
+    dataSetCode: allConfig.opt_dataset
+  });
+  if (allConfig.opt_show_tree) _props.complexConfig = _objectSpread(_objectSpread({}, _props.complexConfig || {}), {}, {
+    isTree: allConfig.opt_show_tree
+  });
+  if (allConfig.opt_key_field) _props.complexConfig = _objectSpread(_objectSpread({}, _props.complexConfig || {}), {}, {
+    keyField: allConfig.opt_key_field
+  });
+  if (allConfig.opt_value_field) _props.complexConfig = _objectSpread(_objectSpread({}, _props.complexConfig || {}), {}, {
+    valueField: allConfig.opt_value_field
+  });
+  // 符合类型参数
   if (allConfig['desensitized']) _props.desensitized = allConfig['desensitized']; // 脱敏
+  if ((verifyList === null || verifyList === void 0 ? void 0 : verifyList.length) > 0 && setVerifyRules) return setVerifyRules(_props, verifyListObj);
   return _props;
 }
 
@@ -95,10 +126,20 @@ export function translator() {
  * @param props
  * @returns {{multiple}|*}
  */
-export function formatCustomProps(props) {
-  var _props$confiig;
-  if (props !== null && props !== void 0 && props.multiple) delete props.multiple;
-  if (props !== null && props !== void 0 && (_props$confiig = props.confiig) !== null && _props$confiig !== void 0 && _props$confiig.mode) delete props.confiig.mode;
+export function formatCustomProps(comType, props) {
+  var _props2, _props3;
+  if ((_props2 = props) !== null && _props2 !== void 0 && _props2.multiple) delete props.multiple;
+  if ((_props3 = props) !== null && _props3 !== void 0 && (_props3 = _props3.config) !== null && _props3 !== void 0 && _props3.mode) delete props.config.mode;
   // alias、sclassKey?
+  if (!isEmpty(props.setting)) {
+    var _props_config$comType, _props_config$comType2;
+    var setting = cloneDeep(props.setting);
+    setting.events = setting.events || {}, delete props.setting;
+    var propsSetting = ((_props_config$comType = props_config[comType]) === null || _props_config$comType === void 0 ? void 0 : _props_config$comType.propsSetting) || [];
+    var propsEvents = ((_props_config$comType2 = props_config[comType]) === null || _props_config$comType2 === void 0 ? void 0 : _props_config$comType2.propsEvents) || [];
+    props = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, props), pick(setting, propsSetting)), pick(setting.events, propsEvents)), {}, {
+      config: _objectSpread(_objectSpread(_objectSpread({}, props.config || {}), omit(setting, [].concat(_toConsumableArray(propsSetting), ['events']))), omit(setting.events, propsEvents))
+    });
+  }
   return props;
 }