@luck-design-biz/luckda 0.0.9 → 0.0.11-1

package/es/components/LdAutoForm/index.js

@@ -2,7 +2,7 @@ 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 _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "formRef", "formMode"];
 import React, { useContext, useRef, useState } from 'react';
 import { useCreation, useMemoizedFn } from 'ahooks';
 import { transform } from 'lodash';
@@ -41,6 +41,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     } : _ref$defaultDataSourc,
     _ref$ticketData = _ref.ticketData,
     ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
+    formRef = _ref.formRef,
+    formMode = _ref.formMode,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useContext(LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
@@ -55,7 +57,12 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           return field.name === col.field;
         }) || {};
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, col.field, col['optDefaultValue']), _defineProperty(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
-        result.push(getFormItem(col, _objectSpread(_objectSpread({}, customFiled), {}, {
+        result.push(getFormItem(col, _objectSpread(_objectSpread({
+          formId: ldId,
+          moduleCode: moduleCode,
+          formRef: formRef,
+          formMode: formMode
+        }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.field, value)));
           }
@@ -85,11 +92,13 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
         return behaviorCall(get, post, formData);
       },
       get: function get() {
-        return {
+        var _get = {
           moduleCode: moduleCode,
           datasetCode: dataSetKey,
           behaviorKey: behaviorKey
         };
+        if (!isMain) _get.relationDs = mainDataSetKey;
+        return _get;
       }
     }, _onOperate), {}, {
       post: function post(_ref3) {

package/es/components/LdFormList/index.js

@@ -81,8 +81,8 @@ var LdFormList = function LdFormList(_ref) {
     var _ref5 = formListRef.current || {},
       formRefs = _ref5.formRefs;
     var data = formRefs && Object.keys(formRefs).map(function (key) {
-      var _formRefs$key$current;
-      var getValue = formRefs[key].getData || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
+      var _formRefs$key, _formRefs$key$formRef, _formRefs$key$current;
+      var getValue = (((_formRefs$key = formRefs[key]) === null || _formRefs$key === void 0 ? void 0 : (_formRefs$key$formRef = _formRefs$key.formRef) === null || _formRefs$key$formRef === void 0 ? void 0 : _formRefs$key$formRef.current) ? formRefs[key].getData : null) || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
       return _defineProperty({}, key, getValue && getValue());
     });
     onValueChange(change, data);
@@ -122,25 +122,30 @@ var LdFormList = function LdFormList(_ref) {
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          if (!formWindow && formMode === 'add' && window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN) {
-            var _history$location = history.location,
-              pathname = _history$location.pathname,
-              query = _history$location.query;
-            var _pathname = pathname.replace(/\/0(?=[?]|[\/]$|$)/g, "/".concat(indocno, "?"));
-            window.openUrl("layer:".concat(_pathname).concat(stringify(_objectSpread(_objectSpread({}, query), {}, {
-              title: window.__INJECTED_APP_NAME_BY_QIANKUN__
-            }))));
-          } else {
-            formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
-              indocno: indocno
-            }), function () {
-              return formListRef.current.setFormMode('info');
-            });
-          }
+          // if (
+          //   !formWindow &&
+          //   formMode === 'add' &&
+          //   window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN
+          // ) {
+          //   const { pathname, query } = history.location;
+          //   window.openUrl(
+          //     `layer:${pathname}?${stringify({
+          //       ...query,
+          //       title: window.__INJECTED_APP_NAME_BY_QIANKUN__,
+          //     })}`,
+          //   );
+          // } else {
+          formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
+            indocno: indocno
+          }), function () {
+            return formListRef.current.setFormMode('info');
+          });
+          // }
         }
       }
     });
   };
+
   var formConfig = _objectSpread(_objectSpread({
     formState: formState,
     formMode: formMode,
@@ -189,19 +194,21 @@ var LdFormList = function LdFormList(_ref) {
     var _props$type = _props.type,
       type = _props$type === void 0 ? 'auto' : _props$type;
     var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
-    if (header === 'collapse') return /*#__PURE__*/React.createElement(Collapse, {
+    if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/React.createElement(Collapse, {
       title: title || ldId,
       extra: renderExtra(ldId, extraConfig),
       id: ldId,
       key: ldId,
-      mode: ldId !== mainFormLdId && 'tab'
+      mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
     }, renderForm(_objectSpread(_objectSpread({}, _props), {}, {
       ldId: ldId,
       mainFormLdId: mainFormLdId,
       mainDataSetKey: mainDataSetKey,
       readOnly: readOnly || _readOnly,
       onValueChange: handleValueChange,
-      ticketData: props.ticketData
+      ticketData: props.ticketData,
+      formRef: formListRef,
+      formMode: formMode
     })));
     return /*#__PURE__*/React.createElement(Fragment, {
       key: ldId
@@ -218,7 +225,9 @@ var LdFormList = function LdFormList(_ref) {
       mainDataSetKey: mainDataSetKey,
       readOnly: readOnly || _readOnly,
       onValueChange: handleValueChange,
-      ticketData: props.ticketData
+      ticketData: props.ticketData,
+      formRef: formListRef,
+      formMode: formMode
     })));
   }), ChildrenUtil.deepMap(renderFormExtra(formConfig), function (child) {
     var _child$type;

package/es/components/LdGridForm/index.js

@@ -106,16 +106,20 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         return behaviorCall(_objectSpread(_objectSpread({}, get), {}, _defineProperty({}, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno)), post, formData);
       },
       get: function get() {
-        return {
+        var _get = {
           moduleCode: moduleCode,
           datasetCode: dataSetKey,
           behaviorKey: behaviorKey
         };
+        if (!isMain) _get.relationDs = mainDataSetKey;
+        return _get;
       }
     }, _onOperate), {}, {
       post: function post(data) {
         var _submitData = data.map(function (item) {
-          return dataFormat(gridColumns, item);
+          return behaviorKey === 'add' ? _objectSpread(_objectSpread({}, dataFormat(gridColumns, item)), {}, {
+            indocno: null
+          }) : dataFormat(gridColumns, item);
         });
         if (_onOperate === null || _onOperate === void 0 ? void 0 : _onOperate.post) return _onOperate.post(_submitData); // 以预设为主
         return _defineProperty({}, dataSetKey, _defineProperty({}, "".concat(behaviorKey, "List"), _submitData));

package/es/helper/FromItems.js

@@ -21,19 +21,23 @@ var _excluded = ["onBlur"],
   _excluded17 = ["onChange"],
   _excluded18 = ["handleValueChange", "config"],
   _excluded19 = ["handleValueChange"],
-  _excluded20 = ["handleValueChange", "config"];
+  _excluded20 = ["handleValueChange", "config"],
+  _excluded21 = ["onBlur"],
+  _excluded22 = ["handleValueChange", "config"],
+  _excluded23 = ["onBlur"],
+  _excluded24 = ["handleValueChange", "config"];
 import React, { useState, useEffect } from 'react';
 import { getDvaApp } from 'umi';
 import { BasicFormItem } from 'luck-design';
-import { TreeSelector, RegionFormItem } from '@luck-design-biz/base';
+import { TreeSelector, RegionFormItem, UploadFormItemV3 } from '@luck-design-biz/base';
 import { DatadicDropDown, UserSelectDropDown as UserItem } from '@luck-design-biz/base/sys/dropdown';
 export var getNumberItem = function getNumberItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref.handleValueChange,
-    _ref$config = _ref.config;
-  _ref$config = _ref$config === void 0 ? {} : _ref$config;
-  var _onBlur = _ref$config.onBlur,
-    _config = _objectWithoutProperties(_ref$config, _excluded),
+    _ref$config = _ref.config,
+    _ref$config2 = _ref$config === void 0 ? {} : _ref$config,
+    _onBlur = _ref$config2.onBlur,
+    _config = _objectWithoutProperties(_ref$config2, _excluded),
     props = _objectWithoutProperties(_ref, _excluded2);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
     type: "input",
@@ -48,10 +52,10 @@ export var getNumberItem = function getNumberItem() {
 };
 export var getStringItem = function getStringItem(_ref2) {
   var handleValueChange = _ref2.handleValueChange,
-    _ref2$config = _ref2.config;
-  _ref2$config = _ref2$config === void 0 ? {} : _ref2$config;
-  var _onBlur2 = _ref2$config.onBlur,
-    _config = _objectWithoutProperties(_ref2$config, _excluded3),
+    _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);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
     config: _objectSpread(_objectSpread({}, _config), {}, {
@@ -66,10 +70,10 @@ 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$config = _ref3$config === void 0 ? {} : _ref3$config;
-  var _onBlur3 = _ref3$config.onBlur,
-    _config = _objectWithoutProperties(_ref3$config, _excluded5),
+    _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);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
     type: "input",
@@ -85,10 +89,10 @@ 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$config = _ref4$config === void 0 ? {} : _ref4$config;
-  var _onChange = _ref4$config.onChange,
-    _config = _objectWithoutProperties(_ref4$config, _excluded7),
+    _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);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
     type: "datePicker",
@@ -114,10 +118,10 @@ export var getUserItem = function getUserItem(_ref5) {
 };
 export var getSelectItem = function getSelectItem(_ref6) {
   var handleValueChange = _ref6.handleValueChange,
-    _ref6$config = _ref6.config;
-  _ref6$config = _ref6$config === void 0 ? {} : _ref6$config;
-  var _onChange3 = _ref6$config.onChange,
-    _config = _objectWithoutProperties(_ref6$config, _excluded10),
+    _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);
   var config = _objectSpread(_objectSpread({}, _config), {}, {
     onChange: function onChange(value, e) {
@@ -180,10 +184,10 @@ export var getRadioItem = function getRadioItem() {
 };
 export var getGroupItem = function getGroupItem(_ref8) {
   var handleValueChange = _ref8.handleValueChange,
-    _ref8$config = _ref8.config;
-  _ref8$config = _ref8$config === void 0 ? {} : _ref8$config;
-  var _onChange4 = _ref8$config.onChange,
-    _config = _objectWithoutProperties(_ref8$config, _excluded13),
+    _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);
   return /*#__PURE__*/React.createElement(TreeSelector, _extends({}, props, {
     api: "/api/base/group/sysGroupTree/noAuthReadJurisTree?sclassKey=".concat(props.sclassKey),
@@ -197,10 +201,10 @@ export var getGroupItem = function getGroupItem(_ref8) {
 };
 export var getColorItem = function getColorItem(_ref9) {
   var handleValueChange = _ref9.handleValueChange,
-    _ref9$config = _ref9.config;
-  _ref9$config = _ref9$config === void 0 ? {} : _ref9$config;
-  var _onClose = _ref9$config.onClose,
-    _config = _objectWithoutProperties(_ref9$config, _excluded15),
+    _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);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({
     formOptions: {
@@ -218,10 +222,10 @@ export var getColorItem = function getColorItem(_ref9) {
 };
 export var getSwitchItem = function getSwitchItem(_ref10) {
   var handleValueChange = _ref10.handleValueChange,
-    _ref10$config = _ref10.config;
-  _ref10$config = _ref10$config === void 0 ? {} : _ref10$config;
-  var _onChange5 = _ref10$config.onChange,
-    _config = _objectWithoutProperties(_ref10$config, _excluded17),
+    _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);
   return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
     type: "switch",
@@ -264,4 +268,46 @@ 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);
+  return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    type: "editor",
+    config: _objectSpread(_objectSpread({
+      language: 'zh-cn',
+      headers: {
+        Authorization: "Bearer "
+      }
+    }, _config), {}, {
+      onBlur: function onBlur(value) {
+        handleValueChange && handleValueChange(value);
+        _onBlur4 && _onBlur4(value);
+      }
+    })
+  }));
+};
+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);
+  return /*#__PURE__*/React.createElement(UploadFormItemV3, _extends({}, props, {
+    config: _objectSpread(_objectSpread({
+      listType: 'picture-card'
+    }, _config), {}, {
+      onBlur: function onBlur(value) {
+        handleValueChange && handleValueChange(value);
+        _onBlur5 && _onBlur5(value);
+      }
+    })
+  }));
 };

package/es/helper/action.js

@@ -21,9 +21,7 @@ export var doAction = function doAction(action) {
     showConfirm = _ref$showConfirm === void 0 ? true : _ref$showConfirm,
     callback = _ref.callback,
     _ref$showPopWhenSucce = _ref.showPopWhenSuccess,
-    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce,
-    form_id = _ref.form_id,
-    effcode = _ref.effcode;
+    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce;
   var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
     _ref2$actions = _ref2.actions,
     actions = _ref2$actions === void 0 ? {} : _ref2$actions,
@@ -45,16 +43,20 @@ export var doAction = function doAction(action) {
         onOk: onOk
       });
     };
+    var get = data.get,
+      post = data.post;
+    if (!get && !post) {
+      get = {};
+      post = data;
+    }
     var handleAction = function handleAction() {
-      behaviorCall({
+      behaviorCall(_objectSpread({
         behaviorKey: action,
-        moduleCode: moduleCode,
-        form_id: form_id,
-        effcode: effcode
-      }, data).then(function (res) {
+        moduleCode: moduleCode
+      }, get), post).then(function (res) {
         var code = res.code,
-          data = res.data;
-        callback && callback(code === 1, data, res);
+          _data = res.data;
+        callback && callback(code === 1, _data, res);
         if (code === 1 && showPopWhenSuccess) {
           showPop(formatMessage({
             id: 'app.base.tip.operate.success'
@@ -109,7 +111,9 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
           if (isArray(values[value.id])) {
             _submitData = {
               addList: values[value.id].map(function (item) {
-                return dataFormat(gridColumns, item);
+                return _objectSpread(_objectSpread({}, dataFormat(gridColumns, item)), {}, {
+                  indocno: null
+                });
               })
             };
           } else {
@@ -127,11 +131,15 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
   }, {});
   beforeSubmit(data, values).then(function (backData) {
     if (backData) {
-      doAction(action, backData, {
+      doAction(action, {
+        get: {
+          form_id: form_id,
+          effcode: effcode
+        },
+        post: backData
+      }, {
         showConfirm: false,
-        callback: callback,
-        form_id: form_id,
-        effcode: effcode
+        callback: callback
       });
     }
   });

package/es/helper/form.js

@@ -19,7 +19,8 @@ export var defaultComName = {
   code: 'string',
   color: 'color',
   zone: 'region',
-  year: 'year'
+  year: 'year',
+  rte: 'editor'
 };
 
 /**

package/es/services.js

@@ -9,14 +9,12 @@ export function readModlue(_x) {
 function _readModlue() {
   _readModlue = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(get) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            return _context.abrupt("return", request("".concat(api.LUCKDA_HOST, "/ui/builder/noAuthFetchModule?").concat(stringify(get))));
-          case 1:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", request("".concat(api.LUCKDA_HOST, "/ui/builder/noAuthFetchModule?").concat(stringify(get))));
+        case 1:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));
@@ -28,17 +26,15 @@ export function readBehaviorCall(_x2, _x3) {
 function _readBehaviorCall() {
   _readBehaviorCall = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(get, post) {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            return _context2.abrupt("return", request("".concat(api.LUCKDA_HOST, "/to/behavior/call?").concat(stringify(get)), {
-              method: 'POST',
-              body: post
-            }));
-          case 1:
-          case "end":
-            return _context2.stop();
-        }
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", request("".concat(api.LUCKDA_HOST, "/to/behavior/call?").concat(stringify(get)), {
+            method: 'POST',
+            body: post
+          }));
+        case 1:
+        case "end":
+          return _context2.stop();
       }
     }, _callee2);
   }));

package/es/utils/action.js

@@ -13,19 +13,17 @@ function _behaviorCall() {
       datasetCode,
       _args = arguments;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            get = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            post = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
-            datasetCode = get.datasetCode;
-            return _context.abrupt("return", readBehaviorCall(_objectSpread(_objectSpread({}, get), {}, {
-              datasetCode: datasetCode || Object.keys(post).join(',')
-            }), post));
-          case 4:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          get = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+          post = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+          datasetCode = get.datasetCode;
+          return _context.abrupt("return", readBehaviorCall(_objectSpread(_objectSpread({}, get), {}, {
+            datasetCode: datasetCode || Object.keys(post).join(',')
+          }), post));
+        case 4:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));

package/es/utils/form.js

@@ -63,6 +63,7 @@ export var formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var data = transform(propsList, function (result, n) {
+    var _values$name, _values$name2;
     var _ref2 = n || {},
       comName = _ref2.comName,
       property = _ref2.property,
@@ -99,6 +100,9 @@ export var formItemDataFormat = function formItemDataFormat() {
       case 'radio':
         result[name] = values[name];
         break;
+      case 'upload':
+        result[name] = ((_values$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.spath) || ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.url);
+        break;
       default:
         if (!isNil(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
     }

package/es/utils/grid.js

@@ -2,7 +2,6 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["comName", "property"],
   _excluded2 = ["name"],
   _excluded3 = ["filter", "filterParams"];
-var _getDvaApp;
 import React from "react";
 import { getDvaApp } from 'umi';
 import { merge, isNil, isArray, includes } from 'lodash';
@@ -10,8 +9,9 @@ import { Switch, Tag } from 'antd';
 import moment from 'moment';
 import { defaultComName, translator, formatCustomProps } from '../helper/form';
 import { formatMessage } from '@luck-design-biz/base/utils';
-var _getDvaApp$_store = (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store,
-  dispatch = _getDvaApp$_store.dispatch;
+
+// const { dispatch } = getDvaApp()?._store;
+
 export function getColumnRender(name, type) {
   var props = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var render = function render(text, record) {
@@ -130,12 +130,14 @@ export var getGridColumn = function getGridColumn() {
         data.filter = 'select';
         data.filterParams = {
           options: function options() {
-            return dispatch({
+            var _getDvaApp, _getDvaApp$_store;
+            return (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : (_getDvaApp$_store = _getDvaApp._store) === null || _getDvaApp$_store === void 0 ? void 0 : _getDvaApp$_store.dispatch({
               type: 'global/getUser'
             });
           },
           searchData: function searchData(str) {
-            return dispatch({
+            var _getDvaApp2, _getDvaApp2$_store;
+            return (_getDvaApp2 = getDvaApp()) === null || _getDvaApp2 === void 0 ? void 0 : (_getDvaApp2$_store = _getDvaApp2._store) === null || _getDvaApp2$_store === void 0 ? void 0 : _getDvaApp2$_store.dispatch({
               type: "global/getUser",
               payload: str
             });
@@ -152,7 +154,8 @@ export var getGridColumn = function getGridColumn() {
           var _props$config3;
           data.filterParams = {
             options: function options() {
-              return dispatch({
+              var _getDvaApp3, _getDvaApp3$_store;
+              return (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 ? void 0 : (_getDvaApp3$_store = _getDvaApp3._store) === null || _getDvaApp3$_store === void 0 ? void 0 : _getDvaApp3$_store.dispatch({
                 type: 'global/getDatadic',
                 payload: {
                   snamealias: _props.alias
@@ -168,7 +171,8 @@ export var getGridColumn = function getGridColumn() {
         data.filter = 'treeSelect';
         data.filterParams = {
           options: function options() {
-            return dispatch({
+            var _getDvaApp4, _getDvaApp4$_store;
+            return (_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 ? void 0 : (_getDvaApp4$_store = _getDvaApp4._store) === null || _getDvaApp4$_store === void 0 ? void 0 : _getDvaApp4$_store.dispatch({
               type: 'global/readGroup',
               payload: {
                 sclassKey: _props.sclassKey
@@ -176,7 +180,8 @@ export var getGridColumn = function getGridColumn() {
             });
           },
           searchData: function searchData(str) {
-            return dispatch({
+            var _getDvaApp5, _getDvaApp5$_store;
+            return (_getDvaApp5 = getDvaApp()) === null || _getDvaApp5 === void 0 ? void 0 : (_getDvaApp5$_store = _getDvaApp5._store) === null || _getDvaApp5$_store === void 0 ? void 0 : _getDvaApp5$_store.dispatch({
               type: 'global/readGroup',
               payload: {
                 sclassKey: _props.sclassKey,

package/lib/components/LdAutoForm/index.js

@@ -17,7 +17,7 @@ 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"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "formRef", "formMode"];
 var defaultOpe = ['read', 'add', 'update', 'delete'];
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
@@ -49,6 +49,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     } : _ref$defaultDataSourc,
     _ref$ticketData = _ref.ticketData,
     ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
+    formRef = _ref.formRef,
+    formMode = _ref.formMode,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
@@ -63,7 +65,12 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           return field.name === col.field;
         }) || {};
         _defaultValues = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, _defaultValues), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, col.field, col['optDefaultValue']), (0, _defineProperty2.default)(_objectSpread2, "".concat(col.field, "_virtual"), col['optDefaultValueCvt']), _objectSpread2));
-        result.push((0, _utils.getFormItem)(col, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, customFiled), {}, {
+        result.push((0, _utils.getFormItem)(col, (0, _objectSpread3.default)((0, _objectSpread3.default)({
+          formId: ldId,
+          moduleCode: moduleCode,
+          formRef: formRef,
+          formMode: formMode
+        }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.field, value)));
           }
@@ -93,11 +100,13 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
         return (0, _utils.behaviorCall)(get, post, formData);
       },
       get: function get() {
-        return {
+        var _get = {
           moduleCode: moduleCode,
           datasetCode: dataSetKey,
           behaviorKey: behaviorKey
         };
+        if (!isMain) _get.relationDs = mainDataSetKey;
+        return _get;
       }
     }, _onOperate), {}, {
       post: function post(_ref3) {

package/lib/components/LdFormList/index.js

@@ -88,8 +88,8 @@ var LdFormList = function LdFormList(_ref) {
     var _ref5 = formListRef.current || {},
       formRefs = _ref5.formRefs;
     var data = formRefs && Object.keys(formRefs).map(function (key) {
-      var _formRefs$key$current;
-      var getValue = formRefs[key].getData || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
+      var _formRefs$key, _formRefs$key$formRef, _formRefs$key$current;
+      var getValue = (((_formRefs$key = formRefs[key]) === null || _formRefs$key === void 0 ? void 0 : (_formRefs$key$formRef = _formRefs$key.formRef) === null || _formRefs$key$formRef === void 0 ? void 0 : _formRefs$key$formRef.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());
     });
     onValueChange(change, data);
@@ -129,25 +129,30 @@ var LdFormList = function LdFormList(_ref) {
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          if (!formWindow && formMode === 'add' && window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN) {
-            var _history$location = _umi.history.location,
-              pathname = _history$location.pathname,
-              query = _history$location.query;
-            var _pathname = pathname.replace(/\/0(?=[?]|[\/]$|$)/g, "/".concat(indocno, "?"));
-            window.openUrl("layer:".concat(_pathname).concat((0, _querystring.stringify)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, query), {}, {
-              title: window.__INJECTED_APP_NAME_BY_QIANKUN__
-            }))));
-          } else {
-            formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
-              indocno: indocno
-            }), function () {
-              return formListRef.current.setFormMode('info');
-            });
-          }
+          // if (
+          //   !formWindow &&
+          //   formMode === 'add' &&
+          //   window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN
+          // ) {
+          //   const { pathname, query } = history.location;
+          //   window.openUrl(
+          //     `layer:${pathname}?${stringify({
+          //       ...query,
+          //       title: window.__INJECTED_APP_NAME_BY_QIANKUN__,
+          //     })}`,
+          //   );
+          // } else {
+          formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
+            indocno: indocno
+          }), function () {
+            return formListRef.current.setFormMode('info');
+          });
+          // }
         }
       }
     });
   };
+
   var formConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({
     formState: formState,
     formMode: formMode,
@@ -196,19 +201,21 @@ var LdFormList = function LdFormList(_ref) {
     var _props$type = _props.type,
       type = _props$type === void 0 ? 'auto' : _props$type;
     var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
-    if (header === 'collapse') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
+    if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
       title: title || ldId,
       extra: renderExtra(ldId, extraConfig),
       id: ldId,
       key: ldId,
-      mode: ldId !== mainFormLdId && 'tab'
+      mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
     }, renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
       ldId: ldId,
       mainFormLdId: mainFormLdId,
       mainDataSetKey: mainDataSetKey,
       readOnly: readOnly || _readOnly,
       onValueChange: handleValueChange,
-      ticketData: props.ticketData
+      ticketData: props.ticketData,
+      formRef: formListRef,
+      formMode: formMode
     })));
     return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
       key: ldId
@@ -225,7 +232,9 @@ var LdFormList = function LdFormList(_ref) {
       mainDataSetKey: mainDataSetKey,
       readOnly: readOnly || _readOnly,
       onValueChange: handleValueChange,
-      ticketData: props.ticketData
+      ticketData: props.ticketData,
+      formRef: formListRef,
+      formMode: formMode
     })));
   }), _utils.ChildrenUtil.deepMap(renderFormExtra(formConfig), function (child) {
     var _child$type;

package/lib/components/LdGridForm/index.js

@@ -114,16 +114,20 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
         return (0, _utils.behaviorCall)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, get), {}, (0, _defineProperty2.default)({}, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno)), post, formData);
       },
       get: function get() {
-        return {
+        var _get = {
           moduleCode: moduleCode,
           datasetCode: dataSetKey,
           behaviorKey: behaviorKey
         };
+        if (!isMain) _get.relationDs = mainDataSetKey;
+        return _get;
       }
     }, _onOperate), {}, {
       post: function post(data) {
         var _submitData = data.map(function (item) {
-          return (0, _utils.dataFormat)(gridColumns, item);
+          return behaviorKey === 'add' ? (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils.dataFormat)(gridColumns, item)), {}, {
+            indocno: null
+          }) : (0, _utils.dataFormat)(gridColumns, item);
         });
         if (_onOperate === null || _onOperate === void 0 ? void 0 : _onOperate.post) return _onOperate.post(_submitData); // 以预设为主
         return (0, _defineProperty2.default)({}, dataSetKey, (0, _defineProperty2.default)({}, "".concat(behaviorKey, "List"), _submitData));

package/lib/helper/FromItems.js

@@ -5,7 +5,7 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getYearItem = exports.getUserItem = exports.getTextareaItem = exports.getSwitchItem = exports.getStringItem = exports.getSelectItem = exports.getRegionItem = exports.getRadioItem = exports.getNumberItem = exports.getGroupItem = exports.getDateItem = exports.getColorItem = void 0;
+exports.getYearItem = exports.getUserItem = exports.getUploadItem = exports.getTextareaItem = exports.getSwitchItem = exports.getStringItem = exports.getSelectItem = exports.getRegionItem = exports.getRadioItem = exports.getNumberItem = exports.getGroupItem = exports.getEditorItem = exports.getDateItem = exports.getColorItem = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -34,14 +34,18 @@ var _excluded = ["onBlur"],
   _excluded17 = ["onChange"],
   _excluded18 = ["handleValueChange", "config"],
   _excluded19 = ["handleValueChange"],
-  _excluded20 = ["handleValueChange", "config"];
+  _excluded20 = ["handleValueChange", "config"],
+  _excluded21 = ["onBlur"],
+  _excluded22 = ["handleValueChange", "config"],
+  _excluded23 = ["onBlur"],
+  _excluded24 = ["handleValueChange", "config"];
 var getNumberItem = function getNumberItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref.handleValueChange,
-    _ref$config = _ref.config;
-  _ref$config = _ref$config === void 0 ? {} : _ref$config;
-  var _onBlur = _ref$config.onBlur,
-    _config = (0, _objectWithoutProperties2.default)(_ref$config, _excluded),
+    _ref$config = _ref.config,
+    _ref$config2 = _ref$config === void 0 ? {} : _ref$config,
+    _onBlur = _ref$config2.onBlur,
+    _config = (0, _objectWithoutProperties2.default)(_ref$config2, _excluded),
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded2);
   return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({}, props, {
     type: "input",
@@ -57,10 +61,10 @@ var getNumberItem = function getNumberItem() {
 exports.getNumberItem = getNumberItem;
 var getStringItem = function getStringItem(_ref2) {
   var handleValueChange = _ref2.handleValueChange,
-    _ref2$config = _ref2.config;
-  _ref2$config = _ref2$config === void 0 ? {} : _ref2$config;
-  var _onBlur2 = _ref2$config.onBlur,
-    _config = (0, _objectWithoutProperties2.default)(_ref2$config, _excluded3),
+    _ref2$config = _ref2.config,
+    _ref2$config2 = _ref2$config === void 0 ? {} : _ref2$config,
+    _onBlur2 = _ref2$config2.onBlur,
+    _config = (0, _objectWithoutProperties2.default)(_ref2$config2, _excluded3),
     props = (0, _objectWithoutProperties2.default)(_ref2, _excluded4);
   return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({}, props, {
     config: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config), {}, {
@@ -76,10 +80,10 @@ exports.getStringItem = getStringItem;
 var getTextareaItem = function getTextareaItem() {
   var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref3.handleValueChange,
-    _ref3$config = _ref3.config;
-  _ref3$config = _ref3$config === void 0 ? {} : _ref3$config;
-  var _onBlur3 = _ref3$config.onBlur,
-    _config = (0, _objectWithoutProperties2.default)(_ref3$config, _excluded5),
+    _ref3$config = _ref3.config,
+    _ref3$config2 = _ref3$config === void 0 ? {} : _ref3$config,
+    _onBlur3 = _ref3$config2.onBlur,
+    _config = (0, _objectWithoutProperties2.default)(_ref3$config2, _excluded5),
     props = (0, _objectWithoutProperties2.default)(_ref3, _excluded6);
   return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({}, props, {
     type: "input",
@@ -96,10 +100,10 @@ exports.getTextareaItem = getTextareaItem;
 var getDateItem = function getDateItem() {
   var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref4.handleValueChange,
-    _ref4$config = _ref4.config;
-  _ref4$config = _ref4$config === void 0 ? {} : _ref4$config;
-  var _onChange = _ref4$config.onChange,
-    _config = (0, _objectWithoutProperties2.default)(_ref4$config, _excluded7),
+    _ref4$config = _ref4.config,
+    _ref4$config2 = _ref4$config === void 0 ? {} : _ref4$config,
+    _onChange = _ref4$config2.onChange,
+    _config = (0, _objectWithoutProperties2.default)(_ref4$config2, _excluded7),
     props = (0, _objectWithoutProperties2.default)(_ref4, _excluded8);
   return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({}, props, {
     type: "datePicker",
@@ -127,10 +131,10 @@ var getUserItem = function getUserItem(_ref5) {
 exports.getUserItem = getUserItem;
 var getSelectItem = function getSelectItem(_ref6) {
   var handleValueChange = _ref6.handleValueChange,
-    _ref6$config = _ref6.config;
-  _ref6$config = _ref6$config === void 0 ? {} : _ref6$config;
-  var _onChange3 = _ref6$config.onChange,
-    _config = (0, _objectWithoutProperties2.default)(_ref6$config, _excluded10),
+    _ref6$config = _ref6.config,
+    _ref6$config2 = _ref6$config === void 0 ? {} : _ref6$config,
+    _onChange3 = _ref6$config2.onChange,
+    _config = (0, _objectWithoutProperties2.default)(_ref6$config2, _excluded10),
     props = (0, _objectWithoutProperties2.default)(_ref6, _excluded11);
   var config = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _config), {}, {
     onChange: function onChange(value, e) {
@@ -195,10 +199,10 @@ var getRadioItem = function getRadioItem() {
 exports.getRadioItem = getRadioItem;
 var getGroupItem = function getGroupItem(_ref8) {
   var handleValueChange = _ref8.handleValueChange,
-    _ref8$config = _ref8.config;
-  _ref8$config = _ref8$config === void 0 ? {} : _ref8$config;
-  var _onChange4 = _ref8$config.onChange,
-    _config = (0, _objectWithoutProperties2.default)(_ref8$config, _excluded13),
+    _ref8$config = _ref8.config,
+    _ref8$config2 = _ref8$config === void 0 ? {} : _ref8$config,
+    _onChange4 = _ref8$config2.onChange,
+    _config = (0, _objectWithoutProperties2.default)(_ref8$config2, _excluded13),
     props = (0, _objectWithoutProperties2.default)(_ref8, _excluded14);
   return /*#__PURE__*/_react.default.createElement(_base.TreeSelector, (0, _extends2.default)({}, props, {
     api: "/api/base/group/sysGroupTree/noAuthReadJurisTree?sclassKey=".concat(props.sclassKey),
@@ -213,10 +217,10 @@ var getGroupItem = function getGroupItem(_ref8) {
 exports.getGroupItem = getGroupItem;
 var getColorItem = function getColorItem(_ref9) {
   var handleValueChange = _ref9.handleValueChange,
-    _ref9$config = _ref9.config;
-  _ref9$config = _ref9$config === void 0 ? {} : _ref9$config;
-  var _onClose = _ref9$config.onClose,
-    _config = (0, _objectWithoutProperties2.default)(_ref9$config, _excluded15),
+    _ref9$config = _ref9.config,
+    _ref9$config2 = _ref9$config === void 0 ? {} : _ref9$config,
+    _onClose = _ref9$config2.onClose,
+    _config = (0, _objectWithoutProperties2.default)(_ref9$config2, _excluded15),
     props = (0, _objectWithoutProperties2.default)(_ref9, _excluded16);
   return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({
     formOptions: {
@@ -235,10 +239,10 @@ var getColorItem = function getColorItem(_ref9) {
 exports.getColorItem = getColorItem;
 var getSwitchItem = function getSwitchItem(_ref10) {
   var handleValueChange = _ref10.handleValueChange,
-    _ref10$config = _ref10.config;
-  _ref10$config = _ref10$config === void 0 ? {} : _ref10$config;
-  var _onChange5 = _ref10$config.onChange,
-    _config = (0, _objectWithoutProperties2.default)(_ref10$config, _excluded17),
+    _ref10$config = _ref10.config,
+    _ref10$config2 = _ref10$config === void 0 ? {} : _ref10$config,
+    _onChange5 = _ref10$config2.onChange,
+    _config = (0, _objectWithoutProperties2.default)(_ref10$config2, _excluded17),
     props = (0, _objectWithoutProperties2.default)(_ref10, _excluded18);
   return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({}, props, {
     type: "switch",
@@ -284,4 +288,48 @@ var getYearItem = function getYearItem() {
     })
   }));
 };
-exports.getYearItem = getYearItem;
+exports.getYearItem = getYearItem;
+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 = (0, _objectWithoutProperties2.default)(_ref13$config2, _excluded21),
+    props = (0, _objectWithoutProperties2.default)(_ref13, _excluded22);
+  return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({}, props, {
+    type: "editor",
+    config: (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      language: 'zh-cn',
+      headers: {
+        Authorization: "Bearer "
+      }
+    }, _config), {}, {
+      onBlur: function onBlur(value) {
+        handleValueChange && handleValueChange(value);
+        _onBlur4 && _onBlur4(value);
+      }
+    })
+  }));
+};
+exports.getEditorItem = getEditorItem;
+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 = (0, _objectWithoutProperties2.default)(_ref14$config2, _excluded23),
+    props = (0, _objectWithoutProperties2.default)(_ref14, _excluded24);
+  return /*#__PURE__*/_react.default.createElement(_base.UploadFormItemV3, (0, _extends2.default)({}, props, {
+    config: (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      listType: 'picture-card'
+    }, _config), {}, {
+      onBlur: function onBlur(value) {
+        handleValueChange && handleValueChange(value);
+        _onBlur5 && _onBlur5(value);
+      }
+    })
+  }));
+};
+exports.getUploadItem = getUploadItem;

package/lib/helper/action.js

@@ -28,9 +28,7 @@ var doAction = function doAction(action) {
     showConfirm = _ref$showConfirm === void 0 ? true : _ref$showConfirm,
     callback = _ref.callback,
     _ref$showPopWhenSucce = _ref.showPopWhenSuccess,
-    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce,
-    form_id = _ref.form_id,
-    effcode = _ref.effcode;
+    showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce;
   var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
     _ref2$actions = _ref2.actions,
     actions = _ref2$actions === void 0 ? {} : _ref2$actions,
@@ -52,16 +50,20 @@ var doAction = function doAction(action) {
         onOk: onOk
       });
     };
+    var get = data.get,
+      post = data.post;
+    if (!get && !post) {
+      get = {};
+      post = data;
+    }
     var handleAction = function handleAction() {
-      (0, _utils2.behaviorCall)({
+      (0, _utils2.behaviorCall)((0, _objectSpread2.default)({
         behaviorKey: action,
-        moduleCode: moduleCode,
-        form_id: form_id,
-        effcode: effcode
-      }, data).then(function (res) {
+        moduleCode: moduleCode
+      }, get), post).then(function (res) {
         var code = res.code,
-          data = res.data;
-        callback && callback(code === 1, data, res);
+          _data = res.data;
+        callback && callback(code === 1, _data, res);
         if (code === 1 && showPopWhenSuccess) {
           (0, _utils.showPop)((0, _utils.formatMessage)({
             id: 'app.base.tip.operate.success'
@@ -117,7 +119,9 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
           if ((0, _lodash.isArray)(values[value.id])) {
             _submitData = {
               addList: values[value.id].map(function (item) {
-                return (0, _utils2.dataFormat)(gridColumns, item);
+                return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _utils2.dataFormat)(gridColumns, item)), {}, {
+                  indocno: null
+                });
               })
             };
           } else {
@@ -135,11 +139,15 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
   }, {});
   beforeSubmit(data, values).then(function (backData) {
     if (backData) {
-      doAction(action, backData, {
+      doAction(action, {
+        get: {
+          form_id: form_id,
+          effcode: effcode
+        },
+        post: backData
+      }, {
         showConfirm: false,
-        callback: callback,
-        form_id: form_id,
-        effcode: effcode
+        callback: callback
       });
     }
   });

package/lib/helper/form.js

@@ -28,7 +28,8 @@ var defaultComName = {
   code: 'string',
   color: 'color',
   zone: 'region',
-  year: 'year'
+  year: 'year',
+  rte: 'editor'
 };
 
 /**

package/lib/services.js

@@ -17,14 +17,12 @@ function readModlue(_x) {
 function _readModlue() {
   _readModlue = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(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.LUCKDA_HOST, "/ui/builder/noAuthFetchModule?").concat((0, _querystring.stringify)(get))));
-          case 1:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.LUCKDA_HOST, "/ui/builder/noAuthFetchModule?").concat((0, _querystring.stringify)(get))));
+        case 1:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));
@@ -36,17 +34,15 @@ function readBehaviorCall(_x2, _x3) {
 function _readBehaviorCall() {
   _readBehaviorCall = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(get, post) {
     return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            return _context2.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.LUCKDA_HOST, "/to/behavior/call?").concat((0, _querystring.stringify)(get)), {
-              method: 'POST',
-              body: post
-            }));
-          case 1:
-          case "end":
-            return _context2.stop();
-        }
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.LUCKDA_HOST, "/to/behavior/call?").concat((0, _querystring.stringify)(get)), {
+            method: 'POST',
+            body: post
+          }));
+        case 1:
+        case "end":
+          return _context2.stop();
       }
     }, _callee2);
   }));

package/lib/utils/action.js

@@ -20,19 +20,17 @@ function _behaviorCall() {
       datasetCode,
       _args = arguments;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            get = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            post = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
-            datasetCode = get.datasetCode;
-            return _context.abrupt("return", (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, get), {}, {
-              datasetCode: datasetCode || Object.keys(post).join(',')
-            }), post));
-          case 4:
-          case "end":
-            return _context.stop();
-        }
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          get = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+          post = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+          datasetCode = get.datasetCode;
+          return _context.abrupt("return", (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, get), {}, {
+            datasetCode: datasetCode || Object.keys(post).join(',')
+          }), post));
+        case 4:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
   }));

package/lib/utils/form.js

@@ -71,6 +71,7 @@ var formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var data = (0, _lodash.transform)(propsList, function (result, n) {
+    var _values$name, _values$name2;
     var _ref2 = n || {},
       comName = _ref2.comName,
       property = _ref2.property,
@@ -107,6 +108,9 @@ var formItemDataFormat = function formItemDataFormat() {
       case 'radio':
         result[name] = values[name];
         break;
+      case 'upload':
+        result[name] = ((_values$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.spath) || ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.url);
+        break;
       default:
         if (!(0, _lodash.isNil)(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
     }

package/lib/utils/grid.js

@@ -17,9 +17,8 @@ var _utils = require("@luck-design-biz/base/utils");
 var _excluded = ["comName", "property"],
   _excluded2 = ["name"],
   _excluded3 = ["filter", "filterParams"];
-var _getDvaApp;
-var _getDvaApp$_store = (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store,
-  dispatch = _getDvaApp$_store.dispatch;
+// const { dispatch } = getDvaApp()?._store;
+
 function getColumnRender(name, type) {
   var props = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var render = function render(text, record) {
@@ -138,12 +137,14 @@ var getGridColumn = function getGridColumn() {
         data.filter = 'select';
         data.filterParams = {
           options: function options() {
-            return dispatch({
+            var _getDvaApp, _getDvaApp$_store;
+            return (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : (_getDvaApp$_store = _getDvaApp._store) === null || _getDvaApp$_store === void 0 ? void 0 : _getDvaApp$_store.dispatch({
               type: 'global/getUser'
             });
           },
           searchData: function searchData(str) {
-            return dispatch({
+            var _getDvaApp2, _getDvaApp2$_store;
+            return (_getDvaApp2 = (0, _umi.getDvaApp)()) === null || _getDvaApp2 === void 0 ? void 0 : (_getDvaApp2$_store = _getDvaApp2._store) === null || _getDvaApp2$_store === void 0 ? void 0 : _getDvaApp2$_store.dispatch({
               type: "global/getUser",
               payload: str
             });
@@ -160,7 +161,8 @@ var getGridColumn = function getGridColumn() {
           var _props$config3;
           data.filterParams = {
             options: function options() {
-              return dispatch({
+              var _getDvaApp3, _getDvaApp3$_store;
+              return (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 ? void 0 : (_getDvaApp3$_store = _getDvaApp3._store) === null || _getDvaApp3$_store === void 0 ? void 0 : _getDvaApp3$_store.dispatch({
                 type: 'global/getDatadic',
                 payload: {
                   snamealias: _props.alias
@@ -176,7 +178,8 @@ var getGridColumn = function getGridColumn() {
         data.filter = 'treeSelect';
         data.filterParams = {
           options: function options() {
-            return dispatch({
+            var _getDvaApp4, _getDvaApp4$_store;
+            return (_getDvaApp4 = (0, _umi.getDvaApp)()) === null || _getDvaApp4 === void 0 ? void 0 : (_getDvaApp4$_store = _getDvaApp4._store) === null || _getDvaApp4$_store === void 0 ? void 0 : _getDvaApp4$_store.dispatch({
               type: 'global/readGroup',
               payload: {
                 sclassKey: _props.sclassKey
@@ -184,7 +187,8 @@ var getGridColumn = function getGridColumn() {
             });
           },
           searchData: function searchData(str) {
-            return dispatch({
+            var _getDvaApp5, _getDvaApp5$_store;
+            return (_getDvaApp5 = (0, _umi.getDvaApp)()) === null || _getDvaApp5 === void 0 ? void 0 : (_getDvaApp5$_store = _getDvaApp5._store) === null || _getDvaApp5$_store === void 0 ? void 0 : _getDvaApp5$_store.dispatch({
               type: 'global/readGroup',
               payload: {
                 sclassKey: _props.sclassKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.9",
+  "version": "0.0.11-1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -40,33 +40,14 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.9",
-    "@province-city-china/level": "^8.5.4",
     "ahooks": "^3.7.0",
     "antd": "^3.26.6",
-    "bpmn-js": "^7.3.0",
-    "bpmn-js-properties-panel": "^0.35.0",
     "classnames": "^2.3.1",
-    "d3-fetch": "^1.2.0",
-    "d3-selection": "^1.4.1",
-    "file-saver": "^2.0.2",
-    "jointjs": "^3.5.4",
-    "js-file-download": "^0.4.4",
     "lodash": "^4.17.11",
     "moment": "^2.24.0",
-    "nprogress": "^0.2.0",
-    "path-to-regexp": "^2.4.0",
-    "postcss-hash-classname": "^0.4.0",
-    "postcss-prefixer": "^2.1.3",
-    "promise-sequential": "^1.1.1",
     "prop-types": "^15.8.1",
     "querystring": "^0.2.0",
-    "raphael": "^2.3.0",
-    "rc-form": "^2.4.10",
-    "react": "^16.12.0",
-    "react-copy-to-clipboard": "^5.0.1",
-    "react-country-flag": "^2.3.0",
-    "react-dom": "16.8.0",
-    "uuid": "^3.3.2"
+    "react": "^16.12.0"
   },
   "devDependencies": {
     "@umijs/test": "^3.0.5",