@luck-design-biz/luckda 0.0.5-1 → 0.0.6

package/es/components/LdFormList/index.js

@@ -7,7 +7,8 @@ var _excluded = ["namespace", "formState", "formMode", "loading", "wrapperRef",
   _excluded2 = ["id", "header", "title", "readOnly", "extraConfig"],
   _excluded3 = ["ldId", "initData", "overModel"];
 import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
-import { connect, getDvaApp } from 'umi';
+import { stringify } from 'querystring';
+import { connect, getDvaApp, useRouteMatch, history } from 'umi';
 import PropTypes from 'prop-types';
 import { useCreation, useMemoizedFn } from 'ahooks';
 import { BasicDivider } from 'luck-design';
@@ -15,7 +16,7 @@ import { formatMessage, ChildrenUtil } from '@luck-design-biz/base/utils';
 import { FormList, FormListAffix, FormBtn } from '@luck-design-biz/base/FormList';
 import buildLdAutoForm from '../LdAutoForm';
 import buildLdGridForm from '../LdGridForm';
-import { Collapse } from '@luck-design-biz/base';
+import { Collapse, FormWindowContext } from '@luck-design-biz/base';
 import { LuckDaContext } from '../Builder';
 import { LuckDaPopContext } from '../LdPop';
 import createModel from './model';
@@ -52,10 +53,12 @@ var LdFormList = function LdFormList(_ref) {
     setSubmitLoading = _useState2[1];
   var _ref2 = useContext(LuckDaPopContext) || {},
     defaultLayout = _ref2.affixLayout;
-  var _ref3 = useContext(LuckDaContext) || {},
-    readFieldProps = _ref3.readFieldProps,
-    dataSets = _ref3.dataSets,
-    doAction = _ref3.doAction;
+  var _ref3 = useContext(FormWindowContext) || {},
+    formWindow = _ref3.formWindow;
+  var _ref4 = useContext(LuckDaContext) || {},
+    readFieldProps = _ref4.readFieldProps,
+    dataSets = _ref4.dataSets,
+    doAction = _ref4.doAction;
   var formListRef = useRef(null);
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, formListRef.current), {}, {
@@ -75,8 +78,8 @@ var LdFormList = function LdFormList(_ref) {
     });
   });
   var handleValueChange = useMemoizedFn(function (change) {
-    var _ref4 = formListRef.current || {},
-      formRefs = _ref4.formRefs;
+    var _ref5 = formListRef.current || {},
+      formRefs = _ref5.formRefs;
     var data = formRefs && Object.keys(formRefs).map(function (key) {
       var _formRefs$key$current;
       var getValue = formRefs[key].getData || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
@@ -96,9 +99,10 @@ var LdFormList = function LdFormList(_ref) {
       formId: formId
     }, extraConfig)));
   });
-  var handleBatchSubmit = function handleBatchSubmit(values, action, _ref6) {
-    var formCode = _ref6.formCode,
-      formKey = _ref6.formKey;
+  var handleBatchSubmit = function handleBatchSubmit(values, action) {
+    var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      formCode = _ref7.formCode,
+      formKey = _ref7.formKey;
     setSubmitLoading(true);
     onBatchSubmitAction({
       values: values,
@@ -117,12 +121,22 @@ var LdFormList = function LdFormList(_ref) {
           afterSubmit();
         } else {
           var _formListRef$current;
-          formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
-            indocno: indocno
-          }), function () {
-            return formListRef.current.setFormMode('edit');
-          });
           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) {
+            var _history$location = history.location,
+              pathname = _history$location.pathname,
+              query = _history$location.query;
+            var _pathname = pathname.replace(/\/0(?=[?]|[\/]$|$)/g, "/".concat(indocno, "?"));
+            window.openUrl("layer:".concat(_pathname).concat(stringify(_objectSpread(_objectSpread({}, query), {}, {
+              title: window.__INJECTED_APP_NAME_BY_QIANKUN__
+            }))));
+          } else {
+            formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
+              indocno: indocno
+            }), function () {
+              return formListRef.current.setFormMode('edit');
+            });
+          }
         }
       }
     });
@@ -163,15 +177,15 @@ var LdFormList = function LdFormList(_ref) {
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout
   }), formList.map(function (formProps) {
-    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,
-      _props = _objectWithoutProperties(_ref7, _excluded2);
+    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,
+      _props = _objectWithoutProperties(_ref8, _excluded2);
     var _props$type = _props.type,
       type = _props$type === void 0 ? 'auto' : _props$type;
     var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
@@ -223,9 +237,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,
@@ -236,19 +250,22 @@ 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, _excluded3);
+var Index = function Index(_ref10) {
+  var namespace = _ref10.ldId,
+    initData = _ref10.initData,
+    overModel = _ref10.overModel,
+    props = _objectWithoutProperties(_ref10, _excluded3);
+  var match = useRouteMatch();
   var Component = useCreation(function () {
-    var _getDvaApp3, _getDvaApp4;
+    var _getDvaApp3, _getDvaApp4, _match$params;
     (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.unmodel(namespace);
     if (!((_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 ? void 0 : _getDvaApp4._store.getState()[namespace])) {
       var _getDvaApp5;
       (_getDvaApp5 = getDvaApp()) === null || _getDvaApp5 === void 0 ? void 0 : _getDvaApp5.model(createModel(namespace, overModel));
     }
-    return builder(LdFormList, namespace, initData);
+    return builder(LdFormList, namespace, (match === null || match === void 0 ? void 0 : (_match$params = match.params) === null || _match$params === void 0 ? void 0 : _match$params.isEdit) ? _objectSpread(_objectSpread({}, initData), {}, {
+      formMode: 'edit'
+    }) : initData);
   }, [namespace]);
   return /*#__PURE__*/React.createElement(Component, _extends({
     namespace: namespace

package/lib/components/LdFormList/index.js

@@ -12,6 +12,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
+var _querystring = require("querystring");
 var _umi = require("umi");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _ahooks = require("ahooks");
@@ -59,10 +60,12 @@ var LdFormList = function LdFormList(_ref) {
     setSubmitLoading = _useState2[1];
   var _ref2 = (0, _react.useContext)(_LdPop.LuckDaPopContext) || {},
     defaultLayout = _ref2.affixLayout;
-  var _ref3 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
-    readFieldProps = _ref3.readFieldProps,
-    dataSets = _ref3.dataSets,
-    doAction = _ref3.doAction;
+  var _ref3 = (0, _react.useContext)(_base.FormWindowContext) || {},
+    formWindow = _ref3.formWindow;
+  var _ref4 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
+    readFieldProps = _ref4.readFieldProps,
+    dataSets = _ref4.dataSets,
+    doAction = _ref4.doAction;
   var formListRef = (0, _react.useRef)(null);
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
@@ -82,8 +85,8 @@ var LdFormList = function LdFormList(_ref) {
     });
   });
   var handleValueChange = (0, _ahooks.useMemoizedFn)(function (change) {
-    var _ref4 = formListRef.current || {},
-      formRefs = _ref4.formRefs;
+    var _ref5 = formListRef.current || {},
+      formRefs = _ref5.formRefs;
     var data = formRefs && Object.keys(formRefs).map(function (key) {
       var _formRefs$key$current;
       var getValue = formRefs[key].getData || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
@@ -103,9 +106,10 @@ var LdFormList = function LdFormList(_ref) {
       formId: formId
     }, extraConfig)));
   });
-  var handleBatchSubmit = function handleBatchSubmit(values, action, _ref6) {
-    var formCode = _ref6.formCode,
-      formKey = _ref6.formKey;
+  var handleBatchSubmit = function handleBatchSubmit(values, action) {
+    var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+      formCode = _ref7.formCode,
+      formKey = _ref7.formKey;
     setSubmitLoading(true);
     (0, _action.onBatchSubmitAction)({
       values: values,
@@ -124,12 +128,22 @@ var LdFormList = function LdFormList(_ref) {
           afterSubmit();
         } else {
           var _formListRef$current;
-          formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
-            indocno: indocno
-          }), function () {
-            return formListRef.current.setFormMode('edit');
-          });
           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) {
+            var _history$location = _umi.history.location,
+              pathname = _history$location.pathname,
+              query = _history$location.query;
+            var _pathname = pathname.replace(/\/0(?=[?]|[\/]$|$)/g, "/".concat(indocno, "?"));
+            window.openUrl("layer:".concat(_pathname).concat((0, _querystring.stringify)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, query), {}, {
+              title: window.__INJECTED_APP_NAME_BY_QIANKUN__
+            }))));
+          } else {
+            formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
+              indocno: indocno
+            }), function () {
+              return formListRef.current.setFormMode('edit');
+            });
+          }
         }
       }
     });
@@ -170,15 +184,15 @@ var LdFormList = function LdFormList(_ref) {
     title: saveBtnTitle,
     layout: affixLayout || defaultLayout
   }), formList.map(function (formProps) {
-    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,
-      _props = (0, _objectWithoutProperties2.default)(_ref7, _excluded2);
+    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,
+      _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded2);
     var _props$type = _props.type,
       type = _props$type === void 0 ? 'auto' : _props$type;
     var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
@@ -230,9 +244,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,
@@ -243,19 +257,22 @@ 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, _excluded3);
+var Index = function Index(_ref10) {
+  var namespace = _ref10.ldId,
+    initData = _ref10.initData,
+    overModel = _ref10.overModel,
+    props = (0, _objectWithoutProperties2.default)(_ref10, _excluded3);
+  var match = (0, _umi.useRouteMatch)();
   var Component = (0, _ahooks.useCreation)(function () {
-    var _getDvaApp3, _getDvaApp4;
+    var _getDvaApp3, _getDvaApp4, _match$params;
     (_getDvaApp3 = (0, _umi.getDvaApp)()) === null || _getDvaApp3 === void 0 ? void 0 : _getDvaApp3.unmodel(namespace);
     if (!((_getDvaApp4 = (0, _umi.getDvaApp)()) === null || _getDvaApp4 === void 0 ? void 0 : _getDvaApp4._store.getState()[namespace])) {
       var _getDvaApp5;
       (_getDvaApp5 = (0, _umi.getDvaApp)()) === null || _getDvaApp5 === void 0 ? void 0 : _getDvaApp5.model((0, _model.default)(namespace, overModel));
     }
-    return builder(LdFormList, namespace, initData);
+    return builder(LdFormList, namespace, (match === null || match === void 0 ? void 0 : (_match$params = match.params) === null || _match$params === void 0 ? void 0 : _match$params.isEdit) ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, initData), {}, {
+      formMode: 'edit'
+    }) : initData);
   }, [namespace]);
   return /*#__PURE__*/_react.default.createElement(Component, (0, _extends2.default)({
     namespace: namespace

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.5-1",
+  "version": "0.0.6",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -40,7 +40,6 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.9",
-    "@luck-design-biz/base": "^0.0.6",
     "@province-city-china/level": "^8.5.4",
     "ahooks": "^3.7.0",
     "antd": "^3.26.6",
@@ -53,7 +52,6 @@
     "jointjs": "^3.5.4",
     "js-file-download": "^0.4.4",
     "lodash": "^4.17.11",
-    "luck-design": "^0.1.46",
     "moment": "^2.24.0",
     "nprogress": "^0.2.0",
     "path-to-regexp": "^2.4.0",
@@ -80,6 +78,10 @@
     "rollup-plugin-node-resolve": "^5.2.0",
     "yorkie": "^2.0.0"
   },
+  "peerDependencies": {
+    "@luck-design-biz/base": ">= 0.0.10",
+    "luck-design": ">=0.1.51"
+  },
   "description": "前端配置管理中心业务组件库",
   "bugs": {
     "url": "https://github.com/xieyt203/luck-biz-components/issues"