Merge branch 'dev'

# Conflicts:
#	package.json

package.json

@@ -25,7 +25,7 @@
     "event-source-polyfill": "^1.0.31",
     "global": "^4.4.0",
     "jetlinks-store": "^0.0.3",
-    "jetlinks-ui-components": "^1.0.16",
+    "jetlinks-ui-components": "^1.0.18",
     "js-cookie": "^3.0.1",
     "less": "^4.1.3",
     "less-loader": "^11.1.0",

src/api/account/notificationRecord.ts

@@ -1,7 +1,7 @@
 import server from '@/utils/request'
 
 // 获取记录列表
-export const getList_api = (data: object): any => server.get(`/notifications/_query`, encodeParams(data))
+export const getList_api = (data: object): any => server.post(`/notifications/_query`, data)
 // 获取未读记录列表
 export const getListByUnRead_api = (data: object): any => server.post(`/notifications/_query`, data)
 // 修改记录状态

src/store/department.ts

@@ -2,7 +2,7 @@
 import { defineStore } from "pinia";
 
 type DepartmentStateType = {
-    productId: string;
+    productId?: string[];
     optType: string | undefined;
     crossPageKeys: string[];
     changedApis: any;
@@ -11,7 +11,7 @@ type DepartmentStateType = {
 export const useDepartmentStore = defineStore({
     id: 'department',
     state: (): DepartmentStateType => ({
-        productId: '',
+        productId: undefined,
         // 设备资产分配弹窗操作类型: 
         // 1. optType === 'handle': 手动点击资产分配按钮; 
         // 2. optType === ': 产品资产分配后, 自动弹出设备资产分配
@@ -20,7 +20,7 @@ export const useDepartmentStore = defineStore({
         changedApis: {},
     }),
     actions: {
-        setProductId(value: string) {
+        setProductId(value?: string[]) {
             this.productId = value;
         },
         setType(value: string | undefined) {

src/views/DataCollect/Collector/Tree/Save/index.vue

@@ -186,7 +186,7 @@ const endianData = computed(() => {
             if (endian === 'BIG') {
                 return endianIn === 'BIG' ? 'ABCD' : 'BADC';
             } else {
-                return endianIn === 'BIG' ? 'CDBA' : 'DCBA';
+                return endianIn === 'BIG' ? 'CDAB' : 'DCBA';
             }
         } else {
             return endian === 'BIG' ? 'ABCD' : 'DCBA';

src/views/account/NotificationRecord/index.vue

@@ -14,8 +14,9 @@
                 model="TABLE"
                 :params="queryParams"
                 :defaultParams="{
-                    'sorts[0].name': 'notifyTime',
+                  sorts: [{
-                    'sorts[0].order': 'desc',
+                    name: 'notifyTime', order: 'desc'
+                  }]
                 }"
             >
                 <template #topicProvider="slotProps">
@@ -95,6 +96,7 @@ import moment from 'moment';
 import { message } from 'ant-design-vue';
 import { useUserInfo } from '@/store/userInfo';
 import { useRouterParams } from '@/utils/hooks/useParams';
+import dayjs from 'dayjs'
 
 const { updateAlarm } = useUserInfo();
 const columns = [
@@ -132,7 +134,7 @@ const columns = [
         dataIndex: 'notifyTime',
         key: 'notifyTime',
         search: {
-            type: 'date',
+            type: 'date'
         },
         scopedSlots: true,
         ellipsis: true,

src/views/device/Product/Detail/DeviceAccess/accessModal.vue

@@ -130,6 +130,7 @@ import { queryList, getAccessConfig } from '@/api/device/product'
 import { message } from 'jetlinks-ui-components'
 import { useMenuStore } from '@/store/menu';
 import { getProductByPluginId } from '@/api/link/plugin'
+import { getProviders } from '@/api/link/accessConfig'
 
 type Emit = {
   (e: 'submit', data: any): void
@@ -219,6 +220,21 @@ const columns = [
       type: 'string',
     },
   },
+  {
+    title: '网关类型',
+    dataIndex: 'provider',
+    key: 'provider',
+    search: {
+      type: 'select',
+      options: () => {
+        return new Promise(resolve => {
+          getProviders().then(res => {
+            resolve(res.result?.map((item: any) => ({ ...item, label: item.name, value: item.id })) || [])
+          })
+        })
+      },
+    },
+  },
   {
     title: '状态',
     dataIndex: 'state',

src/views/device/Product/Save/index.vue

@@ -309,11 +309,13 @@ const submitData = () => {
         .validate()
         .then(async () => {
             // 新增
+          loading.value = true
             if (props.isAdd === 1) {
                 if (form.id === '') {
                     form.id = undefined;
                 }
                 const res = await addProduct(form);
+                loading.value = false
                 if (res.status === 200) {
                     message.success('保存成功！');
                     visible.value = false;
@@ -331,6 +333,7 @@ const submitData = () => {
                     ? form.classifiedName
                     : (form.classifiedName = '');
                 const res = await editProduct(form);
+                loading.value = false
                 if (res.status === 200) {
                     message.success('保存成功！');
                     emit('success');

src/views/link/AccessConfig/components/Plugin/index.vue

@@ -281,9 +281,7 @@ const pluginSearch = (val: string) => {
 }
 
 const AccessChange = (id: string) => {
-  if (!props.data.id) {
+  AccessCurrent.value = id;
-    AccessCurrent.value = id;
-  }
 };
 
 const addPlugin = () => {

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

@@ -3,9 +3,10 @@
         class="add-device-or-product-dialog-container"
         title="绑定"
         width="1440px"
+        :maskClosable="false"
         @ok="confirm"
         :confirmLoading="loading"
-        @cancel="emits('update:visible', false)"
+        @cancel="cancel"
         visible
     >
         <h5 class="row">
@@ -28,9 +29,9 @@
 
         <pro-search
             type="simple"
-            :columns="props.queryColumns"
+            :columns="searchColumns"
-            target="category"
+            target="category-bind-modal"
-            @search="(params:any)=>queryParams = {...params}"
+            @search="search"
         />
         <j-pro-table
             ref="tableRef"
@@ -175,7 +176,6 @@ const confirm = () => {
         return message.warning('请先勾选数据');
     }
 
-    console.log('table.selectedRows: ', table.selectedRows);
     const params = table.selectedRows.map((item: any) => ({
         targetType: 'org',
         targetId: props.parentId,
@@ -187,8 +187,8 @@ const confirm = () => {
         ),
     }));
 
-    // 分配产品资产后, 进入设备资产分配,默认查询第一个产品下的设备
+    // 分配产品资产后, 进入设备资产分配
-    departmentStore.setProductId(params[0].assetIdList[0]);
+    departmentStore.setProductId(table.selectedRows.map((item: any) => item.id));
 
     loading.value = true;
     bindDeviceOrProductList_api(props.assetType, params)
@@ -216,6 +216,26 @@ const columns = props.queryColumns.filter(
     (item) => item.dataIndex !== 'action',
 );
 
+const searchColumns = computed(() => {
+  return props.queryColumns.map(item => {
+    if (departmentStore.productId) {
+      if (item.dataIndex === 'productName') {
+        item.search.first = true
+        item.search.componentProps = {
+          mode: 'multiple',
+          "max-tag-count": "responsive"
+        }
+        item.search.defaultTermType = 'eq'
+        item.search.defaultOnceValue = departmentStore.productId
+
+      } else if (item.search && 'first' in item.search) {
+        delete item.search.first
+      }
+    }
+    return item
+  })
+})
+
 const queryParams = ref({});
 const table: any = {
     _selectedRowKeys: ref<string[]>([]), // 选中项的id
@@ -234,19 +254,6 @@ const table: any = {
                     // 启用批量设置
                     if (bulkBool.value) {
                         // 将已勾选的权限和批量设置的权限进行合并，并与自己可选的权限进行比对，取交集作为当前选中的权限
-                        // let newPermission = uniq([
-                        //     ...item.selectPermissions,
-                        //     ...bulkList.value,
-                        // ]);
-                        // const allPermissions = item.permissionList.map(
-                        //     (item: any) => item.value,
-                        // );
-                        // newPermission = intersection(
-                        //     newPermission,
-                        //     allPermissions,
-                        // );
-                        // item.selectPermissions = newPermission;
-
                         // fix: bug#10756
                         item.selectPermissions = n[1];
                         // 禁用单独勾选
@@ -390,99 +397,40 @@ const table: any = {
                         });
                     },
                 );
-                // getPermission_api(props.assetType, ids, parentId).then(
-                //     (perResp: any) => {
-                //         console.log('perResp: ', perResp);
-                //         console.log('props.allPermission: ', props.allPermission);
-                //         const permissionObj = {};
-                //         perResp.result.forEach((item: any) => {
-                //             permissionObj[item.assetId] = props.allPermission
-                //                 .filter((permission) =>
-                //                     item.allPermissions.includes(permission.id),
-                //                 )
-                //                 .map((item) => ({
-                //                     label: item.name,
-                //                     value: item.id,
-                //                     disabled: true,
-                //                 }));
-                //         });
-                //         data.forEach((item) => {
-                //             item.permissionList = permissionObj[item.id];
-                //             item.selectPermissions = ['read'];
-
-                //             // 产品的状态进行转换处理
-                //             if (props.assetType === 'product') {
-                //                 item.state = {
-                //                     value:
-                //                         item.state === 1
-                //                             ? 'online'
-                //                             : item.state === 0
-                //                             ? 'offline'
-                //                             : '',
-                //                     text:
-                //                         item.state === 1
-                //                             ? '正常'
-                //                             : item.state === 0
-                //                             ? '禁用'
-                //                             : '',
-                //                 };
-                //             }
-                //         });
-
-                //         resolve({
-                //             code: 200,
-                //             result: {
-                //                 data: data,
-                //                 pageIndex,
-                //                 pageSize,
-                //                 total,
-                //             },
-                //             status: 200,
-                //         });
-                //     },
-                // );
             });
         }),
     // 整理参数并获取数据
     requestFun: async (oParams: any) => {
         queryCount.value += 1;
         if (props.parentId) {
-            const terms = [
+            let terms = [{
-                {
+              column: 'id',
-                    terms: [
+              termType: 'dim-assets$not',
-                        {
+              value: {
-                            column: 'id',
+                assetType: props.assetType,
-                            termType: 'dim-assets$not',
+                targets: [
-                            value: {
+                  {
-                                assetType: props.assetType,
+                    type: 'org',
-                                targets: [
+                    id: props.parentId,
-                                    {
+                  },
-                                        type: 'org',
+                ],
-                                        id: props.parentId,
+              },
-                                    },
+              type: 'and'
-                                ],
+            }]
-                            },
-                        },
-                        {
-                            column: 'productId$product-info',
-                            type: 'and',
-                            value: `id is ${departmentStore.productId}`,
-                        },
-                    ],
-                },
-            ];
 
-            if (
+            // if (
-                props.assetType !== 'device' ||
+            //     props.assetType !== 'device' ||
-                !departmentStore.productId ||
+            //     !departmentStore.productId ||
-                queryCount.value > 1 ||
+            //     queryCount.value > 1 ||
-                departmentStore.optType === 'handle'
+            //     departmentStore.optType === 'handle'
-            ) {
+            // ) {
-                // 非设备|产品id不存在|有其他查询操作(queryCount+1)|设备页面手动点击资产分配, 均删除产品带入的id
+            //     // 非设备|产品id不存在|有其他查询操作(queryCount+1)|设备页面手动点击资产分配, 均删除产品带入的id
-                terms[0].terms.pop();
+            //     terms[0].terms.pop();
+            // }
+            if (oParams.terms && oParams.terms.length > 0) {
+              terms = [ ...oParams.terms, ...terms]
             }
-            if (oParams.terms && oParams.terms.length > 0)
+
-                terms.unshift({ terms: oParams.terms });
             const params = {
                 ...oParams,
                 sorts: [{ name: 'createTime', order: 'desc' }],
@@ -526,6 +474,15 @@ const selectChange = (keys: string[], rows: any[]) => {
     table.selectedRows = rows;
     table._selectedRowKeys.value = keys;
 };
+
+const cancel = () => {
+  departmentStore.setProductId()
+  emits('update:visible', false)
+}
+
+const search = (query: any) => {
+  queryParams.value = query
+}
 </script>
 
 <style lang="less" scoped>

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

@@ -2,6 +2,7 @@
     <j-modal
         visible
         :title="title"
+        :maskClosable="false"
         width="520px"
         @cancel="emits('update:visible', false)"
         @ok="confirm"
@@ -60,6 +61,7 @@ import {
     addDepartment_api,
     updateDepartment_api,
 } from '@/api/system/department';
+import { onlyMessage } from '@/utils/comm'
 
 type treeType = {
     id: string;
@@ -91,6 +93,7 @@ const confirm = () => {
         ?.validate()
         .then(() => form.submit())
         .then((resp: any) => {
+            onlyMessage('操作成功')
             emits('refresh', resp.result.id);
             emits('update:visible', false);
         })

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

@@ -4,6 +4,7 @@
         title="编辑"
         width="500px"
         @ok="confirm"
+        :maskClosable="false"
         :confirmLoading="loading"
         visible
         @cancel="emits('update:visible', false)"

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

@@ -32,7 +32,12 @@
                   :fieldNames="{ key: 'id' }"
               >
                   <template #title="{ name, data }">
-                      <span>{{ name }}</span>
+                    <div class='department-tree-item-content'>
+                      <span class='title'>
+                        <j-ellipsis>
+                          {{ name }}
+                        </j-ellipsis>
+                      </span>
                       <span class="func-btns" @click="(e) => e.stopPropagation()">
                           <PermissionButton
                               :hasPermission="`${permission}:update`"
@@ -72,6 +77,7 @@
                               <AIcon type="DeleteOutlined" />
                           </PermissionButton>
                       </span>
+                    </div>
                   </template>
               </jTree>
               <j-empty v-else description="暂无数据" />
@@ -215,13 +221,15 @@ const openDialog = (row: any = {}) => {
     dialog.selectItem = { ...row, sortIndex };
     dialog.visible = true;
 };
-init();
+
-function init() {
+const init = () => {
     getTree(save ? openDialog : undefined);
     watch(selectedKeys, (n) => {
         emits('change', n[0]);
     });
 }
+
+init();
 </script>
 
 <style lang="less" scoped>
@@ -246,17 +254,6 @@ function init() {
             flex: 1 1 auto;
 
             .ant-tree-title {
-                display: flex;
-                justify-content: space-between;
-                align-items: center;
-                .func-btns {
-                    display: none;
-                    font-size: 14px;
-                    .ant-btn-link {
-                        padding: 0 4px;
-                        height: 24px;
-                    }
-                }
                 &:hover {
                     .func-btns {
                         display: block;
@@ -271,6 +268,24 @@ function init() {
       overflow-y: auto;
       overflow-x: hidden;
 
+      .department-tree-item-content {
+        display: flex;
+        align-items: center;
+
+        .title {
+          width: calc(100% - 80px);
+        }
+        .func-btns {
+          display: none;
+          font-size: 14px;
+          width: 80px;
+          :deep(.ant-btn-link) {
+            padding: 0 4px;
+            height: 24px;
+          }
+        }
+      }
+
       .loading {
         display: flex;
         width: 100%;

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

@@ -4,23 +4,33 @@
         title="绑定"
         width="520px"
         @ok="handleOk"
+        :maskClosable="false"
         class="edit-dialog-container"
-        @cancel="emits('update:visible',false)"
+        @cancel="cancel"
     >
         是否继续分配产品下的具体设备
     </j-modal>
 </template>
 
 <script setup lang="ts">
-const emits = defineEmits(['confirm','update:visible']);
+import { useDepartmentStore } from 'store/department'
 
+const emits = defineEmits(['confirm','update:visible']);
+const departmentStore = useDepartmentStore();
 const props = defineProps<{
     visible: boolean;
 }>();
+
 const handleOk = () => {
     emits('confirm');
     emits('update:visible',false)
 };
+
+const cancel = () => {
+  departmentStore.setProductId()
+  emits('update:visible',false)
+}
+
 </script>
 
 <style scoped></style>

src/views/system/Department/device/index.vue

@@ -269,7 +269,7 @@ const columns = [
             rename: 'productId$product-info',
             type: 'select',
             handleValue(value: string) {
-                return `id is ${value}`;
+                return `id in ${value.toString()}`;
             },
             options: () =>
                 new Promise((resolve) => {

src/views/system/Department/product/index.vue

@@ -208,7 +208,7 @@
                 v-if="dialogs.addShow"
                 v-model:visible="dialogs.addShow"
                 :query-columns="columns"
-                :parent-id="props.parentId"
+                :parent-id="parentId"
                 :all-permission="tableData.permissionList"
                 asset-type="product"
                 @confirm="table.addConfirm"
@@ -218,7 +218,7 @@
                 v-model:visible="dialogs.editShow"
                 :ids="dialogs.selectIds"
                 :permission-list="dialogs.permissList"
-                :parent-id="props.parentId"
+                :parent-id="parentId"
                 :all-permission="tableData.permissionList"
                 asset-type="product"
                 @confirm="table.refresh"

src/views/system/Menu/Detail/BasicInfo.vue

@@ -317,17 +317,20 @@ const form = reactive({
                 };
                 form.sourceCode = resp.result.code;
             });
-        // 获取关联菜单
+
-        getMenuTree_api({ paging: false }).then((resp: any) => {
+        if (isNoCommunity) {
-            form.treeData = resp.result;
+          // 获取关联菜单
-        });
+          getMenuTree_api({ paging: false }).then((resp: any) => {
-        // 获取资产类型
+              form.treeData = resp.result;
-        getAssetsType_api().then((resp: any) => {
+          });
-            form.assetsType = resp.result.map((item: any) => ({
+          // 获取资产类型
-                label: item.name,
+          getAssetsType_api().then((resp: any) => {
-                value: item.id,
+              form.assetsType = resp.result.map((item: any) => ({
-            }));
+                  label: item.name,
-        });
+                  value: item.id,
+              }));
+          });
+        }
     },
     checkCode: async (_rule: Rule, value: string): Promise<any> => {
         if (!value) return Promise.reject('');

src/views/system/User/components/EditUserDialog.vue

@@ -2,6 +2,7 @@
     <j-modal
         visible
         :title="dialogTitle"
+        :maskClosable="false"
         width="675px"
         @ok="confirm"
         @cancel="emits('update:visible', false)"
@@ -97,7 +98,7 @@
                         <j-select
                             v-model:value="form.data.roleIdList"
                             mode="multiple"
-                            style="width: 100%"
+                            style="width: calc(100% - 40px)"
                             placeholder="请选择角色"
                             :options="form.roleOptions"
                         ></j-select>
@@ -115,7 +116,7 @@
                         <j-tree-select
                             v-model:value="form.data.orgIdList"
                             show-search
-                            style="width: 100%"
+                            style="width: calc(100% - 40px)"
                             placeholder="请选择组织"
                             :tree-data="form.departmentOptions"
                             :fieldNames="{ label: 'name', value: 'id' }"

vite.config.ts

@@ -94,9 +94,9 @@ export default defineConfig(({ mode}) => {
               [env.VITE_APP_BASE_API]: {
                   // target: 'http://192.168.32.226:8844',
                   // 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://120.77.179.54:8844',
+                  ws: 'ws://192.168.33.46:8844',
                   changeOrigin: true,
                   rewrite: (path) => path.replace(/^\/api/, '')
               }