cfel-base-components 0.0.21 → 0.0.23

package/README.md

@@ -1,2 +1,2 @@
 <!-- npm run dev
-npm pubilsh -->
+npm publish -->

package/demo/src/index.jsx

@@ -24,9 +24,9 @@ const App = () => {
         // </Layout >
         <>
             
-            {/* <Account></Account> */}
+            <Account></Account>
 
-            <AccountInfo />
+            {/* <AccountInfo /> */}
             {/* <Role ></Role> */}
 
             {/* <RoleInfo/> */}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfel-base-components",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "cfel-base-components",
   "main": "/src/index.tsx",
   "types": "src/index.d.ts",

package/src/apiRequest/config.ts

@@ -2,8 +2,8 @@ import axios, { AxiosRequestHeaders } from 'axios';
 import { notification } from 'antd';
 
 
-let UMI_APP_BASEURL =  window.location.origin || process.env 
-const instance = axios.create({ baseURL: 'https://lios-iot-daily.chengfengerlai.com' });
+let UMI_APP_BASEURL:any =  window.location.origin || process.env 
+const instance = axios.create({ baseURL: UMI_APP_BASEURL });
 
 instance.interceptors.request.use(
   (config: any) => {

package/src/components/account/index.tsx

@@ -12,9 +12,13 @@ import { accountPage } from "./api"
 
 import "./index.scss"
 
+export interface AccountProps {
+  historyAction: any;
+}
 
-
-export default function Account() {
+export default function Account({
+  historyAction
+}:AccountProps) {
   const searchFormRef: any = useRef()
 
   useEffect(() => {
@@ -85,12 +89,14 @@ export default function Account() {
       fixed: 'right',
       width: 80,
       render: (rowdata: any) => (
-        <Space>
+         
+       <Space>
           <a
             onClick={() => {
-              let origin = window.location?.origin
-              let baseUrl = window.location?.pathname.slice(1).split('/')[0]
-              window.location.href =  `${origin}/${baseUrl}/account-info?id=${rowdata.id}`
+              historyAction?.push({
+                pathname: `/account-info`,
+                search: `?id=${rowdata.id}`,
+              });
             }}
           >
             配置

package/src/components/role/index.tsx

@@ -13,9 +13,13 @@ import { ProFormText, } from '@ant-design/pro-components';
 import { timeFormatter } from '../../utils';
 
 import "./index.scss"
+export interface RoleProps {
+  historyAction: any;
+}
 
-
-export default function Role() {
+export default function Role({
+  historyAction
+}:RoleProps) {
   const searchFormRef: any = useRef()
 
   useEffect(() => {
@@ -63,10 +67,11 @@ export default function Role() {
       width: 80,
       fixed: "right",
       render: (rowdata: any,) => <Space>
-        <a onClick={() => {
-          let origin = window.location?.origin
-          let baseUrl = window.location?.pathname.slice(1).split('/')[0]
-          window.location.href =  `${origin}/${baseUrl}/role-info?roleCode=${rowdata.roleCode}`
+        <a  onClick={() => {
+          historyAction?.push({
+            pathname: `/role-info`,
+            search: `?roleCode=${rowdata.roleCode}`,
+          });
         }}>赋予账号</a>
       </Space>
     },