npm - @luck-design-biz/luckda - Versions diffs - 0.0.18 → 0.0.19-UI - Mend

@luck-design-biz/luckda 0.0.18 → 0.0.19-UI

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/es/components/LdFormList/index.js +68 -23
package/es/components/LdPop/index.js +2 -2
package/lib/components/LdFormList/index.js +67 -22
package/lib/components/LdPop/index.js +2 -2
package/package.json +1 -1

package/es/components/LdFormList/index.js CHANGED Viewed

@@ -8,10 +8,12 @@ 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", "bpmButtonProps"],
   _excluded2 = ["dataSets", "doAction", "resources"],
-  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
-  _excluded4 = ["ldId", "initData", "overModel"];
+  _excluded3 = ["formMode"],
+  _excluded4 = ["formMode"],
+  _excluded5 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
+  _excluded6 = ["ldId", "initData", "overModel"];
 import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
-import { connect, getDvaApp, useRouteMatch } from 'umi';
+import { connect, getDvaApp, useRouteMatch, useModel } from 'umi';
 import PropTypes from 'prop-types';
 import { useCreation, useMemoizedFn, useAsyncEffect } from 'ahooks';
 import { BasicDivider } from 'luck-design';
@@ -27,6 +29,7 @@ import { onBatchSubmitAction } from '../../helper/action';
 import { isArray, sortBy, mapValues } from 'lodash';
 import { BpmButton } from '@luck-design-biz/base/bpm';
 import { readBehaviorCall } from '../../services';
+import { parse, stringify } from 'querystring';
 // 组件
 var LdFormList = function LdFormList(_ref) {
@@ -56,6 +59,15 @@ var LdFormList = function LdFormList(_ref) {
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     props = _objectWithoutProperties(_ref, _excluded);
+  var _useModel = useModel('@@qiankunStateFromMaster', function (qiankunStateFromMaster) {
+      return {
+        peek: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.peekFloatLayer,
+        refresh: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.refreshFloatLayer
+      };
+    }),
+    peek = _useModel.peek,
+    refresh = _useModel.refresh;
+  var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     submitLoading = _useState2[0],
@@ -68,6 +80,9 @@ var LdFormList = function LdFormList(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     bizData = _useState6[0],
     setBizData = _useState6[1];
+  var luckTheme = useCreation(function () {
+    return document.body.getAttribute("luck-theme");
+  }, []);
   var _ref2 = useContext(LuckDaPopContext) || {},
     defaultLayout = _ref2.affixLayout;
   var _ref3 = useContext(LuckDaContext) || {},
@@ -114,39 +129,40 @@ var LdFormList = function LdFormList(_ref) {
   var renderAffixRightCustom = function renderAffixRightCustom() {
     return /*#__PURE__*/React.createElement(React.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/React.createElement(BpmButton, _extends({
       bizData: bizData,
-      suppressDept: false
+      suppressDept: false,
+      showHistory: luckTheme === 'base' ? 'sider' : 'drawer',
+      placement: luckTheme === 'base' && ((affixLayout || defaultLayout) !== 'top' ? "topRight" : "bottomRight")
     }, bpmButtonProps)));
   };
   useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _props$ticketData, PRIMARY, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
+    var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!(formMode !== 'add')) {
-            _context.next = 13;
+          if (!(formMode !== 'add' && props.formData[mainFormLdId])) {
+            _context.next = 12;
             break;
           }
-          PRIMARY = window.appConfig.constraintKeys.PRIMARY;
           _params = {
-            indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData[PRIMARY],
+            indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
             mainDataSetKey: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
           }; // 请求是否有工作流服务
-          _context.next = 5;
+          _context.next = 4;
           return readBehaviorCall(_params);
-        case 5:
+        case 4:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
-            _context.next = 13;
+            _context.next = 12;
             break;
           }
-          _context.next = 9;
+          _context.next = 8;
           return readBehaviorCall(_objectSpread(_objectSpread({}, _params), {}, {
             behaviorKey: 'readBpm'
           }));
-        case 9:
+        case 8:
           _yield$readBehaviorCa = _context.sent;
           code = _yield$readBehaviorCa.code;
           data = _yield$readBehaviorCa.data;
@@ -156,20 +172,20 @@ var LdFormList = function LdFormList(_ref) {
               bizKey: bpmInfoObj.bizKey,
               sname: bpmInfoObj.name,
               modelKey: bpmInfoObj.bpmKey,
-              idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2[PRIMARY],
+              idocid: (_props$formData$mainF2 = props.formData[mainFormLdId]) === null || _props$formData$mainF2 === void 0 ? void 0 : _props$formData$mainF2[PRIMARY],
               moduleCode: rest.moduleCode,
               datasetCode: mainDataSetKey,
-              indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3[PRIMARY]
+              indocno: (_props$formData$mainF3 = props.formData[mainFormLdId]) === null || _props$formData$mainF3 === void 0 ? void 0 : _props$formData$mainF3[PRIMARY]
             });
             setBizData(tempObj);
             setIsCustomRenderAffixRight(true);
           }
-        case 13:
+        case 12:
         case "end":
           return _context.stop();
       }
     }, _callee);
-  })), [props.formData]);
+  })), [props.formData, formMode]);
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
     var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
       formCode = _ref7.formCode,
@@ -190,16 +206,45 @@ var LdFormList = function LdFormList(_ref) {
       mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
       setSubmitLoading(false);
+      var mainFormData = res.detail[res.list[0]];
       if (success) {
         if (afterSubmit) {
           afterSubmit(success, mainKey, res);
+          // 刷新浮层，解决新增后，操作日志获取不到uid的问题
+          if (refresh && peek) {
+            var _peek = peek(),
+              href = _peek.href;
+            var _href$split = href.split('?'),
+              _href$split2 = _slicedToArray(_href$split, 2),
+              path = _href$split2[0],
+              argsStr = _href$split2[1];
+            var _parse = parse(argsStr),
+              _formMode = _parse.formMode,
+              _props2 = _objectWithoutProperties(_parse, _excluded3);
+            refresh({
+              href: "".concat(path, "?").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat(stringify(_objectSpread({}, _props2)))
+            });
+          }
         } else {
           var _formListRef$current;
-          formListRef.current.setFormMode('info');
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          var mainFormData = res.detail[res.list[0]];
           formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, mainFormData), function () {
-            return formListRef.current.setFormMode('info');
+            formListRef.current.setFormMode('info');
+            // 刷新浮层，解决新增后，操作日志获取不到uid的问题
+            if (refresh && peek) {
+              var _peek2 = peek(),
+                _href = _peek2.href;
+              var _href$split3 = _href.split('?'),
+                _href$split4 = _slicedToArray(_href$split3, 2),
+                _path = _href$split4[0],
+                _argsStr = _href$split4[1];
+              var _parse2 = parse(_argsStr),
+                _formMode2 = _parse2.formMode,
+                _props3 = _objectWithoutProperties(_parse2, _excluded4);
+              refresh({
+                href: "".concat(_path, "?formMode=info&").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat(stringify(_objectSpread({}, _props3)))
+              });
+            }
           });
         }
       }
@@ -266,7 +311,7 @@ var LdFormList = function LdFormList(_ref) {
         _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/React.createElement(React.Fragment, null);
         } : _ref8$renderTopLeft,
-        _props = _objectWithoutProperties(_ref8, _excluded3);
+        _props = _objectWithoutProperties(_ref8, _excluded5);
       var _props$type = _props.type,
         type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
@@ -343,7 +388,7 @@ var Index = function Index(_ref10) {
   var namespace = _ref10.ldId,
     initData = _ref10.initData,
     overModel = _ref10.overModel,
-    props = _objectWithoutProperties(_ref10, _excluded4);
+    props = _objectWithoutProperties(_ref10, _excluded6);
   var match = useRouteMatch();
   var Component = useCreation(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

package/es/components/LdPop/index.js CHANGED Viewed

@@ -19,8 +19,8 @@ var LdPop = function LdPop() {
     size: size,
     id: ldId
   }, _params), /*#__PURE__*/React.createElement(LuckDaPopContext.Provider, {
-    value: {
-      affixLayout: includes(['large', 'full'], size) ? 'top' : 'bottom'
+    value: includes(['large', 'full'], size) ? {} : {
+      affixLayout: 'bottom'
     } // 用于动态显示formList布局
   }, component));
 };

package/lib/components/LdFormList/index.js CHANGED Viewed

@@ -31,10 +31,13 @@ var _action = require("../../helper/action");
 var _lodash = require("lodash");
 var _bpm = require("@luck-design-biz/base/bpm");
 var _services = require("../../services");
+var _querystring = require("querystring");
 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"];
+  _excluded3 = ["formMode"],
+  _excluded4 = ["formMode"],
+  _excluded5 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
+  _excluded6 = ["ldId", "initData", "overModel"];
 // 组件
 var LdFormList = function LdFormList(_ref) {
   var _formList$find;
@@ -63,6 +66,15 @@ var LdFormList = function LdFormList(_ref) {
     _ref$bpmButtonProps = _ref.bpmButtonProps,
     bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  var _useModel = (0, _umi.useModel)('@@qiankunStateFromMaster', function (qiankunStateFromMaster) {
+      return {
+        peek: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.peekFloatLayer,
+        refresh: qiankunStateFromMaster === null || qiankunStateFromMaster === void 0 ? void 0 : qiankunStateFromMaster.refreshFloatLayer
+      };
+    }),
+    peek = _useModel.peek,
+    refresh = _useModel.refresh;
+  var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     submitLoading = _useState2[0],
@@ -75,6 +87,9 @@ var LdFormList = function LdFormList(_ref) {
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     bizData = _useState6[0],
     setBizData = _useState6[1];
+  var luckTheme = (0, _ahooks.useCreation)(function () {
+    return document.body.getAttribute("luck-theme");
+  }, []);
   var _ref2 = (0, _react.useContext)(_LdPop.LuckDaPopContext) || {},
     defaultLayout = _ref2.affixLayout;
   var _ref3 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
@@ -121,39 +136,40 @@ var LdFormList = function LdFormList(_ref) {
   var renderAffixRightCustom = function renderAffixRightCustom() {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/_react.default.createElement(_bpm.BpmButton, (0, _extends2.default)({
       bizData: bizData,
-      suppressDept: false
+      suppressDept: false,
+      showHistory: luckTheme === 'base' ? 'sider' : 'drawer',
+      placement: luckTheme === 'base' && ((affixLayout || defaultLayout) !== 'top' ? "topRight" : "bottomRight")
     }, bpmButtonProps)));
   };
   (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var _props$ticketData, PRIMARY, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
+    var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!(formMode !== 'add')) {
-            _context.next = 13;
+          if (!(formMode !== 'add' && props.formData[mainFormLdId])) {
+            _context.next = 12;
             break;
           }
-          PRIMARY = window.appConfig.constraintKeys.PRIMARY;
           _params = {
-            indocno: (_props$ticketData = props.ticketData) === null || _props$ticketData === void 0 ? void 0 : _props$ticketData[PRIMARY],
+            indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
             moduleCode: rest.moduleCode,
             datasetCode: mainDataSetKey,
             mainDataSetKey: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
           }; // 请求是否有工作流服务
-          _context.next = 5;
+          _context.next = 4;
           return (0, _services.readBehaviorCall)(_params);
-        case 5:
+        case 4:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
-            _context.next = 13;
+            _context.next = 12;
             break;
           }
-          _context.next = 9;
+          _context.next = 8;
           return (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _params), {}, {
             behaviorKey: 'readBpm'
           }));
-        case 9:
+        case 8:
           _yield$readBehaviorCa = _context.sent;
           code = _yield$readBehaviorCa.code;
           data = _yield$readBehaviorCa.data;
@@ -163,20 +179,20 @@ var LdFormList = function LdFormList(_ref) {
               bizKey: bpmInfoObj.bizKey,
               sname: bpmInfoObj.name,
               modelKey: bpmInfoObj.bpmKey,
-              idocid: (_props$ticketData2 = props.ticketData) === null || _props$ticketData2 === void 0 ? void 0 : _props$ticketData2[PRIMARY],
+              idocid: (_props$formData$mainF2 = props.formData[mainFormLdId]) === null || _props$formData$mainF2 === void 0 ? void 0 : _props$formData$mainF2[PRIMARY],
               moduleCode: rest.moduleCode,
               datasetCode: mainDataSetKey,
-              indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3[PRIMARY]
+              indocno: (_props$formData$mainF3 = props.formData[mainFormLdId]) === null || _props$formData$mainF3 === void 0 ? void 0 : _props$formData$mainF3[PRIMARY]
             });
             setBizData(tempObj);
             setIsCustomRenderAffixRight(true);
           }
-        case 13:
+        case 12:
         case "end":
           return _context.stop();
       }
     }, _callee);
-  })), [props.formData]);
+  })), [props.formData, formMode]);
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
     var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
       formCode = _ref7.formCode,
@@ -197,16 +213,45 @@ var LdFormList = function LdFormList(_ref) {
       mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
       setSubmitLoading(false);
+      var mainFormData = res.detail[res.list[0]];
       if (success) {
         if (afterSubmit) {
           afterSubmit(success, mainKey, res);
+          // 刷新浮层，解决新增后，操作日志获取不到uid的问题
+          if (refresh && peek) {
+            var _peek = peek(),
+              href = _peek.href;
+            var _href$split = href.split('?'),
+              _href$split2 = (0, _slicedToArray2.default)(_href$split, 2),
+              path = _href$split2[0],
+              argsStr = _href$split2[1];
+            var _parse = (0, _querystring.parse)(argsStr),
+              _formMode = _parse.formMode,
+              _props2 = (0, _objectWithoutProperties2.default)(_parse, _excluded3);
+            refresh({
+              href: "".concat(path, "?").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat((0, _querystring.stringify)((0, _objectSpread2.default)({}, _props2)))
+            });
+          }
         } else {
           var _formListRef$current;
-          formListRef.current.setFormMode('info');
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          var mainFormData = res.detail[res.list[0]];
           formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, mainFormData), function () {
-            return formListRef.current.setFormMode('info');
+            formListRef.current.setFormMode('info');
+            // 刷新浮层，解决新增后，操作日志获取不到uid的问题
+            if (refresh && peek) {
+              var _peek2 = peek(),
+                _href = _peek2.href;
+              var _href$split3 = _href.split('?'),
+                _href$split4 = (0, _slicedToArray2.default)(_href$split3, 2),
+                _path = _href$split4[0],
+                _argsStr = _href$split4[1];
+              var _parse2 = (0, _querystring.parse)(_argsStr),
+                _formMode2 = _parse2.formMode,
+                _props3 = (0, _objectWithoutProperties2.default)(_parse2, _excluded4);
+              refresh({
+                href: "".concat(_path, "?formMode=info&").concat(PRIMARY, "=").concat(mainFormData[PRIMARY], "&").concat((0, _querystring.stringify)((0, _objectSpread2.default)({}, _props3)))
+              });
+            }
           });
         }
       }
@@ -273,7 +318,7 @@ var LdFormList = function LdFormList(_ref) {
         _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
         } : _ref8$renderTopLeft,
-        _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded3);
+        _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded5);
       var _props$type = _props.type,
         type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
@@ -350,7 +395,7 @@ var Index = function Index(_ref10) {
   var namespace = _ref10.ldId,
     initData = _ref10.initData,
     overModel = _ref10.overModel,
-    props = (0, _objectWithoutProperties2.default)(_ref10, _excluded4);
+    props = (0, _objectWithoutProperties2.default)(_ref10, _excluded6);
   var match = (0, _umi.useRouteMatch)();
   var Component = (0, _ahooks.useCreation)(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

package/lib/components/LdPop/index.js CHANGED Viewed

@@ -28,8 +28,8 @@ var LdPop = function LdPop() {
     size: size,
     id: ldId
   }, _params), /*#__PURE__*/_react.default.createElement(LuckDaPopContext.Provider, {
-    value: {
-      affixLayout: (0, _lodash.includes)(['large', 'full'], size) ? 'top' : 'bottom'
+    value: (0, _lodash.includes)(['large', 'full'], size) ? {} : {
+      affixLayout: 'bottom'
     } // 用于动态显示formList布局
   }, component));
 };

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.18",
+  "version": "0.0.19-UI",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",