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

package/es/utils/grid.js

@@ -8,8 +8,10 @@ import { getDvaApp } from 'umi';
 import { merge, isNil, isArray, includes } from 'lodash';
 import { Switch, Tag } from 'antd';
 import moment from 'moment';
-import { defaultComName, translator, formatCustomProps } from '../helper/form';
+import { UploadGridCell } from '@luck-design-biz/base';
 import { formatMessage } from '@luck-design-biz/base/utils';
+import api from '@/services/ApiConfig';
+import { defaultComName, translator, formatCustomProps } from '../helper/form';
 
 // const { dispatch } = getDvaApp()?._store;
 
@@ -72,8 +74,17 @@ export function getColumnRender(name, type) {
       break;
     case 'upload':
       render = function render(text, record) {
-        var _text$;
-        return text && ((_text$ = text[0]) === null || _text$ === void 0 ? void 0 : _text$.name) || text;
+        var fileList = [];
+        if (record["".concat(name, "_virtual")]) fileList = record["".concat(name, "_virtual")].map(function (file) {
+          return {
+            uid: file.fileName,
+            name: file.origFileName,
+            previewUrl: "".concat(api.LUCKDA_HOST).concat(file.previewUrl)
+          };
+        });
+        return /*#__PURE__*/React.createElement(UploadGridCell, {
+          fileList: fileList
+        });
       };
       break;
     default:
@@ -101,7 +112,7 @@ export var getGridColumn = function getGridColumn() {
     title: _props.label,
     render: _props.render || getColumnRender(name, comName || defaultComName[property], _props)
   });
-  if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region'], comName || defaultComName[property])) data.sortable = false;
+  if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region', 'file'], comName || defaultComName[property])) data.sortable = false;
   // data.filter = false;
   if (!isNil(filter)) {
     // 因为后端升级问题，暂时关闭过滤功能
@@ -201,6 +212,9 @@ export var getGridColumn = function getGridColumn() {
           key: name
         };
         break;
+      case 'upload':
+        data.filter = false;
+        break;
       default:
         data.filter = 'text';
     }

package/lib/components/LdFormList/index.js

@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -106,10 +109,10 @@ var LdFormList = function LdFormList(_ref) {
     onValueChange(change, data);
   });
   var renderExtra = (0, _ahooks.useMemoizedFn)(function (formId, extraConfig, type) {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FormList.FormBtn, (0, _extends2.default)({
+    return /*#__PURE__*/_react.default.createElement(_FormList.FormBtn, (0, _extends2.default)({
       type: type,
       formId: formId
-    }, extraConfig)));
+    }, extraConfig));
   });
 
   /**zss添加**/
@@ -119,53 +122,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);
-  //         }
-  //       }
-  //     }
-  //   }, []);
-
+  (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _props$ticketData, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
+    return (0, _regeneratorRuntime2.default)().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 (0, _services.readBehaviorCall)(_params);
+        case 4:
+          response = _context.sent;
+          if (!(response.code === 1 && response.data)) {
+            _context.next = 12;
+            break;
+          }
+          _context.next = 8;
+          return (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _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);
     (0, _action.onBatchSubmitAction)({
       values: values,
@@ -187,29 +200,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, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
             return formListRef.current.setFormMode('info');
           });
-          // }
         }
       }
     });
   };
-
   var formConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({
     formState: formState,
     formMode: formMode,
@@ -223,13 +221,10 @@ var LdFormList = function LdFormList(_ref) {
     renderExtra: renderExtra
   });
   var formList = (0, _ahooks.useCreation)(function () {
-    var _list = renderFormList(formConfig);
-    var extraList = renderFormExtra && (0, _lodash.isArray)(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
-    var list = _list.concat(extraList);
-    return (0, _lodash.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 = (0, _ahooks.useCreation)(function () {
+    return renderFormExtra && (0, _lodash.isArray)(renderFormExtra(formConfig)) ? renderFormExtra(formConfig) : [renderFormExtra(formConfig)];
   }, [formConfig]);
   var mainDataSetKey = (_formList$find = formList.find(function (i) {
     return i.id === mainFormLdId;
@@ -257,21 +252,24 @@ var LdFormList = function LdFormList(_ref) {
     renderRight: isCustomRenderAffixRight ? renderAffixRightCustom : renderAffixRight,
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout
-  }), formList.map(function (formProps) {
+  }), (0, _lodash.sortBy)([].concat((0, _toConsumableArray2.default)(formList), (0, _toConsumableArray2.default)(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.default.createElement(_react.default.Fragment, null);
-        } : _ref7$renderTopLeft,
-        _props = (0, _objectWithoutProperties2.default)(_ref7, _excluded3);
+        } : _ref8$renderTopLeft,
+        _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
       var _props$type = _props.type,
         type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
@@ -331,9 +329,9 @@ var builder = function builder(WrappedComponent, namespace, initData) {
       formMode: 'add'
     }, initData)
   });
-  return (0, _umi.connect)(function (_ref8) {
-    var modelName = _ref8[namespace],
-      loading = _ref8.loading;
+  return (0, _umi.connect)(function (_ref9) {
+    var modelName = _ref9[namespace],
+      loading = _ref9.loading;
     return {
       formData: modelName.formData,
       formOperates: modelName.formOperates,
@@ -344,11 +342,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 = (0, _objectWithoutProperties2.default)(_ref9, _excluded4);
+var Index = function Index(_ref10) {
+  var namespace = _ref10.ldId,
+    initData = _ref10.initData,
+    overModel = _ref10.overModel,
+    props = (0, _objectWithoutProperties2.default)(_ref10, _excluded4);
   var match = (0, _umi.useRouteMatch)();
   var Component = (0, _ahooks.useCreation)(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

package/lib/helper/FromItems.js

@@ -15,6 +15,7 @@ var _umi = require("umi");
 var _luckDesign = require("luck-design");
 var _base = require("@luck-design-biz/base");
 var _dropdown = require("@luck-design-biz/base/sys/dropdown");
+var _FormItem = _interopRequireDefault(require("../upload/FormItem"));
 var _excluded = ["onBlur"],
   _excluded2 = ["handleValueChange", "config"],
   _excluded3 = ["onBlur"],
@@ -321,17 +322,15 @@ var getUploadItem = function getUploadItem() {
     _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, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _FormItem.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
     config: (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      listType: 'picture-card',
-      accept: 'image/*'
+      listType: 'picture-card'
     }, _config), {}, {
-      num: 1,
       onBlur: function onBlur(value) {
         handleValueChange && handleValueChange(value);
         _onBlur5 && _onBlur5(value);
       }
     })
-  }));
+  })));
 };
 exports.getUploadItem = getUploadItem;

package/lib/helper/action.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.onBatchSubmitAction = exports.doAction = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
 var _utils = require("@luck-design-biz/base/utils");
 var _lodash = require("lodash");
@@ -118,44 +117,64 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
     effcode = _ref3.effcode,
     formUid = _ref3.formUid,
     mainDataSetKey = _ref3.mainDataSetKey;
-  var data = (0, _lodash.transform)(formList, function (result, value) {
-    var _values$value$id;
-    if (values[value.id]) {
-      var _dataSetKey = value.dataSetKey;
-      switch (value.type) {
-        case 'auto':
-          result[_dataSetKey] = (0, _objectSpread4.default)({
-            indocno: mainDataSetKey === _dataSetKey && action === 'add' && !window.appConfig.suppressUid ? formUid : formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
-          }, (0, _utils2.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 || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
-              comName: 'select'
-            });
-            return col;
-          });
-          var _submitData = {};
-          if ((0, _lodash.isArray)(values[value.id])) {
-            _submitData = {
-              addList: values[value.id].map(function (item) {
-                return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, item)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, null));
-              })
-            };
-          } else {
-            _submitData = (0, _lodash.transform)(values[value.id], function (_result, _value, _key) {
-              _result[_key] = _value.map(function (item) {
-                return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, item)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : item[window.appConfig.constraintKeys.PRIMARY]));
-              });
-            }, {});
-          }
-          result[_dataSetKey] = _submitData;
-          break;
-        default:
+  var data = (0, _lodash.transform)(values, function (result, value, key) {
+    // 附件
+    if ((0, _lodash.startsWith)(key, 'annex_')) {
+      if ((0, _lodash.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 ((0, _lodash.keyBy)(formList, 'id')[key]) {
+      var formInfo = (0, _lodash.keyBy)(formList, 'id')[key];
+      if (formInfo.type === 'auto') {
+        var _values$key;
+        result[formInfo.dataSetKey] = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, result[formInfo.dataSetKey] || {}), {}, {
+          indocno: mainDataSetKey === formInfo.dataSetKey && action === 'add' && !window.appConfig.suppressUid ? formUid : formData[key] && formData[key][window.appConfig.constraintKeys.PRIMARY]
+        }, (0, _utils2.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 || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
+            comName: 'select'
+          });
+          return col;
+        });
+        if ((0, _lodash.isArray)(value)) {
+          result[formInfo.dataSetKey] = {
+            addList: value.map(function (val) {
+              return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, val)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, null));
+            })
+          };
+        } else {
+          result[formInfo.dataSetKey] = (0, _lodash.transform)(value, function (_result, _value, _key) {
+            _result[_key] = _value.map(function (_val) {
+              return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, _val)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : item[window.appConfig.constraintKeys.PRIMARY]));
+            });
+          }, {});
+        }
+      }
+    } else result[key] = value;
+  }, (0, _defineProperty2.default)({}, mainDataSetKey, {
+    annex: []
+  }));
   beforeSubmit(data, values).then(function (backData) {
     if (backData) {
       doAction(action, {