Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

src/views/home/components/InitHome/index.vue

@@ -56,7 +56,10 @@ watch(
     () => user.userInfos,
     (val: any) => {
         // 超管默认综合管理视图
-        if (val.username === 'admin') selectValue.value = 'comprehensive';
+        if (val.username === 'admin') {
+            selectValue.value = 'comprehensive';
+            confirm();
+        }
     },
 );
 </script>

src/views/init-home/index.vue

@@ -134,12 +134,8 @@ const submitData = async () => {
  * 判断是否已有配置
  */
 const judgeInitSet = async () => {
-    if (userInfo.$state.userInfos.username === 'admin') {
+    const resp: any = await getInit();
-        const resp: any = await getInit();
+    if (resp.status === 200 && resp.result.length) {
-        if (resp.status === 200 && resp.result.length) {
-            window.location.href = '/';
-        }
-    } else {
         window.location.href = '/';
     }
 };

src/views/system/Department/components/AddDeviceOrProductDialog.vue

@@ -172,12 +172,16 @@ const confirm = () => {
         return message.warning('请先勾选数据');
     }
 
+    console.log('table.selectedRows: ', table.selectedRows);
     const params = table.selectedRows.map((item: any) => ({
         targetType: 'org',
         targetId: props.parentId,
         assetType: props.assetType,
         assetIdList: [item.id],
-        permission: item.selectPermissions,
+        // 保存时, 过滤没有的权限
+        permission: item.selectPermissions.filter((f: any) =>
+            item.permissionList.map((m: any) => m.value).includes(f),
+        ),
     }));
 
     // 分配产品资产后, 进入设备资产分配,默认查询第一个产品下的设备

src/views/system/Role/Detail/components/PermissTree.vue

@@ -98,7 +98,7 @@
 </template>
 
 <script setup lang="ts">
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep, uniqBy } from 'lodash-es';
 import { getPrimissTree_api } from '@/api/system/role';
 import { getCurrentInstance } from 'vue';
 const emits = defineEmits(['update:selectItems']);
@@ -156,7 +156,7 @@ const selectAllChange = () => {
             });
         }
     });
-    console.log('selectAllChange: ', flatTableData);
+    // console.log('selectAllChange: ', flatTableData);
     indeterminate.value = false;
     emits(
         'update:selectItems',
@@ -165,24 +165,25 @@ const selectAllChange = () => {
 };
 // 表头-批量设置
 const bulkShow = ref<boolean>(false);
-const bulkOptions = [
+const bulkOptions = ref();
-    {
+// const bulkOptions = [
-        label: '全部数据',
+//     {
-        value: 'ignore',
+//         label: '全部数据',
-    },
+//         value: 'ignore',
-    {
+//     },
-        label: '所在组织及下级组织',
+//     {
-        value: 'org-include-children',
+//         label: '所在组织及下级组织',
-    },
+//         value: 'org-include-children',
-    {
+//     },
-        label: '所在组织',
+//     {
-        value: 'org',
+//         label: '所在组织',
-    },
+//         value: 'org',
-    {
+//     },
-        label: '自己创建的',
+//     {
-        value: 'creator',
+//         label: '自己创建的',
-    },
+//         value: 'creator',
-];
+//     },
+// ];
 const bulkValue = ref<string>('');
 const bulkChange = () => {
     if (!bulkValue) return;
@@ -198,7 +199,7 @@ const bulkChange = () => {
             });
         }
     });
-    console.log('bulkChange: ', flatTableData);
+    // console.log('bulkChange: ', flatTableData);
     emits(
         'update:selectItems',
         flatTableData.filter((item) => item.granted),
@@ -396,6 +397,16 @@ function treeToSimple(treeData: tableItemType[]) {
         flatTableData.push(item);
         item.children && treeToSimple(item.children);
     });
+    // console.log('flatTableData: ', flatTableData);
+    // 根据所有权限, 取assetAccesses并集数据
+    let assets: any[] = [];
+    flatTableData?.forEach((item: any) => {
+        assets = [...assets, ...item.assetAccesses];
+    });
+    bulkOptions.value = uniqBy(assets, 'supportId')?.map((m: any) => ({
+        label: m.name,
+        value: m.supportId,
+    }));
 }
 /**
  * 设置子节点的状态

vite.config.ts

@@ -92,8 +92,8 @@ export default defineConfig(({ mode}) => {
               [env.VITE_APP_BASE_API]: {
                   // target: 'http://192.168.33.22:8800',
                   // target: 'http://192.168.32.244:8881',
-                  // target: 'http://120.77.179.54:8844', // 120测试
+                  target: 'http://120.77.179.54:8844', // 120测试
-                  target: 'http://192.168.33.46:8844', // 本地开发环境
+                //   target: 'http://192.168.33.46:8844', // 本地开发环境
                   ws: 'ws://192.168.33.46:8844',
                   changeOrigin: true,
                   rewrite: (path) => path.replace(/^\/api/, '')