@voplus/morpho-csp 1.2.184 → 1.3.1

package/es/modules/corporate/pages/CorporateDefaultView/index.js

@@ -4,14 +4,14 @@ import React from "react";
 import { Spin } from "@voplus/antd";
 import { observe } from "@voplus/morpho-ui";
 import { useCorporate } from "../../../../data/corporate";
-import { useRouteMatch } from "react-router";
+import { useParams, useResolvedPath } from "react-router-dom";
 const CorporateDefaultView = () => {
-    const match = useRouteMatch();
-    const id = match.params.id;
+    const { id } = useParams();
+    const url = useResolvedPath("").pathname;
     /** Unit route 查看 View Corporate 时 id 为 unitId, api为/api/units/${id}/corporate,需要判断是否为unit route  */
     const corporate = useCorporate(id, {
         reload: true,
-        unit: match.path.includes("-unit"),
+        unit: url.includes("-unit"),
         includes: "registers",
     });
     return observe(() => (React.createElement(React.Fragment, null, corporate.loading ? (React.createElement("div", { style: { textAlign: "center" } },

package/es/modules/corporate/pages/CorporateDefaultView/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/corporate/pages/CorporateDefaultView/index.tsx"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,oBAAoB,GAAG,GAAG,EAAE;IACjC,MAAM,KAAK,GAAG,aAAa,EAAkB,CAAC;IAC9C,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;IAC3B,oGAAoG;IACpG,MAAM,SAAS,GAAG,YAAY,CAAC,EAAE,EAAE;QAClC,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QAClC,QAAQ,EAAE,WAAW;KACrB,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,KAAK,CAAC,QAAQ,QACb,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CACpB,6BAAK,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE;QAClC,oBAAC,IAAI,IAAC,SAAS,EAAE,oBAAC,eAAe,IAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,SAAG,GAAI,CACjE,CACN,CAAC,CAAC,CAAC,CACH,oBAAC,kBAAkB,IAAC,EAAE,EAAE,SAAS,CAAC,EAAE,GAAI,CACxC,CACe,CACjB,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/corporate/pages/CorporateDefaultView/index.tsx"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAE9D,MAAM,oBAAoB,GAAG,GAAG,EAAE;IACjC,MAAM,EAAE,EAAE,EAAE,GAAG,SAAS,EAAkB,CAAC;IAC3C,MAAM,GAAG,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC;IACzC,oGAAoG;IACpG,MAAM,SAAS,GAAG,YAAY,CAAC,EAAG,EAAE;QACnC,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC;QAC3B,QAAQ,EAAE,WAAW;KACrB,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,KAAK,CAAC,QAAQ,QACb,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CACpB,6BAAK,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE;QAClC,oBAAC,IAAI,IAAC,SAAS,EAAE,oBAAC,eAAe,IAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,SAAG,GAAI,CACjE,CACN,CAAC,CAAC,CAAC,CACH,oBAAC,kBAAkB,IAAC,EAAE,EAAE,SAAS,CAAC,EAAE,GAAI,CACxC,CACe,CACjB,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/es/modules/corporate/pages/CorporatePage/index.js

@@ -2,16 +2,16 @@ import React from "react";
 import { Spin } from "@voplus/antd";
 import { observe } from "@voplus/morpho-ui";
 import { useCorporate } from "../../../../data/corporate";
-import { useRouteMatch } from "react-router";
+import { useParams, useResolvedPath } from "react-router-dom";
 import { LoadingOutlined } from "@ant-design/icons";
 import CompanyPage from "../../company/pages/CompanyPage";
 const CorporatePage = () => {
-    const match = useRouteMatch();
-    const id = match.params.id;
+    const { id } = useParams();
+    const url = useResolvedPath("").pathname;
     /** Unit route 查看 View Corporate 时 id 为 unitId, api为/api/units/${id}/corporate,需要判断是否为unit route  */
     const corporate = useCorporate(id, {
         reload: true,
-        unit: match.path.includes("-page"),
+        unit: url.includes("-page"),
         includes: "registers",
     });
     return observe(() => (React.createElement(React.Fragment, null, corporate.loading ? (React.createElement("div", { style: { textAlign: "center" } },

package/es/modules/corporate/pages/CorporatePage/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/corporate/pages/CorporatePage/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,WAAW,MAAM,iCAAiC,CAAC;AAE1D,MAAM,aAAa,GAAG,GAAG,EAAE;IAC1B,MAAM,KAAK,GAAG,aAAa,EAAkB,CAAC;IAC9C,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;IAC3B,oGAAoG;IACpG,MAAM,SAAS,GAAG,YAAY,CAAC,EAAE,EAAE;QAClC,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QAClC,QAAQ,EAAE,WAAW;KACrB,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,KAAK,CAAC,QAAQ,QACb,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CACpB,6BAAK,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE;QAClC,oBAAC,IAAI,IAAC,SAAS,EAAE,oBAAC,eAAe,IAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,SAAG,GAAI,CACjE,CACN,CAAC,CAAC,CAAC,CACH,oBAAC,WAAW,IAAC,EAAE,EAAE,SAAS,CAAC,EAAE,GAAI,CACjC,CACe,CACjB,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/corporate/pages/CorporatePage/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,WAAW,MAAM,iCAAiC,CAAC;AAE1D,MAAM,aAAa,GAAG,GAAG,EAAE;IAC1B,MAAM,EAAE,EAAE,EAAE,GAAG,SAAS,EAAkB,CAAC;IAC3C,MAAM,GAAG,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC;IACzC,oGAAoG;IACpG,MAAM,SAAS,GAAG,YAAY,CAAC,EAAG,EAAE;QACnC,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC;QAC3B,QAAQ,EAAE,WAAW;KACrB,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,KAAK,CAAC,QAAQ,QACb,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CACpB,6BAAK,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE;QAClC,oBAAC,IAAI,IAAC,SAAS,EAAE,oBAAC,eAAe,IAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,SAAG,GAAI,CACjE,CACN,CAAC,CAAC,CAAC,CACH,oBAAC,WAAW,IAAC,EAAE,EAAE,SAAS,CAAC,EAAE,GAAI,CACjC,CACe,CACjB,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/es/modules/corporate/pages/UnitCorporatePage/index.js

@@ -1,15 +1,14 @@
 import React from "react";
 import { Result, Button, Spin, message } from "@voplus/antd";
 import { observe, useAutorunEffect } from "@voplus/morpho-ui";
-import { useRouteMatch, Redirect, Route } from "react-router";
+import { useParams } from "react-router";
 import { useUnit, useUnitStore } from "@voplus/morpho-org";
 import { TabItemContext, TabItemStore, useTabItem, useLayout } from "@voplus/morpho-data";
 import Routes from "../../../../routes";
 import MainContent from "@voplus/morpho-ui/es/components/layout/MainContent";
 import styles from "./index.less";
 const UnitCorporatePage = () => {
-    const match = useRouteMatch();
-    const id = match.params.id;
+    const { id } = useParams();
     const unit = useUnit(id);
     const unitStore = useUnitStore();
     const store = new TabItemStore({ url: "" });
@@ -20,8 +19,11 @@ const UnitCorporatePage = () => {
         var _a;
         return (React.createElement(TabItemContext.Provider, { value: store },
             React.createElement(MainContent, { className: styles["corporate-empty-view"] },
-                React.createElement("div", { className: "corporate-context" }, unit.loading ? (React.createElement(Spin, null)) : ((_a = unit.stereoTypes) === null || _a === void 0 ? void 0 : _a.includes("Corporate")) ? (React.createElement(Route, { render: () => React.createElement(Redirect, { to: Routes.CorporatePage.getUrl(unit.id) }) })) : (React.createElement(Result, { status: "404", title: unit.name, subTitle: "Corporate not found. Do you wish to create one ?", extra: React.createElement(Button, { type: "primary", onClick: onCreate }, "Create Corporate Type") }))))));
+                React.createElement("div", { className: "corporate-context" }, unit.loading ? (React.createElement(Spin, null)) : ((_a = unit.stereoTypes) === null || _a === void 0 ? void 0 : _a.includes("Corporate")) ? (Redirect()) : (React.createElement(Result, { status: "404", title: unit.name, subTitle: "Corporate not found. Do you wish to create one ?", extra: React.createElement(Button, { type: "primary", onClick: onCreate }, "Create Corporate Type") }))))));
     });
+    function Redirect() {
+        layout.history.replace(Routes.CorporatePage.getUrl(unit.id));
+    }
     async function onCreate() {
         await unitStore
             .addCorporateType({

package/es/modules/corporate/pages/UnitCorporatePage/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/corporate/pages/UnitCorporatePage/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAmB,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC1F,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,WAAW,MAAM,oDAAoD,CAAC;AAC7E,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IAC9B,MAAM,KAAK,GAAG,aAAa,EAAkB,CAAC;IAC9C,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;IAE3B,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC;IACzB,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;IACzB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAE/D,OAAO,OAAO,CAAC,GAAG,EAAE;;QAAC,OAAA,CACpB,oBAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK;YACpC,oBAAC,WAAW,IAAC,SAAS,EAAE,MAAM,CAAC,sBAAsB,CAAC;gBACrD,6BAAK,SAAS,EAAC,mBAAmB,IAChC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CACf,oBAAC,IAAI,OAAG,CACR,CAAC,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,QAAQ,CAAC,WAAW,CAAC,EAAC,CAAC,CAAC,CAC7C,oBAAC,KAAK,IAAC,MAAM,EAAE,GAAG,EAAE,CAAC,oBAAC,QAAQ,IAAC,EAAE,EAAE,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,GAAI,GAAI,CAC/E,CAAC,CAAC,CAAC,CACH,oBAAC,MAAM,IACN,MAAM,EAAC,KAAK,EACZ,KAAK,EAAE,IAAI,CAAC,IAAI,EAChB,QAAQ,EAAC,kDAAkD,EAC3D,KAAK,EACJ,oBAAC,MAAM,IAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAE,QAAQ,4BAE/B,GAET,CACF,CACI,CACO,CACW,CAC1B,CAAA;KAAA,CAAC,CAAC;IAEH,KAAK,UAAU,QAAQ;QACtB,MAAM,SAAS;aACb,gBAAgB,CAAC;YACjB,IAAI,EAAE;gBACL,MAAM,EAAE,EAAE;aACV;YACD,KAAK,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;SACrD,CAAC;aACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9E,CAAC;AACF,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/corporate/pages/UnitCorporatePage/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC1F,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,WAAW,MAAM,oDAAoD,CAAC;AAC7E,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IAC9B,MAAM,EAAE,EAAE,EAAE,GAAG,SAAS,EAAkB,CAAC;IAE3C,MAAM,IAAI,GAAG,OAAO,CAAC,EAAG,CAAC,CAAC;IAC1B,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;IACzB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,gBAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAE/D,OAAO,OAAO,CAAC,GAAG,EAAE;;QAAC,OAAA,CACpB,oBAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK;YACpC,oBAAC,WAAW,IAAC,SAAS,EAAE,MAAM,CAAC,sBAAsB,CAAC;gBACrD,6BAAK,SAAS,EAAC,mBAAmB,IAChC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CACf,oBAAC,IAAI,OAAG,CACR,CAAC,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,WAAW,0CAAE,QAAQ,CAAC,WAAW,CAAC,EAAC,CAAC,CAAC,CAC7C,QAAQ,EAAG,CACX,CAAC,CAAC,CAAC,CACH,oBAAC,MAAM,IACN,MAAM,EAAC,KAAK,EACZ,KAAK,EAAE,IAAI,CAAC,IAAI,EAChB,QAAQ,EAAC,kDAAkD,EAC3D,KAAK,EACJ,oBAAC,MAAM,IAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAE,QAAQ,4BAE/B,GAET,CACF,CACI,CACO,CACW,CAC1B,CAAA;KAAA,CAAC,CAAC;IAEH,SAAS,QAAQ;QAChB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,UAAU,QAAQ;QACtB,MAAM,SAAS;aACb,gBAAgB,CAAC;YACjB,IAAI,EAAE;gBACL,MAAM,EAAE,EAAG;aACX;YACD,KAAK,EAAE,CAAC,KAAY,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;SACrD,CAAC;aACD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC9E,CAAC;AACF,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/es/modules/corporate/relationship/components/CorporateRelationshipChart/index.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="react" />
-declare const CorporateRelationshipChart: (props: {
-    onClick?: ((id: string) => void) | undefined;
-}) => JSX.Element;
-export default CorporateRelationshipChart;