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

package/es/components/LdFormList/index.js

@@ -6,17 +6,17 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded4 = ["ldId", "initData", "overModel"];
-import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
+import React, { forwardRef, Fragment, useContext, useImperativeHandle, useRef, useState } from 'react';
 import { connect, getDvaApp, useRouteMatch } from 'umi';
 import PropTypes from 'prop-types';
-import { useCreation, useMemoizedFn, useAsyncEffect } from 'ahooks';
+import { useAsyncEffect, useCreation, useMemoizedFn } from 'ahooks';
 import { BasicDivider } from 'luck-design';
 import { ChildrenUtil } from '@luck-design-biz/base/utils';
-import { FormList, FormListAffix, FormBtn } from '@luck-design-biz/base/FormList';
+import { FormBtn, FormList, FormListAffix } from '@luck-design-biz/base/FormList';
 import buildLdAutoForm from '../LdAutoForm';
 import buildLdGridForm from '../LdGridForm';
 import { Collapse } from '@luck-design-biz/base';
@@ -24,7 +24,7 @@ import { LuckDaContext } from '../Builder';
 import { LuckDaPopContext } from '../LdPop';
 import createModel from './model';
 import { onBatchSubmitAction } from '../../helper/action';
-import { isArray, sortBy, mapValues } from 'lodash';
+import { isArray, mapValues, sortBy } from 'lodash';
 import { BpmButton } from '@luck-design-biz/base/bpm';
 import { readBehaviorCall } from '../../services';
 
@@ -53,6 +53,8 @@ var LdFormList = function LdFormList(_ref) {
     renderFormExtra = _ref$renderFormExtra === void 0 ? function () {
       return /*#__PURE__*/React.createElement(React.Fragment, null);
     } : _ref$renderFormExtra,
+    _ref$bpmButtonProps = _ref.bpmButtonProps,
+    bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -110,20 +112,63 @@ var LdFormList = function LdFormList(_ref) {
 
   /**zss添加**/
   var renderAffixRightCustom = function renderAffixRightCustom() {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/React.createElement(BpmButton, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/React.createElement(BpmButton, _extends({
       bizData: bizData,
       suppressDept: false
-    }));
+    }, bpmButtonProps)));
   };
   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 = _objectSpread(_objectSpread({}, props.formData[mainFormLdId]), {}, {
+              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);
-  })), []);
+  })), [props.formData]);
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
     var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
       formCode = _ref7.formCode,

package/es/utils/grid.js

@@ -81,7 +81,7 @@ export function getColumnRender(name, type) {
             name: file.origFileName,
             previewUrl: "".concat(api.LUCKDA_HOST).concat(file.previewUrl)
           };
-        }); // 过滤删除文件
+        });
         return /*#__PURE__*/React.createElement(UploadGridCell, {
           fileList: fileList
         });

package/lib/components/LdFormList/index.js

@@ -31,7 +31,7 @@ var _action = require("../../helper/action");
 var _lodash = require("lodash");
 var _bpm = require("@luck-design-biz/base/bpm");
 var _services = require("../../services");
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded4 = ["ldId", "initData", "overModel"];
@@ -60,6 +60,8 @@ var LdFormList = function LdFormList(_ref) {
     renderFormExtra = _ref$renderFormExtra === void 0 ? function () {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
     } : _ref$renderFormExtra,
+    _ref$bpmButtonProps = _ref.bpmButtonProps,
+    bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -117,20 +119,63 @@ var LdFormList = function LdFormList(_ref) {
 
   /**zss添加**/
   var renderAffixRightCustom = function renderAffixRightCustom() {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/_react.default.createElement(_bpm.BpmButton, {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/_react.default.createElement(_bpm.BpmButton, (0, _extends2.default)({
       bizData: bizData,
       suppressDept: false
-    }));
+    }, bpmButtonProps)));
   };
   (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 = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.formData[mainFormLdId]), {}, {
+              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);
-  })), []);
+  })), [props.formData]);
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
     var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
       formCode = _ref7.formCode,

package/lib/utils/grid.js

@@ -88,7 +88,7 @@ function getColumnRender(name, type) {
             name: file.origFileName,
             previewUrl: "".concat(_ApiConfig.default.LUCKDA_HOST).concat(file.previewUrl)
           };
-        }); // 过滤删除文件
+        });
         return /*#__PURE__*/_react.default.createElement(_GridCell.default, {
           fileList: fileList
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.16-7",
+  "version": "0.0.16-9",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",