@luck-design-biz/luckda 0.0.18-2 → 0.0.18-4

package/es/components/LdAutoForm/index.js

@@ -113,13 +113,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     onQuery: _objectSpread(_objectSpread({
       api: behaviorCall,
       get: function get(formData) {
+        var _params2;
         var _relationKey = isMain ? window.appConfig.constraintKeys.PRIMARY : relationKey;
-        var _params = {
-          indocno: formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey],
-          moduleCode: moduleCode,
-          datasetCode: dataSetKey,
-          behaviorKey: 'readForm'
-        };
+        var _params = (_params2 = {}, _defineProperty(_params2, 'indocno', formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey]), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readForm'), _params2);
         if (!isMain) _params.relationDs = mainDataSetKey;
         return _params;
       }

package/es/components/LdFormList/index.js

@@ -8,12 +8,10 @@ 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 = ["formMode"],
-  _excluded4 = ["formMode"],
-  _excluded5 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
-  _excluded6 = ["ldId", "initData", "overModel"];
+  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
+  _excluded4 = ["ldId", "initData", "overModel"];
 import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
-import { connect, getDvaApp, useRouteMatch, useModel } from 'umi';
+import { connect, getDvaApp, useRouteMatch } from 'umi';
 import PropTypes from 'prop-types';
 import { useCreation, useMemoizedFn, useAsyncEffect } from 'ahooks';
 import { BasicDivider } from 'luck-design';
@@ -29,7 +27,6 @@ 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) {
@@ -59,15 +56,6 @@ 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],
@@ -130,14 +118,15 @@ var LdFormList = function LdFormList(_ref) {
     }, bpmButtonProps)));
   };
   useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
+    var _props$formData$mainF, PRIMARY, _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' && props.formData[mainFormLdId])) {
-            _context.next = 12;
+            _context.next = 13;
             break;
           }
+          PRIMARY = window.appConfig.constraintKeys.PRIMARY;
           _params = {
             indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
             moduleCode: rest.moduleCode,
@@ -145,19 +134,19 @@ var LdFormList = function LdFormList(_ref) {
             mainDataSetKey: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
           }; // 请求是否有工作流服务
-          _context.next = 4;
+          _context.next = 5;
           return readBehaviorCall(_params);
-        case 4:
+        case 5:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
-            _context.next = 12;
+            _context.next = 13;
             break;
           }
-          _context.next = 8;
+          _context.next = 9;
           return readBehaviorCall(_objectSpread(_objectSpread({}, _params), {}, {
             behaviorKey: 'readBpm'
           }));
-        case 8:
+        case 9:
           _yield$readBehaviorCa = _context.sent;
           code = _yield$readBehaviorCa.code;
           data = _yield$readBehaviorCa.data;
@@ -175,7 +164,7 @@ var LdFormList = function LdFormList(_ref) {
             setBizData(tempObj);
             setIsCustomRenderAffixRight(true);
           }
-        case 12:
+        case 13:
         case "end":
           return _context.stop();
       }
@@ -201,45 +190,15 @@ 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;
           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 () {
-            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)))
-              });
-            }
+            return formListRef.current.setFormMode('info');
           });
         }
       }
@@ -306,7 +265,7 @@ var LdFormList = function LdFormList(_ref) {
         _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
           return /*#__PURE__*/React.createElement(React.Fragment, null);
         } : _ref8$renderTopLeft,
-        _props = _objectWithoutProperties(_ref8, _excluded5);
+        _props = _objectWithoutProperties(_ref8, _excluded3);
       var _props$type = _props.type,
         type = _props$type === void 0 ? 'auto' : _props$type;
       var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
@@ -383,7 +342,7 @@ var Index = function Index(_ref10) {
   var namespace = _ref10.ldId,
     initData = _ref10.initData,
     overModel = _ref10.overModel,
-    props = _objectWithoutProperties(_ref10, _excluded6);
+    props = _objectWithoutProperties(_ref10, _excluded4);
   var match = useRouteMatch();
   var Component = useCreation(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

package/lib/components/LdAutoForm/index.js

@@ -121,13 +121,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     onQuery: (0, _objectSpread3.default)((0, _objectSpread3.default)({
       api: _utils.behaviorCall,
       get: function get(formData) {
+        var _params2;
         var _relationKey = isMain ? window.appConfig.constraintKeys.PRIMARY : relationKey;
-        var _params = {
-          indocno: formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey],
-          moduleCode: moduleCode,
-          datasetCode: dataSetKey,
-          behaviorKey: 'readForm'
-        };
+        var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, 'indocno', formData[mainFormLdId] && formData[mainFormLdId][_relationKey] || ticketData[_relationKey]), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readForm'), _params2);
         if (!isMain) _params.relationDs = mainDataSetKey;
         return _params;
       }

package/lib/components/LdFormList/index.js

@@ -31,13 +31,10 @@ 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 = ["formMode"],
-  _excluded4 = ["formMode"],
-  _excluded5 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
-  _excluded6 = ["ldId", "initData", "overModel"];
+  _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
+  _excluded4 = ["ldId", "initData", "overModel"];
 // 组件
 var LdFormList = function LdFormList(_ref) {
   var _formList$find;
@@ -66,15 +63,6 @@ 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],
@@ -137,14 +125,15 @@ var LdFormList = function LdFormList(_ref) {
     }, bpmButtonProps)));
   };
   (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-    var _props$formData$mainF, _params, response, _yield$readBehaviorCa, code, data, _props$formData$mainF2, _props$formData$mainF3, bpmInfoObj, tempObj;
+    var _props$formData$mainF, PRIMARY, _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' && props.formData[mainFormLdId])) {
-            _context.next = 12;
+            _context.next = 13;
             break;
           }
+          PRIMARY = window.appConfig.constraintKeys.PRIMARY;
           _params = {
             indocno: (_props$formData$mainF = props.formData[mainFormLdId]) === null || _props$formData$mainF === void 0 ? void 0 : _props$formData$mainF[PRIMARY],
             moduleCode: rest.moduleCode,
@@ -152,19 +141,19 @@ var LdFormList = function LdFormList(_ref) {
             mainDataSetKey: mainDataSetKey,
             behaviorKey: 'readBpmDeploy'
           }; // 请求是否有工作流服务
-          _context.next = 4;
+          _context.next = 5;
           return (0, _services.readBehaviorCall)(_params);
-        case 4:
+        case 5:
           response = _context.sent;
           if (!(response.code === 1 && response.data)) {
-            _context.next = 12;
+            _context.next = 13;
             break;
           }
-          _context.next = 8;
+          _context.next = 9;
           return (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _params), {}, {
             behaviorKey: 'readBpm'
           }));
-        case 8:
+        case 9:
           _yield$readBehaviorCa = _context.sent;
           code = _yield$readBehaviorCa.code;
           data = _yield$readBehaviorCa.data;
@@ -182,7 +171,7 @@ var LdFormList = function LdFormList(_ref) {
             setBizData(tempObj);
             setIsCustomRenderAffixRight(true);
           }
-        case 12:
+        case 13:
         case "end":
           return _context.stop();
       }
@@ -208,45 +197,15 @@ 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;
           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 () {
-            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)))
-              });
-            }
+            return formListRef.current.setFormMode('info');
           });
         }
       }
@@ -313,7 +272,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, _excluded5);
+        _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;
@@ -390,7 +349,7 @@ var Index = function Index(_ref10) {
   var namespace = _ref10.ldId,
     initData = _ref10.initData,
     overModel = _ref10.overModel,
-    props = (0, _objectWithoutProperties2.default)(_ref10, _excluded6);
+    props = (0, _objectWithoutProperties2.default)(_ref10, _excluded4);
   var match = (0, _umi.useRouteMatch)();
   var Component = (0, _ahooks.useCreation)(function () {
     var _getDvaApp3, _getDvaApp4, _match$params;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.18-2",
+  "version": "0.0.18-4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -74,4 +74,4 @@
     "lib": "lib"
   },
   "author": ""
-}
+}