cfel-base-components 0.0.22 → 0.0.24

package/README.md

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

package/demo/src/index.html

@@ -14,7 +14,7 @@
     <div id="root"></div>
     <script>
         window.g_config = {
-            token: "7718735d-6131-4d96-8e3e-b40e494cd98c",
+            token: "111f1bf4-600b-4e47-815b-b739d5398c91",
             tenant: {
                 id: 1674706582226763778,
                 corpId: "dingc9dbc42450ccf06e4ac5d6980864d335",

package/demo/src/index.jsx

@@ -26,10 +26,10 @@ const App = () => {
             
             {/* <Account></Account> */}
 
-            <AccountInfo />
+            {/* <AccountInfo /> */}
             {/* <Role ></Role> */}
 
-            {/* <RoleInfo/> */}
+            <RoleInfo/>
         </>
     );
 }

package/package.json

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

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>
     },

package/src/components/roleInfo/EditAccountDrawer/index.tsx

@@ -20,6 +20,7 @@ export default function index({
 
   useEffect(() => {
     form.resetFields()
+    if(open)queryByKeywordSearch('')
   }, [open])
 
   const editModelOpen = (type: boolean) => {

package/src/index.tsx

@@ -9,7 +9,7 @@ import Role from './components/role'
 import RoleInfo from './components/roleInfo'
 import request from './apiRequest/config'
 import iotRequest from './apiRequest/iotConfig'
-
+import { getUrlParams, downloadFile, timeFormatter } from './utils/index'
 export {
     LiosLayout,
     LiosLayoutlProps,
@@ -22,5 +22,8 @@ export {
     Role,
     RoleInfo,
     request,
-    iotRequest
+    iotRequest,
+    getUrlParams, 
+    downloadFile, 
+    timeFormatter
 }