@luck-design-biz/luckda 0.0.15-7 → 0.0.16

package/es/components/LdFormList/index.js

@@ -1,3 +1,6 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
@@ -99,10 +102,10 @@ var LdFormList = function LdFormList(_ref) {
     onValueChange(change, data);
   });
   var renderExtra = useMemoizedFn(function (formId, extraConfig, type) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormBtn, _extends({
+    return /*#__PURE__*/React.createElement(FormBtn, _extends({
       type: type,
       formId: formId
-    }, extraConfig)));
+    }, extraConfig));
   });
 
   /**zss添加**/
@@ -112,53 +115,63 @@ var LdFormList = function LdFormList(_ref) {
       suppressDept: false
     }));
   };
-
-  //   useAsyncEffect(async () => {
-  //     if (formMode !== 'add') {
-  //       const _params = {
-  //         indocno: props.ticketData?.indocno,
-  //         moduleCode: rest.moduleCode,
-  //         datasetCode: mainDataSetKey,
-  //         mainDataSetKey: mainDataSetKey,
-  //         behaviorKey: 'readBpm',
-  //       };
-
-  //       const _params1 = {
-  //         indocno: props.ticketData?.indocno,
-  //         moduleCode: rest.moduleCode,
-  //         datasetCode: mainDataSetKey,
-  //         mainDataSetKey: mainDataSetKey,
-  //         behaviorKey: 'readBpmDeploy',
-  //       };
-  //       // 请求是否有工作流服务
-  //       const response = await readBehaviorCall(_params1);
-  //       if (response.code === 1 && response.data) {
-  //         const { code, data } = await readBehaviorCall(_params);
-
-  //         if (code == 1 && data) {
-  //           const bpmInfoObj = data.bpmInfo;
-  //           const tempObj = {
-  //             bizKey: bpmInfoObj.bizKey,
-  //             sname: bpmInfoObj.name,
-  //             modelKey: bpmInfoObj.bpmKey,
-  //             // basekey :  bpmInfoObj.buskey,
-  //             idocid: props.ticketData?.indocno,
-  //             moduleCode: rest.moduleCode,
-  //             datasetCode: mainDataSetKey,
-  //             indocno: props.ticketData?.indocno,
-  //           };
-  //           setBizData(tempObj);
-  //           setIsCustomRenderAffixRight(true);
-  //         }
-  //       }
-  //     }
-  //   }, []);
-
+  useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _props$ticketData, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!(formMode !== 'add')) {
+            _context.next = 12;
+            break;
+          }
+          _params = {
+            indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData.indocno,
+            moduleCode: rest.moduleCode,
+            datasetCode: mainDataSetKey,
+            mainDataSetKey: mainDataSetKey,
+            behaviorKey: 'readBpmDeploy'
+          }; // 请求是否有工作流服务
+          _context.next = 4;
+          return readBehaviorCall(_params);
+        case 4:
+          response = _context.sent;
+          if (!(response.code === 1 && response.data)) {
+            _context.next = 12;
+            break;
+          }
+          _context.next = 8;
+          return readBehaviorCall(_objectSpread(_objectSpread({}, _params), {}, {
+            behaviorKey: 'readBpm'
+          }));
+        case 8:
+          _yield$readBehaviorCa = _context.sent;
+          code = _yield$readBehaviorCa.code;
+          data = _yield$readBehaviorCa.data;
+          if (code == 1 && data) {
+            bpmInfoObj = data.bpmInfo;
+            tempObj = {
+              bizKey: bpmInfoObj.bizKey,
+              sname: bpmInfoObj.name,
+              modelKey: bpmInfoObj.bpmKey,
+              idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2.indocno,
+              moduleCode: rest.moduleCode,
+              datasetCode: mainDataSetKey,
+              indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno
+            };
+            setBizData(tempObj);
+            setIsCustomRenderAffixRight(true);
+          }
+        case 12:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), []);
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
-    var _ref6 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-      formCode = _ref6.formCode,
-      formKey = _ref6.formKey,
-      formUid = _ref6.formUid;
+    var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      formCode = _ref7.formCode,
+      formKey = _ref7.formKey,
+      formUid = _ref7.formUid;
     setSubmitLoading(true);
     onBatchSubmitAction({
       values: values,
@@ -180,29 +193,14 @@ 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
-          // ) {
-          //   const { pathname, query } = history.location;
-          //   window.openUrl(
-          //     `layer:${pathname}?${stringify({
-          //       ...query,
-          //       title: window.__INJECTED_APP_NAME_BY_QIANKUN__,
-          //     })}`,
-          //   );
-          // } else {
           var mainFormData = res.detail[res.list[0]];
           formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, mainFormData), function () {
             return formListRef.current.setFormMode('info');
           });
-          // }
         }
       }
     });
   };
-
   var formConfig = _objectSpread(_objectSpread({
     formState: formState,
     formMode: formMode,
@@ -216,13 +214,10 @@ var LdFormList = function LdFormList(_ref) {
     renderExtra: renderExtra
   });
   var formList = useCreation(function () {
-    var _list = renderFormList(formConfig);
-    var extraList = renderFormExtra && isArray(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
-    var list = _list.concat(extraList);
-    return sortBy(list, function (o) {
-      var _o$props;
-      return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
-    });
+    return renderFormList(formConfig);
+  }, [formConfig]);
+  var formExtra = useCreation(function () {
+    return renderFormExtra && isArray(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
   }, [formConfig]);
   var mainDataSetKey = (_formList$find = formList.find(function (i) {
     return i.id === mainFormLdId;
@@ -250,21 +245,24 @@ var LdFormList = function LdFormList(_ref) {
     renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout
-  }), formList.map(function (formProps) {
+  }), sortBy([].concat(_toConsumableArray(formList), _toConsumableArray(formExtra)), function (o) {
+    var _o$props;
+    return o.order || ((_o$props = o.props) === null || _o$props === void 0 ? void 0 : _o$props.order);
+  }).map(function (formProps) {
     if (formProps.dataSetKey) {
-      var _ref7 = formProps || {},
-        ldId = _ref7.id,
-        _ref7$header = _ref7.header,
-        header = _ref7$header === void 0 ? 'collapse' : _ref7$header,
-        title = _ref7.title,
-        _readOnly = _ref7.readOnly,
-        _ref7$extraConfig = _ref7.extraConfig,
-        extraConfig = _ref7$extraConfig === void 0 ? {} : _ref7$extraConfig,
-        _ref7$renderTopLeft = _ref7.renderTopLeft,
-        _renderTopLeft = _ref7$renderTopLeft === void 0 ? function () {
+      var _ref8 = formProps || {},
+        ldId = _ref8.id,
+        _ref8$header = _ref8.header,
+        header = _ref8$header === void 0 ? 'collapse' : _ref8$header,
+        title = _ref8.title,
+        _readOnly = _ref8.readOnly,
+        _ref8$extraConfig = _ref8.extraConfig,
+        extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
+        _ref8$renderTopLeft = _ref8.renderTopLeft,
+        _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/React.createElement(React.Fragment, null);
-        } : _ref7$renderTopLeft,
-        _props = _objectWithoutProperties(_ref7, _excluded3);
+        } : _ref8$renderTopLeft,
+        _props = _objectWithoutProperties(_ref8, _excluded3);
       var _props$type = _props.type,
         type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
@@ -324,9 +322,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
       formMode: 'add'
     }, initData)
   });
-  return connect(function (_ref8) {
-    var modelName = _ref8[namespace],
-      loading = _ref8.loading;
+  return connect(function (_ref9) {
+    var modelName = _ref9[namespace],
+      loading = _ref9.loading;
     return {
       formData: modelName.formData,
       formOperates: modelName.formOperates,
@@ -337,11 +335,11 @@ var builder = function builder(WrappedComponent, namespace, initData) {
     };
   })(WrappedComponent);
 };
-var Index = function Index(_ref9) {
-  var namespace = _ref9.ldId,
-    initData = _ref9.initData,
-    overModel = _ref9.overModel,
-    props = _objectWithoutProperties(_ref9, _excluded4);
+var Index = function Index(_ref10) {
+  var namespace = _ref10.ldId,
+    initData = _ref10.initData,
+    overModel = _ref10.overModel,
+    props = _objectWithoutProperties(_ref10, _excluded4);
   var match = useRouteMatch();
   var Component = useCreation(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

package/es/helper/FromItems.js

@@ -29,8 +29,9 @@ var _excluded = ["onBlur"],
 import React, { useState, useEffect } from 'react';
 import { getDvaApp } from 'umi';
 import { BasicFormItem } from 'luck-design';
-import { TreeSelector, RegionFormItem, UploadFormItemV3 } from '@luck-design-biz/base';
+import { TreeSelector, RegionFormItem } from '@luck-design-biz/base';
 import { DatadicDropDown, UserSelectDropDown as UserItem } from '@luck-design-biz/base/sys/dropdown';
+import buildUploadFormItem from '../upload/FormItem';
 export var getNumberItem = function getNumberItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref.handleValueChange,
@@ -300,16 +301,14 @@ export var getUploadItem = function getUploadItem() {
     _onBlur5 = _ref14$config2.onBlur,
     _config = _objectWithoutProperties(_ref14$config2, _excluded23),
     props = _objectWithoutProperties(_ref14, _excluded24);
-  return /*#__PURE__*/React.createElement(UploadFormItemV3, _extends({}, props, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, buildUploadFormItem(_objectSpread(_objectSpread({}, props), {}, {
     config: _objectSpread(_objectSpread({
-      listType: 'picture-card',
-      accept: 'image/*'
+      listType: 'picture-card'
     }, _config), {}, {
-      num: 1,
       onBlur: function onBlur(value) {
         handleValueChange && handleValueChange(value);
         _onBlur5 && _onBlur5(value);
       }
     })
-  }));
+  })));
 };

package/es/helper/action.js

@@ -1,10 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 // 通用方法
-import React from 'react';
 import { Modal } from 'antd';
 import { showPop, formatMessage } from '@luck-design-biz/base/utils';
-import { transform, isArray } from 'lodash';
+import { transform, isArray, startsWith, keyBy } from 'lodash';
 import { dataFormat, behaviorCall } from '../utils';
 import { defaultComName } from './form';
 
@@ -110,44 +109,64 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
     effcode = _ref3.effcode,
     formUid = _ref3.formUid,
     mainDataSetKey = _ref3.mainDataSetKey;
-  var data = transform(formList, function (result, value) {
-    var _values$value$id;
-    if (values[value.id]) {
-      var _dataSetKey = value.dataSetKey;
-      switch (value.type) {
-        case 'auto':
-          result[_dataSetKey] = _objectSpread({
-            indocno: mainDataSetKey === _dataSetKey && action === 'add' && !window.appConfig.suppressUid ? formUid : formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
-          }, dataFormat(dataSets[_dataSetKey], (_values$value$id = values[value.id]) === null || _values$value$id === void 0 ? void 0 : _values$value$id.submitData));
-          break;
-        case 'grid':
-        case 'writer':
-          var gridColumns = dataSets[_dataSetKey].map(function (col) {
-            if ((col.comName || defaultComName[col.property]) === 'radio') return _objectSpread(_objectSpread({}, col), {}, {
-              comName: 'select'
-            });
-            return col;
-          });
-          var _submitData = {};
-          if (isArray(values[value.id])) {
-            _submitData = {
-              addList: values[value.id].map(function (item) {
-                return _objectSpread(_objectSpread({}, dataFormat(gridColumns, item)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, null));
-              })
-            };
-          } else {
-            _submitData = transform(values[value.id], function (_result, _value, _key) {
-              _result[_key] = _value.map(function (item) {
-                return _objectSpread(_objectSpread({}, dataFormat(gridColumns, item)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : item[window.appConfig.constraintKeys.PRIMARY]));
-              });
-            }, {});
-          }
-          result[_dataSetKey] = _submitData;
-          break;
-        default:
+  var data = transform(values, function (result, value, key) {
+    // 附件
+    if (startsWith(key, 'annex_')) {
+      if (isArray(value)) {
+        result[mainDataSetKey]['annex'] = result[mainDataSetKey]['annex'].concat(value.map(function (val) {
+          return {
+            objectName: val.fileId || val.uid,
+            marker: 'add'
+          };
+        }));
+      } else {
+        result[mainDataSetKey]['annex'] = result[mainDataSetKey]['annex'].concat(value.addList.map(function (val) {
+          return {
+            objectName: val.fileId || val.uid,
+            marker: 'add'
+          };
+        }));
+        result[mainDataSetKey]['annex'] = result[mainDataSetKey]['annex'].concat(value.deleteList.map(function (val) {
+          return {
+            objectName: val.fileId || val.uid,
+            marker: 'delete'
+          };
+        }));
       }
     }
-  }, {});
+    // 配置
+    else if (keyBy(formList, 'id')[key]) {
+      var formInfo = keyBy(formList, 'id')[key];
+      if (formInfo.type === 'auto') {
+        var _values$key;
+        result[formInfo.dataSetKey] = _objectSpread(_objectSpread({}, result[formInfo.dataSetKey] || {}), {}, {
+          indocno: mainDataSetKey === formInfo.dataSetKey && action === 'add' && !window.appConfig.suppressUid ? formUid : formData[key] && formData[key][window.appConfig.constraintKeys.PRIMARY]
+        }, dataFormat(dataSets[formInfo.dataSetKey], (_values$key = values[key]) === null || _values$key === void 0 ? void 0 : _values$key.submitData));
+      } else if (formInfo.type === 'grid' || formInfo.type === 'writer') {
+        var gridColumns = dataSets[formInfo.dataSetKey].map(function (col) {
+          if ((col.comName || defaultComName[col.property]) === 'radio') return _objectSpread(_objectSpread({}, col), {}, {
+            comName: 'select'
+          });
+          return col;
+        });
+        if (isArray(value)) {
+          result[formInfo.dataSetKey] = {
+            addList: value.map(function (val) {
+              return _objectSpread(_objectSpread({}, dataFormat(gridColumns, val)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, null));
+            })
+          };
+        } else {
+          result[formInfo.dataSetKey] = transform(value, function (_result, _value, _key) {
+            _result[_key] = _value.map(function (_val) {
+              return _objectSpread(_objectSpread({}, dataFormat(gridColumns, _val)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : item[window.appConfig.constraintKeys.PRIMARY]));
+            });
+          }, {});
+        }
+      }
+    } else result[key] = value;
+  }, _defineProperty({}, mainDataSetKey, {
+    annex: []
+  }));
   beforeSubmit(data, values).then(function (backData) {
     if (backData) {
       doAction(action, {