fix(多租户): 多租户成员管理

选择了成员则只能编辑/查看成员的资产
jetlinks · Jun 18, 2020 · c7ffcc8 · c7ffcc8
1 parent 5a4d0ee
commit c7ffcc8
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/src/pages/system/tenant/components/assets/device/edit/add/index.tsx b/src/pages/system/tenant/components/assets/device/edit/add/index.tsx
@@ -7,6 +7,7 @@ import encodeQueryParam from "@/utils/encodeParam";
 interface Props {
     close: Function
     data: any
+    user: any
 }
 const Add = (props: Props) => {
     const service = new Service('tenant');
@@ -15,7 +16,7 @@ const Add = (props: Props) => {
     const [loading, setLoading] = useState<boolean>(true);
     const [userList, setUserList] = useState();
     const { data } = props;
-    const [checkedUserList, setCheckedUserList] = useState<string[]>([]);
+    const [checkedUserList, setCheckedUserList] = useState<string[]>([props.user]);
     const [selectedAssetsId, setSelectedAssetsId] = useState<string[]>([]);
 
     useEffect(() => {
@@ -25,6 +26,7 @@ const Add = (props: Props) => {
                     tenantId: data?.id,
                     assetType: 'device',
                     not: true,
+                    memberId: props.user,
                 })
             }
         })).subscribe(resp => {
@@ -79,6 +81,7 @@ const Add = (props: Props) => {
         >
             <Form.Item label="选择成员">
                 <Select
+                    value={checkedUserList}
                     mode="tags"
                     placeholder="选择成员"
                     onChange={(value: string[]) => { setCheckedUserList(value) }}

diff --git a/src/pages/system/tenant/components/assets/device/edit/index.tsx b/src/pages/system/tenant/components/assets/device/edit/index.tsx
@@ -10,6 +10,7 @@ import User from "./user";
 interface Props {
     close: Function;
     data: any;
+    user: any;
 }
 const Edit = (props: Props) => {
     const service = new Service('tenant');
@@ -25,6 +26,7 @@ const Edit = (props: Props) => {
                 id$assets: JSON.stringify({
                     tenantId: data?.id,
                     assetType: 'device',
+                    memberId: props.user,
                     // not: true,
                 })
             }
@@ -126,7 +128,9 @@ const Edit = (props: Props) => {
             </div>
             {add && (
                 <Add
-                    data={data} close={() => {
+                    user={props.user}
+                    data={data}
+                    close={() => {
                         setAdd(false);
                         handleSearch();
                     }} />

diff --git a/src/pages/system/tenant/components/assets/device/index.tsx b/src/pages/system/tenant/components/assets/device/index.tsx
@@ -62,7 +62,7 @@ const Device = (props: Props) => {
                                     id$assets: JSON.stringify({
                                         tenantId: data?.id,
                                         assetType: 'device',
-                                        // not: true,
+                                        memberId: props.user,
                                     })
                                 }
                             }
@@ -89,6 +89,7 @@ const Device = (props: Props) => {
             </Card>
             {visible && (
                 <Edit
+                    user={props.user}
                     data={data}
                     close={() => {
                         setVisible(false);

diff --git a/src/pages/system/tenant/components/assets/product/edit/add/index.tsx b/src/pages/system/tenant/components/assets/product/edit/add/index.tsx
@@ -7,6 +7,7 @@ import encodeQueryParam from "@/utils/encodeParam";
 interface Props {
     close: Function
     data: any
+    user: any
 }
 const Add = (props: Props) => {
     const service = new Service('tenant');
@@ -15,7 +16,7 @@ const Add = (props: Props) => {
     const [loading, setLoading] = useState<boolean>(true);
     const [userList, setUserList] = useState();
     const { data } = props;
-    const [checkedUserList, setCheckedUserList] = useState<string[]>([]);
+    const [checkedUserList, setCheckedUserList] = useState<string[]>([props.user]);
     const [selectedAssetsId, setSelectedAssetsId] = useState<string[]>([]);
 
     useEffect(() => {
@@ -93,6 +94,7 @@ const Add = (props: Props) => {
         >
             <Form.Item label="选择成员">
                 <Select
+                    value={checkedUserList}
                     mode="tags"
                     placeholder="选择成员"
                     onChange={(value: string[]) => { setCheckedUserList(value) }}

diff --git a/src/pages/system/tenant/components/assets/product/edit/index.tsx b/src/pages/system/tenant/components/assets/product/edit/index.tsx
@@ -10,6 +10,7 @@ import User from "./user";
 interface Props {
     close: Function;
     data: any;
+    user: any
 }
 const Edit = (props: Props) => {
     const service = new Service('tenant');
@@ -26,6 +27,7 @@ const Edit = (props: Props) => {
                 id$assets: JSON.stringify({
                     tenantId: data?.id,
                     assetType: 'product',
+                    memberId: props.user,
                     // not: true,
                 })
             }
@@ -117,17 +119,11 @@ const Edit = (props: Props) => {
                 >
                     关闭
                 </Button>
-                {/* <Button
-                    onClick={() => {
-                        // autzSetting();
-                    }}
-                    type="primary"
-                >
-                    保存
-                </Button> */}
             </div>
             {add && (
-                <Add data={data}
+                <Add
+                    user={props.user}
+                    data={data}
                     close={() => {
                         setAdd(false);
                         handleSearch();

diff --git a/src/pages/system/tenant/components/assets/product/index.tsx b/src/pages/system/tenant/components/assets/product/index.tsx
@@ -64,6 +64,7 @@ const Product = (props: Props) => {
                                     id$assets: JSON.stringify({
                                         tenantId: data?.id,
                                         assetType: 'product',
+                                        memberId: props.user,
                                         // not: true,
                                     })
                                 }
@@ -93,6 +94,7 @@ const Product = (props: Props) => {
 
                 <Edit
                     data={data}
+                    user={props.user}
                     close={() => {
                         setVisible(false);
                         getData();