fix: 组织管理及其他模块

config/proxy.ts

@@ -15,10 +15,10 @@ export default {
       // target: 'http://120.79.18.123:8844/',
       // ws: 'ws://120.79.18.123:8844/',
       // 测试环境
-      target: 'http://120.77.179.54:8844/',
-      ws: 'ws://120.77.179.54:8844/',
-      // target: 'http://192.168.32.65:8844/',
-      // ws: 'ws://192.168.32.65:8844/',
+      // target: 'http://120.77.179.54:8844/',
+      // ws: 'ws://120.77.179.54:8844/',
+      target: 'http://192.168.32.65:8844/',
+      ws: 'ws://192.168.32.65:8844/',
       //v2环境
       // ws: 'ws://47.109.52.230:8844',
       // target: 'http://47.109.52.230:8844',

src/components/ProTableCard/CardItems/device.tsx

@@ -57,13 +57,18 @@ export const ExtraDeviceCard = (props: DeviceCardProps) => {
 
   useEffect(() => {
     Store.subscribe('assets-device', (data: any) => {
+      if (data.delete && data.id === 'rest') {
+        setAssetKeys(['read']);
+      }
       if (data.isAll && data.bindKeys.includes(props.id)) {
         setAssetKeys(data.assets);
         setDisabled(true);
         disabledRef.current = true;
-      } else if (!data.isAll && data.bindKeys.includes(props.id)) {
+      } else if (!data.isAll && data.bindKeys?.includes(props.id)) {
         setDisabled(false);
         disabledRef.current = false;
+      } else if (!data.isAll && data.delete && props.id === data.id) {
+        setAssetKeys(['read']);
       } else {
         setDisabled(true);
         disabledRef.current = true;

src/components/ProTableCard/CardItems/product.tsx

@@ -117,6 +117,10 @@ export const ExtraProductCard = (props: ProductCardProps) => {
 
   useEffect(() => {
     Store.subscribe('assets-product', (data: any) => {
+      // console.log('-------',data)
+      if (data.delete && data.id === 'rest') {
+        setAssetKeys(['read']);
+      }
       if (data.isAll && data.bindKeys.includes(props.id)) {
         setAssetKeys(data.assets);
         setDisabled(true);

src/pages/device/Instance/Detail/Running/Property/index.tsx

@@ -130,7 +130,7 @@ const Property = (props: Props) => {
               <PermissionButton
                 type={'link'}
                 onClick={() => {
-                  setVisible(true);
+                  setIndicatorVisible(true);
                   setCurrentInfo(record);
                 }}
                 tooltip={{

src/pages/system/Department/Assets/deivce/bind.tsx

@@ -143,6 +143,10 @@ const Bind = observer((props: Props) => {
   const unSelect = () => {
     Models.bindKeys = [];
     AssetsModel.params = {};
+    Store.set('assets-device', {
+      delete: true,
+      id: 'rest',
+    });
   };
 
   const getSelectedRowsKey = (selectedRows: any) => {
@@ -211,6 +215,7 @@ const Bind = observer((props: Props) => {
         <Switch
           checkedChildren="开"
           unCheckedChildren="关"
+          defaultChecked={true}
           onChange={(e) => {
             setIsAll(e);
             Store.set('assets-device', {
@@ -334,7 +339,7 @@ const Bind = observer((props: Props) => {
               } else {
                 Models.bindKeys = Models.bindKeys.filter((item) => item !== record.id);
                 bindChecks.current.set(record.id, ['read']);
-                Store.set('assets-product', {
+                Store.set('assets-device', {
                   isAll: false,
                   id: record.id,
                   delete: true,

src/pages/system/Department/Assets/product/bind.tsx

@@ -171,6 +171,10 @@ const Bind = observer((props: Props) => {
   const unSelect = () => {
     Models.bindKeys = [];
     AssetsModel.params = {};
+    Store.set('assets-product', {
+      id: 'rest',
+      delete: true,
+    });
   };
 
   const getSelectedRowsKey = (selectedRows: any) => {
@@ -281,7 +285,6 @@ const Bind = observer((props: Props) => {
           // onReset={() => {
           //   // 重置分页及搜索参数
           //   actionRef.current?.reset?.();
-          //   setSearchParam({});
           // }}
           target="department-assets-product"
         />

src/pages/system/Platforms/Api/swagger-ui/base.tsx

@@ -131,21 +131,36 @@ export default observer(() => {
     return newEntity;
   };
 
-  const getResult = (name: string, oldName: string = '') => {
-    if (name === oldName) {
+  const getResult = (name: string, level = 1) => {
+    if (!ApiModel.components[name]) {
+      return [];
+    }
+    // console.log('level-------',level,name,oldName)
+
+    if (level >= 10) {
       // 禁止套娃
       return [];
     }
+    // debugger;
     const entity = cloneDeep(ApiModel.components[name].properties);
+    // console.log('entity---',entity,ApiModel.components[name])
+
     Object.keys(entity).forEach((key) => {
       const type = entity[key].type;
+      console.log('key', key);
+      // if(name===oldName) return;
+
       if ((entity[key].items && entity[key].items.$ref) || entity[key].$ref) {
         const _ref = entity[key].$ref || entity[key].items.$ref;
         const refName = _ref.split('/').pop();
+        // console.log('refName-----',refName,name,type)
+
         if (type === 'array') {
-          entity[key] = [getResult(refName, name)];
+          // console.log(entity[key])
+          entity[key] = [getResult(refName, level + 1)];
         } else {
-          entity[key] = getResult(refName, name);
+          entity[key] = getResult(refName, level + 1);
+          // console.log(entity[key])
         }
       } else if (type) {
         if (type.includes('integer')) {
@@ -157,6 +172,7 @@ export default observer(() => {
         }
       }
     });
+
     return entity;
   };
 
@@ -166,7 +182,6 @@ export default observer(() => {
     }
 
     const entity = cloneDeep(ApiModel.components[name].properties);
-    console.log(entity);
 
     const newArr: any[] = [];
     if (name === oldName) {
@@ -180,19 +195,15 @@ export default observer(() => {
         description: entity[key].description,
         type: type,
       };
-      // console.log(obj)
 
       if ((entity[key].items && entity[key].items.$ref) || entity[key].$ref) {
         const _ref = entity[key].$ref || entity[key].items.$ref;
         const refName = _ref.split('/').pop();
-        console.log(refName);
         if (refName) {
           obj.type = refName;
-          obj.children = handleResponseParam(refName, name);
+          // obj.children = handleResponseParam(refName, name);
         }
       }
-
-      console.log(obj);
       newArr.push(obj);
     });
     return newArr;
@@ -203,10 +214,10 @@ export default observer(() => {
     console.log('----', Object.keys(ApiModel.swagger.responses));
     Object.keys(ApiModel.swagger.responses).forEach((key) => {
       const refUrl = ObjectFindValue('$ref', ApiModel.swagger.responses[key]);
-      console.log('1-----', refUrl, ApiModel.swagger.responses[key]);
+      // console.log('1-----', refUrl, ApiModel.swagger.responses[key]);
       const _entityName = refUrl.split('/').pop();
 
-      console.log('2-------', _entityName);
+      // console.log('2-------', _entityName);
       newArr.push({
         code: key,
         description: ApiModel.swagger.responses[key].description,
@@ -215,7 +226,7 @@ export default observer(() => {
         result: key !== '400' ? getResult(_entityName) : {},
       });
     });
-    console.log(newArr);
+    // console.log(newArr);
     setResponseData(newArr);
   };