Merge branch 'main_dev' into 'main'

fix:设备批量导入产品类型错误

See merge request yunteng/thingskit-front!1117

@@ -25,7 +25,7 @@ module.exports = defineConfig({
     'plugin:jest/recommended',
   ],
   rules: {
-    'no-console': 'error',
+    'no-console': ['error', { allow: ['warn', 'error'] }],
     'vue/script-setup-uses-vars': 'error',
     '@typescript-eslint/ban-ts-ignore': 'off',
     '@typescript-eslint/explicit-function-return-type': 'off',

@@ -51,6 +51,11 @@ enum DeviceManagerApi {
    * @description 通过设备列表获取设备信息
    */
   QUERY_DEVICES = '/device/get/devices',
+
+  /**
+   * @description 批量变更产品
+   */
+  BATCH_UPDATE_PRODUCT = '/device/batch/update',
 }
 
 export const devicePage = (params: DeviceQueryParam) => {
@@ -378,3 +383,13 @@ export const doBatchClearAlarm = (ids: string[]) => {
     { joinPrefix: false }
   );
 };
+
+export const doBatchUpdateProduct = (params: { deviceIds: string[]; deviceProfileId: string }) => {
+  return defHttp.post(
+    {
+      url: DeviceManagerApi.BATCH_UPDATE_PRODUCT,
+      data: params,
+    },
+    { joinPrefix: false }
+  );
+};

@@ -65,3 +65,19 @@ export interface ImportModelOfMatterType {
   tkDeviceProfileId?: string;
   categoryId?: string;
 }
+
+export interface ModelOfMatterItemRecordType {
+  id: string;
+  creator: string;
+  createTime: string;
+  enabled: boolean;
+  tenantId: string;
+  functionType: string;
+  functionName: string;
+  identifier: string;
+  extensionDesc: any;
+  accessMode: string;
+  functionJson: FunctionJson;
+  status: number;
+  deviceProfileId: string;
+}

@@ -2,6 +2,7 @@ import { BasicPageParams } from '../model/baseModel';
 import {
   GetModelTslParams,
   ImportModelOfMatterType,
+  ModelOfMatterItemRecordType,
   ModelOfMatterParams,
 } from './model/modelOfMatterModel';
 import { defHttp } from '/@/utils/http/axios';
@@ -36,7 +37,7 @@ export const getModelList = (
     id?: string;
   }
 ) => {
-  return defHttp.get({
+  return defHttp.get<ModelOfMatterItemRecordType[]>({
     url: `${ModelOfMatter.LIST}`,
     params,
   });

@@ -14,7 +14,6 @@ export function saveMenuApi(
   update = false,
   mode: ErrorMessageMode = 'modal'
 ) {
-  console.log(params);
   if (!update) {
     return defHttp.post<MenuOperationApiResult>(
       {

@@ -48,13 +48,21 @@
     <template #content>
       <section class="flex flex-wrap w-36">
         <table class="border-collapse" @click="handleSelectConfirm">
-          <tr v-for="row in MAX_ROW" :key="row" class="border border-gray-300 border-solid">
+          <tr
+            v-for="rowNumber in MAX_ROW"
+            :key="rowNumber"
+            class="border border-gray-300 border-solid"
+          >
             <td
-              v-for="col in MAX_COL"
-              :class="selectedLayout.col >= col && selectedLayout.row >= row ? 'bg-blue-500' : ''"
-              :key="col"
+              v-for="colNumber in MAX_COL"
+              :class="
+                selectedLayout.col >= colNumber && selectedLayout.row >= rowNumber
+                  ? 'bg-blue-500'
+                  : ''
+              "
+              :key="colNumber"
               class="w-4 h-4 border border-gray-300 border-solid cursor-pointer"
-              @mouseover="handleOver(row, col)"
+              @mouseover="handleOver(rowNumber, colNumber)"
             >
             </td>
           </tr>

@@ -77,7 +77,6 @@
             try {
               const data = e.target && e.target.result;
               const workbook = XLSX.read(data, { type: 'array' });
-              // console.log(workbook);
               /* DO SOMETHING WITH workbook HERE */
               const excelData = getExcelData(workbook);
               emit('success', excelData);

@@ -90,7 +90,7 @@
         () => {
           !unref(isFirstLoad) && fetch();
         },
-        { deep: true },
+        { deep: true }
       );
 
       async function fetch() {
@@ -110,6 +110,7 @@
           }
           emitChange();
         } catch (error) {
+          // eslint-disable-next-line no-console
           console.warn(error);
         } finally {
           loading.value = false;

@@ -156,6 +156,7 @@
       }
       emitChange();
     } catch (error) {
+      // eslint-disable-next-line no-console
       console.warn(error);
     } finally {
       loading.value = false;

@@ -54,7 +54,7 @@
       },
       // api params
       params: {
-        type: Object as PropType<Recordable>,
+        type: [Object, String, Number] as any,
         default: () => ({}),
       },
       // support xxx.xxx.xx

+<script setup lang="ts">
+  import { InputGroup, Button, Popconfirm } from 'ant-design-vue';
+  import { computed, ref, unref, watch } from 'vue';
+  import { componentMap } from '../componentMap';
+  import { ComponentType } from '../types';
+  import Icon from '/@/components/Icon';
+  import { PopConfirm } from '/@/components/Table';
+  import { upperFirst } from '/@/components/Transition/src/ExpandTransition';
+
+  const props = withDefaults(
+    defineProps<{
+      value?: number | string | Recordable | Recordable[];
+      component?: ComponentType;
+      componentProps?: Recordable;
+      disabled?: boolean;
+      changeEvent?: string;
+      valueField?: string;
+      defaultLockStatus?: boolean;
+      popconfirm?: Omit<PopConfirm, 'confirm' | 'cancel'>;
+    }>(),
+    {
+      changeEvent: 'change',
+      valueField: 'value',
+      disabled: false,
+      component: 'Input',
+      defaultLockStatus: true,
+      componentProps: () => ({}),
+    }
+  );
+
+  const slots = defineSlots<{
+    popconfirmTitle?: () => any;
+  }>();
+
+  const emits = defineEmits(['change']);
+
+  const ControlComponent = computed(() => componentMap.get(props.component));
+
+  const getControlComponentProps = computed(() => {
+    const { componentProps, changeEvent, component, valueField, value } = props;
+    const isCheck = component && ['Switch', 'Checkbox'].includes(component);
+    const eventKey = `on${upperFirst(changeEvent)}`;
+    return {
+      ...componentProps,
+      [eventKey]: (...args: Nullable<Recordable>[]) => {
+        const [e] = args;
+        if (componentProps?.[eventKey]) {
+          componentProps?.[eventKey](...args);
+        }
+        const target = e ? e.target : null;
+        const value = target ? (isCheck ? target.checked : target.value) : e;
+        emits('change', value);
+      },
+      [valueField]: value,
+    };
+  });
+
+  const popconfirmVisible = ref(false);
+
+  const confirm = () => {
+    controlDisableStatus.value = false;
+    popconfirmVisible.value = false;
+  };
+
+  const cancel = () => {
+    popconfirmVisible.value = false;
+  };
+
+  const getPopConfirmProps = computed(() => {
+    const { popconfirm } = props;
+
+    return {
+      ...popconfirm,
+      onConfirm: confirm,
+      onCancel: cancel,
+      onVisibleChange: () => {
+        if (!unref(controlDisableStatus)) {
+          popconfirmVisible.value = false;
+          controlDisableStatus.value = true;
+          return;
+        }
+      },
+      title: slots.popconfirmTitle ? slots.popconfirmTitle : popconfirm?.title,
+    };
+  });
+
+  const controlDisableStatus = ref(props.defaultLockStatus);
+
+  watch(
+    () => props.defaultLockStatus,
+    (target) => {
+      controlDisableStatus.value = !!target;
+    },
+    { immediate: true }
+  );
+</script>
+
+<template>
+  <InputGroup compact class="w-full !flex">
+    <ControlComponent
+      v-bind="getControlComponentProps"
+      class="flex-auto"
+      :disabled="controlDisableStatus"
+    />
+    <Popconfirm v-model:visible="popconfirmVisible" v-bind="getPopConfirmProps">
+      <Button type="primary" :disabled="disabled">
+        <Icon
+          :icon="controlDisableStatus ? 'ant-design:lock-outlined' : 'ant-design:unlock-outlined'"
+        />
+      </Button>
+    </Popconfirm>
+  </InputGroup>
+</template>

@@ -113,7 +113,7 @@
   const { TabPane } = Tabs;
   const { prefixCls } = useDesign('easy-cron-inner');
   provide('prefixCls', prefixCls);
-  const emit = defineEmits([...cronEmits]);
+  const emit = defineEmits(cronEmits);
   const props = defineProps({ ...cronProps });
   const activeKey = ref(props.hideSecond ? 'minute' : 'second');
   const second = ref('*');
@@ -236,7 +236,7 @@
     if (/^[0-7]$/.test(week)) {
       return convert(week);
     } else if (patten1.test(week)) {
-      return week.replace(patten1, ($0, before, separator, after) => {
+      return week.replace(patten1, (_$0, before, separator, after) => {
         if (separator === '/') {
           return convert(before) + separator + after;
         } else {

@@ -23,8 +23,8 @@
 
   export default defineComponent({
     name: 'EasyCronModal',
-    inheritAttrs: false,
     components: { BasicModal, EasyCron, Button },
+    inheritAttrs: false,
     setup() {
       const attrs = useAttrs();
       const [registerModal, { closeModal }] = useModalInner();

@@ -45,7 +45,7 @@ export function useTabSetup(props, context, options) {
 
   // 根据不同的类型计算出的value
   const computeValue = computed(() => {
-    let valueArray: any[] = [];
+    const valueArray: any[] = [];
     switch (type.value) {
       case TypeEnum.unset:
         valueArray.push('?');
@@ -79,7 +79,7 @@ export function useTabSetup(props, context, options) {
   });
   // 指定值范围区间，介于最小值和最大值之间
   const specifyRange = computed(() => {
-    let range: number[] = [];
+    const range: number[] = [];
     if (maxValue.value != null) {
       for (let i = minValue.value; i <= maxValue.value; i++) {
         range.push(i);

@@ -143,4 +143,5 @@ export type ComponentType =
   | 'ConditionFilter'
   | 'TimeRangePicker'
   | 'TriggerDurationInput'
-  | 'AlarmProfileSelect';
+  | 'AlarmProfileSelect'
+  | 'LockControlGroup';

@@ -44,7 +44,7 @@
     </ModalWrapper>
 
     <template #[item]="data" v-for="item in Object.keys(omit($slots, 'default'))">
-      <slot :name="item" v-bind="data"></slot>
+      <slot :name="item" v-bind="data || {}"></slot>
     </template>
   </Modal>
 </template>

@@ -159,7 +159,7 @@
           }
           emit('height-change', unref(realHeightRef));
         } catch (error) {
-          console.log(error);
+          console.error(error);
         }
       }
 

@@ -207,7 +207,6 @@
       });
 
       function handleSearch(searchValue: string) {
-        console.log('searchValue', searchValue);
         if (searchValue !== searchText.value) searchText.value = searchValue;
         emit('update:searchValue', searchValue);
         if (!searchValue) {

@@ -202,7 +202,6 @@
             error: null,
           };
         } catch (e) {
-          console.log(e);
           item.status = UploadResultStatus.ERROR;
           return {
             success: false,

@@ -16,8 +16,6 @@
   import { computed, defineComponent, unref, ref } from 'vue';
   import { Layout } from 'ant-design-vue';
 
-  import { GithubFilled } from '@ant-design/icons-vue';
-
   import { DOC_URL, GITHUB_URL, SITE_URL } from '/@/settings/siteSetting';
   import { openWindow } from '/@/utils';
 
@@ -29,7 +27,7 @@
 
   export default defineComponent({
     name: 'LayoutFooter',
-    components: { Footer: Layout.Footer, GithubFilled },
+    components: { Footer: Layout.Footer },
     setup() {
       const { t } = useI18n();
       const { getShowFooter } = useRootSetting();

@@ -148,7 +148,6 @@
 
       function renderMenu() {
         const { menus, ...menuProps } = unref(getCommonProps);
-        // console.log(menus);
         if (!menus || !menus.length) return null;
         return !props.isHorizontal ? (
           <SimpleMenu {...menuProps} isSplitMenu={unref(getSplit)} items={menus} />

@@ -100,7 +100,7 @@ export default defineComponent({
         <>
           <TypePicker
             menuTypeList={menuTypeList}
-            handler={(item: typeof menuTypeList[0]) => {
+            handler={(item: (typeof menuTypeList)[0]) => {
               baseHandler(HandlerEnum.CHANGE_LAYOUT, {
                 mode: item.mode,
                 type: item.type,

@@ -47,7 +47,7 @@ export function initAppConfigStore() {
     grayMode && updateGrayMode(grayMode);
     colorWeak && updateColorWeak(colorWeak);
   } catch (error) {
-    console.log(error);
+    console.error(error);
   }
   appStore.setProjectConfig(projCfg);
 

@@ -4,7 +4,6 @@ import { defineStore } from 'pinia';
 
 import { LOCK_INFO_KEY } from '/@/enums/cacheEnum';
 import { Persistent } from '/@/utils/cache/persistent';
-import { useUserStore } from './user';
 
 interface LockState {
   lockInfo: Nullable<LockInfo>;

@@ -111,7 +111,6 @@ export const usePermissionStore = defineStore({
        * 否则不是超级管理员-获取对应角色的权限列表
        */
       const codeList = await getPermCode();
-      // console.log('codeList', codeList);
       this.setPermCodeList(codeList);
       /**
        * 如果是超级管理员则获取对应权限列表

@@ -234,7 +234,6 @@ export const useUserStore = defineStore({
       // try {
       //   await doLogout();
       // } catch {
-      //   console.log('注销Token失败');
       // }
       // this.resetState();
       // setAuthCache(JWT_TOKEN_KEY, undefined);

@@ -85,9 +85,7 @@
       /^[1](([3][0-9])|([4][0,1,4-9])|([5][0-3,5-9])|([6][2,5,6,7])|([7][0-8])|([8][0-9])|([9][0-3,5-9]))[0-9]{8}$/;
     if (reg.test(formData.mobile)) {
       const sendRes = await passwordResetCode(formData.mobile);
-      console.log(sendRes);
       if (sendRes === '') {
-        console.log('发送成功了');
         return true;
       }
       return false;

@@ -99,6 +99,5 @@
   async function handleRegister() {
     const data = await validForm();
     if (!data) return;
-    console.log(data);
   }
 </script>

@@ -27,7 +27,6 @@
   onMounted(() => {
     // 记录当前的UserId
     userId.value = userStore.getUserInfo?.userId;
-    console.log('Mounted', userStore.getUserInfo);
   });
 
   onBeforeUnmount(() => {

@@ -11,8 +11,7 @@
  */
 export function simpleDebounce(fn, delay = 100) {
   let timer: any | null = null;
-  return function () {
-    let args = arguments;
+  return function (...args) {
     if (timer) {
       clearTimeout(timer);
     }
@@ -61,4 +60,3 @@ export function dateFormat(date, block) {
   });
   return format;
 }
-

@@ -36,7 +36,6 @@ export function checkStatus(
       }
       break;
     case 403:
-      // console.log('403', errMessage);
       // errMessage = t('sys.api.errMsg403');
       errMessage = errMessage;
       break;

@@ -8,7 +8,6 @@ export function listToTree(lists: getMenuListResultModel): getMenuListResultMode
   lists.forEach((goods) => {
     goods['menuName'] = t(goods.meta.title); // 为goods添加属性menuName
 
-    // console.log(goods.children?.length);
     if (goods.children?.length) {
       listToTree(goods.children);
       // goods.children.forEach((goodChildren) => {

@@ -102,8 +102,7 @@
               avatar: [{ uid: buildUUID(), name: 'name', url: data.record.avatar } as FileItem],
             });
           }
-          const { avatar, ...params } = data.record;
-          console.log(avatar);
+          const { ...params } = data.record;
           await setFieldsValue({ ...params });
         } else {
           editId.value = '';

@@ -82,11 +82,11 @@
 </script>
 
 <template>
-  <section class="flex">
-    <ApiTreeSelect v-bind="getBindProps" />
-    <Button v-if="getShowCreate" type="link" @click="handleOpenCreate" :disabled="disabled"
-      >新增组织</Button
-    >
+  <section class="!flex">
+    <ApiTreeSelect v-bind="getBindProps" class="flex-auto" />
+    <Button v-if="getShowCreate" type="link" @click="handleOpenCreate" :disabled="disabled">
+      新增组织
+    </Button>
     <OrganizationDrawer v-if="getShowCreate" @register="registerDrawer" @success="handleReload" />
   </section>
 </template>

@@ -337,7 +337,6 @@
       }
     },
     onDisconnected() {
-      console.log('断开连接了');
       close();
     },
   });

@@ -354,7 +354,6 @@
       }
     },
     onDisconnected() {
-      console.log('断开连接了');
       close();
     },
   });

@@ -75,9 +75,7 @@ export const formSchema: FormSchema[] = [
           }
         },
         // showUploadList: true,
-        onDownload(file) {
-          console.log(file);
-        },
+        onDownload() {},
         onPreview: (fileList: FileItem) => {
           createImgPreview({ imageList: [fileList.url!] });
         },

@@ -153,7 +153,7 @@
       <template #renderItem="{ item }: BasicCardListRenderItem<BigScreenCenterItemsModel>">
         <Card
           :style="{
-            '--viewType': item.viewType === ViewType.PUBLIC_VIEW ? '#1890ff' : '#faad14',
+            '--viewType': item.viewType === ViewType.PUBLIC_VIEW ? '#faad14' : '#1890ff',
           }"
           class="card-container"
         >

@@ -192,7 +192,6 @@
         getRestData.value = resp;
         commonRest(resp, jsonEditorRef.value?.setJsonValue);
       } catch (e) {
-        console.log(e);
         if (Object.prototype.toString.call(e) === '[object Object]') {
           jsonEditorRef.value?.setJsonValue(e);
         } else {

@@ -61,7 +61,7 @@ export const useUtils = () => {
         }
       }
     } catch (e) {
-      console.log(`Post没有传递params${e}`);
+      console.error(`Post没有传递params${e}`);
     }
     return _result.join('&');
   };

 import { FormProps, FormSchema, useComponentRegister } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { deviceProfile, getGatewayDevice } from '/@/api/device/deviceManager';
+import { getGatewayDevice, queryDeviceProfileBy } from '/@/api/device/deviceManager';
 import { TransportTypeEnum } from '../../profiles/components/TransportDescript/const';
 import { JSONEditorValidator } from '/@/components/CodeEditor/src/JSONEditor';
 import { JSONEditor } from '/@/components/CodeEditor';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { getModelServices } from '/@/api/device/modelOfMatter';
 import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
-import { nextTick, toRaw, unref } from 'vue';
+import { h, nextTick, toRaw, unref } from 'vue';
 import ObjectModelValidateForm from '/@/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
 import { CommandDeliveryWayEnum, ServiceCallTypeEnum } from '/@/enums/toolEnum';
 import { TaskTypeEnum } from '/@/views/task/center/config';
@@ -18,9 +18,13 @@ import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter
 
 import { getOrganizationList } from '/@/api/system/system';
 import { copyTransFun } from '/@/utils/fnUtils';
+import LockControlGroup from '/@/components/Form/src/components/LockControlGroup.vue';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 
 useComponentRegister('JSONEditor', JSONEditor);
 useComponentRegister('ObjectModelValidateForm', ObjectModelValidateForm);
+useComponentRegister('LockControlGroup', LockControlGroup);
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 
 export enum TypeEnum {
   IS_GATEWAY = 'GATEWAY',
@@ -30,6 +34,17 @@ export enum TypeEnum {
 export const isGateWay = (type: string) => {
   return type === TypeEnum.IS_GATEWAY;
 };
+
+const updateProductHelpMessage = [
+  '注意：',
+  '修改设备产品时，如果"大屏"、"组态"、"看板"、"场景联动"、"数据流转"等有关联设备，请自行调整并保存。',
+];
+
+const updateOrgHelpMessage = [
+  '注意:',
+  '1、修改设备组织时，如果"大屏"、"组态"、"看板"、"场景联动"、"数据流转"等有关联设备，请自行调整并保存。',
+  '2、网关设备在修改组织时，其关联网关子设备组织归属于网关组织及以下不用修改，否则将同步更新网关子设备组织为网关组织。',
+];
 // 第一步的表单
 export const step1Schemas: FormSchema[] = [
   {
@@ -96,43 +111,60 @@ export const step1Schemas: FormSchema[] = [
     show: false,
   },
   {
+    field: 'isUpdate',
+    label: '编辑模式',
+    component: 'Switch',
+    show: false,
+  },
+  {
     field: 'profileId',
     label: '所属产品',
     required: true,
-    component: 'ApiSelect',
+    component: 'LockControlGroup',
+    helpMessage: updateProductHelpMessage,
+    renderComponentContent: () => ({
+      popconfirmTitle: () =>
+        updateProductHelpMessage.map((text) => h('div', { style: { maxWidth: '200px' } }, text)),
+    }),
     componentProps: ({ formActionType, formModel }) => {
       const { setFieldsValue } = formActionType;
       return {
-        api: async () => {
-          const options = await deviceProfile();
-          const { profileId } = formModel;
-          if (profileId) {
-            const selectRecord = options.find((item) => item.tbProfileId === profileId);
-            selectRecord && setFieldsValue({ transportType: selectRecord!.transportType });
-          }
-          return options;
-        },
-        labelField: 'name',
-        valueField: 'tbProfileId',
-        onChange(
-          _value: string,
-          option: { deviceType: string; transportType: string; id: string }
-        ) {
-          const { deviceType, transportType, id } = option;
-          setFieldsValue({
-            deviceType: deviceType,
-            transportType,
-            deviceProfileId: id,
-            gatewayId: null,
-            codeType: transportType === TransportTypeEnum.TCP ? TaskTypeEnum.MODBUS_RTU : null,
-            code: null,
-            addressCode: null,
-          });
+        component: 'ApiSelect',
+        defaultLockStatus: !!formModel?.isUpdate,
+        componentProps: {
+          api: async () => {
+            const options = await queryDeviceProfileBy({
+              deviceType: formModel?.isUpdate ? formModel?.deviceType : null,
+            });
+            const { profileId } = formModel;
+            if (profileId) {
+              const selectRecord = options.find((item) => item.tbProfileId === profileId);
+              selectRecord && setFieldsValue({ transportType: selectRecord!.transportType });
+            }
+            return options;
+          },
+          labelField: 'name',
+          valueField: 'tbProfileId',
+          onChange(
+            _value: string,
+            option: { deviceType: string; transportType: string; id: string }
+          ) {
+            const { deviceType, transportType, id } = option;
+            setFieldsValue({
+              deviceType: deviceType,
+              transportType,
+              deviceProfileId: id,
+              gatewayId: null,
+              codeType: transportType === TransportTypeEnum.TCP ? TaskTypeEnum.MODBUS_RTU : null,
+              code: null,
+              addressCode: null,
+            });
+          },
+          showSearch: true,
+          placeholder: '请选择产品',
+          filterOption: (inputValue: string, option: Record<'label' | 'value', string>) =>
+            option.label.includes(inputValue),
         },
-        showSearch: true,
-        placeholder: '请选择产品',
-        filterOption: (inputValue: string, option: Record<'label' | 'value', string>) =>
-          option.label.includes(inputValue),
       };
     },
   },
@@ -311,9 +343,19 @@ export const step1Schemas: FormSchema[] = [
   {
     field: 'organizationId',
     label: '所属组织',
-    component: 'Select',
+    component: 'LockControlGroup',
     required: true,
-    slot: 'addOrg',
+    helpMessage: updateOrgHelpMessage,
+    renderComponentContent: () => ({
+      popconfirmTitle: () =>
+        updateOrgHelpMessage.map((text) => h('div', { style: { maxWidth: '240px' } }, text)),
+    }),
+    componentProps: ({ formModel }) => {
+      return {
+        component: 'OrgTreeSelect',
+        defaultLockStatus: !!formModel?.isUpdate,
+      };
+    },
   },
   {
     field: 'label',

@@ -7,6 +7,63 @@ import { h } from 'vue';
 import { Tag, Tooltip } from 'ant-design-vue';
 import { handeleCopy } from '../../profiles/step/topic';
 
+export enum DeviceListAuthEnum {
+  /**
+   * @description 新增
+   */
+  CREATE = 'api:yt:device:post',
+
+  /**
+   * @description 删除
+   */
+  DELETE = 'api:yt:device:delete',
+
+  /**
+   * @description 编辑
+   */
+  UPDATE = 'api:yt:device:update',
+
+  /**
+   * @description 详情
+   */
+  DETAIL = 'api:yt:device:get',
+
+  /**
+   * @description 导入
+   */
+  IMPORT = 'api:yt:device:import',
+
+  /**
+   * @description 公开
+   */
+  PUBLIC = 'api:yt:device:public',
+
+  /**
+   * @description 上下线
+   */
+  ONLINE = 'api:yt:device:online:record',
+
+  /**
+   * @description 管理设备凭证
+   */
+  EQUIPMENT = 'api:yt:device:equipment',
+
+  /**
+   * @description 分配客户
+   */
+  ASSIGN = 'api:yt:device:assign',
+
+  /**
+   * @description 命令下发
+   */
+  RPC = 'api:yt:device:rpc',
+
+  /**
+   * @description 更新产品
+   */
+  UPDATE_PRODUCT = 'api:yt:device:update:product',
+}
+
 // 表格列数据
 export const columns: BasicColumn[] = [
   {

@@ -10,6 +10,7 @@
     ...basicProps,
     value: {
       required: true,
+      type: Object,
     },
   });
 

+import { getDeviceProfile } from '/@/api/alarm/position';
+import { FormSchema } from '/@/components/Form';
+
+enum FormFieldsEnum {
+  DEVICE_TYPE = 'deviceType',
+  SOURCE_DEVICE_PROFILE_ID = 'sourceDeviceProfileName',
+  TARGET_DEVICE_PROFILE_ID = 'deviceProfileId',
+}
+
+export type FormGetFiledValueResultType = Record<FormFieldsEnum, string>;
+
+export const formSchemas: FormSchema[] = [
+  {
+    field: FormFieldsEnum.SOURCE_DEVICE_PROFILE_ID,
+    component: 'Input',
+    label: '源产品',
+    dynamicDisabled: true,
+    required: true,
+  },
+  {
+    field: FormFieldsEnum.DEVICE_TYPE,
+    label: '设备类型',
+    component: 'Input',
+    show: false,
+  },
+  {
+    field: FormFieldsEnum.TARGET_DEVICE_PROFILE_ID,
+    component: 'ApiSelect',
+    label: '目标产品',
+    required: true,
+    componentProps: ({ formModel }) => {
+      return {
+        api: getDeviceProfile,
+        params: formModel[FormFieldsEnum.DEVICE_TYPE],
+        labelField: 'name',
+        valueField: 'tbProfileId',
+        placeholder: '请选择目标产品',
+        getPopupContainer: () => document.body,
+      };
+    },
+  },
+];

+export { default as BatchUpdateProductModal } from './index.vue';
+
+export type BatchUpdateProductModalParamsType = ModalParamsType<
+  Record<'sourceDeviceProfileName' | 'deviceType', string> & Record<'deviceIds', string[]>
+>;

+<script setup lang="ts">
+  import { ref, unref } from 'vue';
+  import { BatchUpdateProductModalParamsType } from '.';
+  import { FormGetFiledValueResultType, formSchemas } from './config';
+  import { doBatchUpdateProduct } from '/@/api/device/deviceManager';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import Icon from '/@/components/Icon';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const emits = defineEmits(['register', 'success']);
+
+  const deviceIds = ref<string[]>([]);
+  const [registerForm, { validate, getFieldsValue, setFieldsValue, resetFields }] = useForm({
+    layout: 'vertical',
+    showActionButtonGroup: false,
+    schemas: formSchemas,
+  });
+
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(
+    async ({ record }: BatchUpdateProductModalParamsType) => {
+      resetFields();
+      deviceIds.value = record.deviceIds;
+      setFieldsValue(record);
+    }
+  );
+
+  const { createMessage } = useMessage();
+  const handleOk = async () => {
+    try {
+      await validate();
+      setModalProps({ loading: true, confirmLoading: true });
+
+      const result = getFieldsValue() as FormGetFiledValueResultType;
+
+      await doBatchUpdateProduct({
+        deviceIds: unref(deviceIds),
+        deviceProfileId: result.deviceProfileId,
+      });
+
+      createMessage.success('操作成功');
+
+      closeModal();
+      emits('success');
+    } finally {
+      setModalProps({ loading: false, confirmLoading: false });
+    }
+  };
+</script>
+
+<template>
+  <BasicModal @register="registerModal" @ok="handleOk">
+    <template #title>
+      <div>批量更新产品</div>
+      <div class="mt-4 font-normal text-sm">
+        <Icon icon="ant-design:info-circle-outlined" />
+        <span>
+          注意：修改设备产品时只能修改为同类型产品，如果"大屏"、"组态"、"看板"、"场景联动"、"数据流转"等有关联设备，请自行调整并保存。
+        </span>
+      </div>
+    </template>
+    <!-- <template #title>
+      <span></span> 
+    </template> -->
+    <BasicForm @register="registerForm" />
+  </BasicModal>
+</template>

@@ -20,7 +20,7 @@
         @next="handleStep1Next"
         ref="DeviceStep1Ref"
         v-show="current === 0"
-        :isUpdate="!isUpdate"
+        :isUpdate="isUpdate"
       />
       <DeviceStep2
         ref="DeviceStep2Ref"
@@ -33,7 +33,7 @@
   </BasicModal>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, computed, unref } from 'vue';
+  import { defineComponent, ref, computed, unref, nextTick } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { createOrEditDevice } from '/@/api/device/deviceManager';
   import DeviceStep1 from '../step/DeviceStep1.vue';
@@ -60,16 +60,17 @@
       const DeviceStep2Ref = ref<InstanceType<typeof DeviceStep2>>();
       const { createMessage } = useMessage();
       const current = ref(0);
-      const isUpdate = ref<Boolean>(false);
+      const isUpdate = ref(false);
       const deviceInfo = ref({});
       let currentDeviceData = {} as Recordable;
       const getTitle = computed(() => (!unref(isUpdate) ? '新增设备' : '编辑设备'));
       // 所有参数
       let stepState = ref();
       // 编辑回显
-      const [register, { closeModal, setModalProps }] = useModalInner((data) => {
+      const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
         setModalProps({ confirmLoading: false, loading: true });
         isUpdate.value = data?.isUpdate;
+        await nextTick();
         if (unref(isUpdate)) {
           const { record } = data;
           currentDeviceData = record;

@@ -2,26 +2,6 @@
   <div class="step1">
     <div class="step1-form">
       <BasicForm @register="register">
-        <template #addOrg="{ model, field }">
-          <div style="display: flex; align-items: center">
-            <div style="width: 245px">
-              <a-tree-select
-                @change="handleTreeOrg"
-                v-model:value="model[field]"
-                show-search
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                placeholder="请选择组织"
-                allow-clear
-                tree-default-expand-all
-                :tree-data="model?.['organizationList'] || treeData"
-              />
-            </div>
-            <div>
-              <a-button type="link" @click="handleOpenOrgDrawer">新增组织</a-button>
-            </div>
-          </div>
-        </template>
         <template #snCode="{ model, field }">
           <div class="flex">
             <Input :maxlength="36" v-model:value="model[field]" placeholder="请输入设备名称" />
@@ -36,7 +16,7 @@
           </Input>
         </template>
       </BasicForm>
-      <div class="flex justify-center" v-if="isUpdate">
+      <div class="flex justify-center" v-if="!isUpdate">
         <a-button type="primary" @click="nextStep">下一步</a-button>
       </div>
     </div>
@@ -91,11 +71,10 @@
         </Spin>
       </div>
     </Modal>
-    <DeptDrawer @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, nextTick, unref, reactive, toRefs, onMounted } from 'vue';
+  import { defineComponent, ref, nextTick, unref, reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { step1Schemas } from '../../config/data';
   import { useScript } from '/@/hooks/web/useScript';
@@ -109,8 +88,6 @@
   import { validatorLongitude, validatorLatitude } from '/@/utils/rules';
   import { getOrganizationList } from '/@/api/system/system';
   import { copyTransFun } from '/@/utils/fnUtils';
-  import { useDrawer } from '/@/components/Drawer';
-  import DeptDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
   import { TaskTypeEnum } from '/@/views/task/center/config';
   import { toRaw } from 'vue';
   import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
@@ -129,7 +106,6 @@
       FormItem: Form.Item,
       Row,
       Col,
-      DeptDrawer,
       Spin,
     },
     props: {
@@ -152,16 +128,7 @@
         copyTransFun(data as any as any[]);
         orgData.treeData = data;
       };
-      onMounted(async () => {
-        await getOrganizationListFunc();
-      });
-      const { treeData } = toRefs(orgData);
-      const [registerModal, { openDrawer }] = useDrawer();
-      const handleOpenOrgDrawer = () => {
-        openDrawer(true, {
-          isUpdate: false,
-        });
-      };
+
       const handleSuccess = async () => {
         await getOrganizationListFunc();
       };
@@ -178,27 +145,18 @@
       const devicePic = ref('');
       const loading = ref(false);
 
-      const [
-        register,
-        {
-          validate,
-          resetFields,
-          setFieldsValue,
-          getFieldsValue,
-          updateSchema,
-          clearValidate,
-          validateFields,
-        },
-      ] = useForm({
-        labelWidth: 140,
-        schemas: step1Schemas,
-        actionColOptions: {
-          span: 14,
-        },
-        labelAlign: 'right',
-        showResetButton: false,
-        showSubmitButton: false,
-      });
+      const [register, { validate, resetFields, setFieldsValue, getFieldsValue, updateSchema }] =
+        useForm({
+          labelWidth: 140,
+          schemas: step1Schemas,
+          actionColOptions: {
+            span: 14,
+          },
+          labelAlign: 'right',
+          showResetButton: false,
+          showSubmitButton: false,
+        });
+
       async function nextStep() {
         try {
           let values = await validate();
@@ -245,7 +203,7 @@
       const selectPosition = async () => {
         visible.value = true;
         if (
-          !unref(isUpdate1) &&
+          unref(isUpdate1) &&
           unref(devicePositionState).longitude &&
           unref(devicePositionState).latitude
         ) {
@@ -440,8 +398,10 @@
         positionState.address = deviceInfo.address;
         devicePositionState.value = { ...toRaw(positionState) };
         devicePic.value = deviceInfo.avatar;
+
         if (deviceInfo.avatar) {
           setFieldsValue({
+            isUpdate: unref(isUpdate1),
             icon: [{ uid: buildUUID(), name: 'name', url: deviceInfo.avatar } as FileItem],
           });
         }
@@ -449,6 +409,7 @@
           ...data,
           code: data?.code,
           addressCode: parseInt(data?.code || '', 16),
+          isUpdate: unref(isUpdate1),
         });
       }
       // 父组件调用获取字段值的方法
@@ -499,13 +460,6 @@
         });
       }
 
-      const handleTreeOrg = (option: string) => {
-        if (option) clearValidate('organizationId');
-        else {
-          validateFields(['organizationId']);
-        }
-      };
-
       return {
         resetFields,
         positionState,
@@ -534,11 +488,7 @@
         loading,
         rules,
         redirectPosition,
-        treeData,
-        registerModal,
-        handleOpenOrgDrawer,
         handleSuccess,
-        handleTreeOrg,
         devicePositionState,
         spinning,
       };

@@ -100,11 +100,9 @@
       const { send, close } = useWebSocket(state.server, {
         onConnected() {
           send(state.sendValue);
-          console.log('建立连接了');
         },
         onMessage(_, e) {
           const { data } = JSON.parse(e.data);
-          console.log('来新消息了', '---data---', data);
           const newArray: socketDataType[] = [];
           for (const key in data) {
             const [time, value] = data[key].flat(1);
@@ -134,7 +132,6 @@
           });
         },
         onDisconnected() {
-          console.log('断开连接了');
           close();
         },
         onError() {

@@ -32,13 +32,12 @@
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { Switch } from 'ant-design-vue';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
-  import { watch } from 'vue';
   import VideoModal from './videoModal.vue';
   import { useModal } from '/@/components/Modal';
   import { onMounted } from 'vue';
   import { useMessage } from '/@/hooks/web/useMessage';
 
-  const props = defineProps({
+  defineProps({
     fromId: {
       type: String,
       default: '',
@@ -49,13 +48,6 @@
     },
   });
 
-  watch(
-    () => props,
-    () => {
-      console.log(props, 'props');
-    }
-  );
-
   const [registerModal, { openModal }] = useModal();
 
   const [registerTable, { setTableData, setProps, setSelectedRowKeys, reload }] = useTable({
@@ -68,14 +60,10 @@
       labelWidth: 120,
       schemas: searchFormSchema,
     },
-    beforeFetch: (params) => {
-      console.log(params);
-    },
     useSearchForm: true,
   });
 
-  const handleTurnVideo = async (checked: Boolean, record: Recordable) => {
-    console.log(checked, record, 'record');
+  const handleTurnVideo = async (checked: Boolean, _record: Recordable) => {
     setProps({
       loading: true,
     });
@@ -281,7 +269,6 @@
   });
 
   const handlePlay = (record: Recordable) => {
-    console.log(record);
     openModal(true, {
       record,
     });

@@ -4,41 +4,57 @@
       <OrganizationIdTree @select="handleSelect" ref="organizationIdTreeRef" />
       <BasicTable style="flex: auto" @register="registerTable" class="w-5/6 xl:w-4/5">
         <template #toolbar>
-          <Authority value="api:yt:device:post">
+          <Authority :value="DeviceListAuthEnum.CREATE">
             <a-button type="primary" @click="handleCreate" v-if="authBtn(role)">
               新增设备
             </a-button>
           </Authority>
-          <Authority value="api:yt:device:delete">
-            <Popconfirm
-              title="您确定要批量删除数据"
-              ok-text="确定"
-              cancel-text="取消"
-              @confirm="handleDelete()"
-            >
-              <a-button color="error" v-if="authBtn(role)" :disabled="!isExistOption">
-                批量删除
-              </a-button>
-            </Popconfirm>
-          </Authority>
-          <Authority value="api:yt:device:import">
+
+          <Authority :value="DeviceListAuthEnum.IMPORT">
             <Button type="primary" @click="handleBatchImport">导入</Button>
           </Authority>
-          <Authority value="api:yt:device:assign">
-            <a-button
+
+          <Authority
+            :value="[
+              DeviceListAuthEnum.DELETE,
+              DeviceListAuthEnum.ASSIGN,
+              DeviceListAuthEnum.UPDATE_PRODUCT,
+            ]"
+          >
+            <AuthDropDown
               v-if="authBtn(role)"
-              type="primary"
-              @click="handleBatchAssign"
               :disabled="!isExistOption"
+              :dropMenuList="[
+                {
+                  text: '删除设备',
+                  auth: DeviceListAuthEnum.DELETE,
+                  icon: 'ant-design:delete-outlined',
+                  event: '',
+                  popconfirm: {
+                    title: '您确定要批量删除数据',
+                    onConfirm: () => handleDelete(),
+                  },
+                },
+                {
+                  text: '分配客户',
+                  auth: DeviceListAuthEnum.ASSIGN,
+                  icon: 'mdi:account-arrow-left',
+                  event: '',
+                  onClick: handleBatchAssign.bind(null),
+                },
+                {
+                  text: '更新产品',
+                  auth: DeviceListAuthEnum.UPDATE_PRODUCT,
+                  icon: 'clarity:note-edit-line',
+                  event: '',
+                  disabled: batchUpdateProductFlag,
+                  onClick: handelOpenBatchUpdateProductModal,
+                },
+              ]"
             >
-              批量分配
-            </a-button>
+              <Button type="primary" :disabled="!isExistOption">批量操作</Button>
+            </AuthDropDown>
           </Authority>
-          <!-- <Authority>
-            <a-button type="primary" @click="handelCollect()" :disabled="!isExistOption">
-              批量收藏
-            </a-button>
-          </Authority> -->
         </template>
         <template #img="{ record }">
           <TableImg
@@ -121,12 +137,12 @@
               {
                 label: '详情',
                 icon: 'ant-design:eye-outlined',
-                auth: 'api:yt:device:get',
+                auth: DeviceListAuthEnum.DETAIL,
                 onClick: handleDetail.bind(null, record),
               },
               {
                 label: '编辑',
-                auth: 'api:yt:device:update',
+                auth: DeviceListAuthEnum.UPDATE,
                 icon: 'clarity:note-edit-line',
                 ifShow: authBtn(role),
                 onClick: handleEdit.bind(null, record),
@@ -138,7 +154,7 @@
                     label: '取消分配',
                     icon: 'mdi:account-arrow-left',
                     ifShow: authBtn(role) && !record?.customerAdditionalInfo?.isPublic,
-                    auth: 'api:yt:device:assign',
+                    auth: DeviceListAuthEnum.ASSIGN,
                     popConfirm: {
                       title: '是否取消分配客户',
                       confirm: handleCancelDispatchCustomer.bind(null, record),
@@ -148,12 +164,12 @@
                     label: '分配客户',
                     icon: 'mdi:account-arrow-right',
                     ifShow: authBtn(role),
-                    auth: 'api:yt:device:assign',
+                    auth: DeviceListAuthEnum.ASSIGN,
                     onClick: handleDispatchCustomer.bind(null, record),
                   },
               {
                 label: record?.customerAdditionalInfo?.isPublic ? '私有' : '公开',
-                auth: 'api:yt:device:public',
+                auth: DeviceListAuthEnum.PUBLIC,
                 icon: record?.customerAdditionalInfo?.isPublic
                   ? 'ant-design:lock-outlined'
                   : 'ant-design:unlock-outlined',
@@ -161,7 +177,7 @@
               },
               {
                 label: '上下线记录',
-                auth: 'api:yt:device:online:record',
+                auth: DeviceListAuthEnum.ONLINE,
                 icon: 'ant-design:rise-outlined',
                 onClick: handleUpAndDownRecord.bind(null, record),
               },
@@ -173,7 +189,6 @@
                   }
                 : {
                     label: '取消收藏',
-                    auth: 'api:yt:device:online:record',
                     icon: 'ant-design:heart-outlined',
                     popConfirm: {
                       title: '是否取消收藏',
@@ -182,7 +197,7 @@
                   },
               {
                 label: '删除',
-                auth: 'api:yt:device:delete',
+                auth: DeviceListAuthEnum.DELETE,
                 icon: 'ant-design:delete-outlined',
                 ifShow: authBtn(role) && record.customerId === undefined,
                 color: 'error',
@@ -208,11 +223,16 @@
       <CustomerModal @register="registerCustomerModal" @reload="handleReload" />
 
       <BatchImportModal @register="registerImportModal" @import-finally="handleImportFinally" />
+
+      <BatchUpdateProductModal
+        @register="registerBatchUpdateProductModal"
+        @success="handleBatchUpdateProductSuccess"
+      />
     </PageWrapper>
   </div>
 </template>
-<script lang="ts">
-  import { defineComponent, reactive, unref, onMounted } from 'vue';
+<script lang="ts" setup>
+  import { reactive, onMounted, ref } from 'vue';
   import {
     DeviceModel,
     DeviceRecord,
@@ -220,8 +240,8 @@
     DeviceTypeEnum,
   } from '/@/api/device/model/deviceModel';
   import { BasicTable, useTable, TableAction, TableImg } from '/@/components/Table';
-  import { columns, searchFormSchema } from './config/device.data';
-  import { Tag, Popover, Popconfirm, Button, Tooltip } from 'ant-design-vue';
+  import { columns, DeviceListAuthEnum, searchFormSchema } from './config/device.data';
+  import { Tag, Popover, Button, Tooltip } from 'ant-design-vue';
   import { HeartTwoTone } from '@ant-design/icons-vue';
   import {
     deleteDevice,
@@ -246,326 +266,295 @@
   import { USER_INFO_KEY } from '/@/enums/cacheEnum';
   import { getAuthCache } from '/@/utils/auth';
   import { authBtn } from '/@/enums/roleEnum';
-  import { useClipboard } from '@vueuse/core';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { Authority } from '/@/components/Authority';
   import { useRoute, useRouter } from 'vue-router';
   import { useBatchOperation } from '/@/utils/useBatchOperation';
   import { useSyncConfirm } from '/@/hooks/component/useSyncConfirm';
   import { useAuthDeviceDetail } from './hook/useAuthDeviceDetail';
+  import {
+    BatchUpdateProductModal,
+    BatchUpdateProductModalParamsType,
+  } from './cpns/modal/BatchUpdateProductModal';
+  import { DataActionModeEnum } from '/@/enums/toolEnum';
+  import { AuthDropDown } from '/@/components/Widget';
 
-  export default defineComponent({
-    name: 'DeviceManagement',
-    components: {
-      BasicTable,
-      PageWrapper,
-      TableAction,
-      OrganizationIdTree,
-      Tag,
-      DeviceModal,
-      DeviceDetailDrawer,
-      CustomerModal,
-      TableImg,
-      QuestionCircleOutlined,
-      Popover,
-      Authority,
-      Popconfirm,
-      BatchImportModal,
-      Button,
-      // HeartOutlined,
-      HeartTwoTone,
-      Tooltip,
-    },
-    setup(_) {
-      const { isCustomer } = useAuthDeviceDetail();
-      const { createMessage } = useMessage();
-      const go = useGo();
-      const ROUTER = useRouter();
-      const ROUTE = useRoute();
-      const searchInfo = reactive<Recordable>({});
-      const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
-      const [registerModal, { openModal }] = useModal();
-      const [registerCustomerModal, { openModal: openCustomerModal }] = useModal();
-      const [registerDetailDrawer, { openDrawer }] = useDrawer();
-      const [registerTbDetailDrawer, { openDrawer: openTbDeviceDrawer }] = useDrawer();
-      const [registerGatewayDetailDrawer, { openDrawer: openGatewayDetailDrawer }] = useDrawer();
-      const [registerImportModal, { openModal: openImportModal }] = useModal();
+  const { isCustomer } = useAuthDeviceDetail();
+  const { createMessage } = useMessage();
+  const go = useGo();
+  const ROUTER = useRouter();
+  const ROUTE = useRoute();
+  const searchInfo = reactive<Recordable>({});
+  const { organizationIdTreeRef, resetFn } = useResetOrganizationTree(searchInfo);
+  const [registerModal, { openModal }] = useModal();
+  const [registerCustomerModal, { openModal: openCustomerModal }] = useModal();
+  const [registerDetailDrawer, { openDrawer }] = useDrawer();
+  const [registerTbDetailDrawer, { openDrawer: openTbDeviceDrawer }] = useDrawer();
+  const [registerGatewayDetailDrawer, { openDrawer: openGatewayDetailDrawer }] = useDrawer();
+  const [registerImportModal, { openModal: openImportModal }] = useModal();
+  const [registerBatchUpdateProductModal, { openModal: openBatchUpdateProductModal }] = useModal();
 
-      const [
-        registerTable,
-        {
-          reload,
-          setLoading,
-          setSelectedRowKeys,
-          getForm,
-          getSelectRowKeys,
-          getSelectRows,
-          getRowSelection,
-        },
-      ] = useTable({
-        title: '设备列表',
-        api: devicePage,
-        columns,
-        beforeFetch: (params) => {
-          const { deviceProfileId } = params;
-          if (!deviceProfileId) return;
-          const obj = {
-            ...params,
-            ...{
-              deviceProfileIds: deviceProfileId ? [deviceProfileId] : null,
-            },
-          };
-          delete obj.deviceProfileId;
-          return obj;
-        },
-        formConfig: {
-          labelWidth: 100,
-          schemas: searchFormSchema,
-          resetFunc: resetFn,
-        },
-        useSearchForm: true,
-        showTableSetting: true,
-        bordered: true,
-        showIndexColumn: false,
-        rowKey: 'id',
-        searchInfo: searchInfo,
-        clickToRowSelect: false,
-        actionColumn: {
-          width: 200,
-          title: '操作',
-          slots: { customRender: 'action' },
-          fixed: 'right',
-        },
-        rowSelection: {
-          type: 'checkbox',
-          getCheckboxProps: (record: DeviceModel) => {
-            return { disabled: !!record.customerId };
-          },
+  const batchUpdateProductFlag = ref(true);
+
+  const [
+    registerTable,
+    {
+      reload,
+      setLoading,
+      setSelectedRowKeys,
+      getForm,
+      getSelectRowKeys,
+      getSelectRows,
+      getRowSelection,
+      clearSelectedRowKeys,
+    },
+  ] = useTable({
+    title: '设备列表',
+    api: devicePage,
+    columns,
+    beforeFetch: (params) => {
+      const { deviceProfileId } = params;
+      if (!deviceProfileId) return;
+      const obj = {
+        ...params,
+        ...{
+          deviceProfileIds: deviceProfileId ? [deviceProfileId] : null,
         },
-      });
+      };
+      delete obj.deviceProfileId;
+      return obj;
+    },
+    formConfig: {
+      labelWidth: 100,
+      schemas: searchFormSchema,
+      resetFunc: resetFn,
+    },
+    useSearchForm: true,
+    showTableSetting: true,
+    bordered: true,
+    showIndexColumn: false,
+    rowKey: 'id',
+    searchInfo: searchInfo,
+    clickToRowSelect: false,
+    actionColumn: {
+      width: 200,
+      title: '操作',
+      slots: { customRender: 'action' },
+      fixed: 'right',
+    },
+    rowSelection: {
+      type: 'checkbox',
+      getCheckboxProps: (record: DeviceModel) => {
+        return { disabled: !!record.customerId };
+      },
+      onSelect(_record, _selected, selectedRows) {
+        const [firstItem] = selectedRows as DeviceRecord[];
+        const { deviceType } = firstItem || {};
+        batchUpdateProductFlag.value =
+          !selectedRows.length ||
+          !selectedRows.every((item) => (item as DeviceRecord).deviceType === deviceType);
+      },
+      onSelectAll(_selected, selectedRows) {
+        const [firstItem] = selectedRows as DeviceRecord[];
+        const { deviceType } = firstItem || {};
+        batchUpdateProductFlag.value =
+          !selectedRows.length ||
+          !selectedRows.every((item) => (item as DeviceRecord).deviceType === deviceType);
+      },
+    },
+  });
 
-      const { isExistOption } = useBatchOperation(getRowSelection, setSelectedRowKeys);
+  const { isExistOption } = useBatchOperation(getRowSelection, setSelectedRowKeys);
 
-      const userInfo: any = getAuthCache(USER_INFO_KEY);
-      const role: string = userInfo.roles[0];
+  const userInfo: any = getAuthCache(USER_INFO_KEY);
+  const role: string = userInfo.roles[0];
 
-      function handleCreate() {
-        openModal(true, {
-          isUpdate: false,
-        });
-      }
-      // 分配客户
-      function handleDispatchCustomer(record: Recordable) {
-        openCustomerModal(true, record);
-      }
-      function handleReload() {
-        setSelectedRowKeys([]);
-        handleSuccess();
-      }
-      // 取消分配客户
-      async function handleCancelDispatchCustomer(record: Recordable) {
-        try {
-          // 该设备是否正在被场景联动使用中？
-          await cancelDispatchCustomer(record);
-          handleReload();
-        } catch {}
-      }
+  function handleCreate() {
+    openModal(true, {
+      isUpdate: false,
+    });
+  }
+  // 分配客户
+  function handleDispatchCustomer(record: Recordable) {
+    openCustomerModal(true, record);
+  }
+  function handleReload() {
+    setSelectedRowKeys([]);
+    handleSuccess();
+  }
+  // 取消分配客户
+  async function handleCancelDispatchCustomer(record: Recordable) {
+    try {
+      // 该设备是否正在被场景联动使用中？
+      await cancelDispatchCustomer(record);
+      handleReload();
+    } catch {}
+  }
 
-      function handleDetail(record: Recordable) {
-        const { id, tbDeviceId, deviceProfile, deviceType } = record;
-        const { transportType } = deviceProfile || {};
-        openDrawer(true, {
-          id,
-          tbDeviceId,
-          transportType,
-          deviceType,
-        });
-      }
+  function handleDetail(record: Recordable) {
+    const { id, tbDeviceId, deviceProfile, deviceType } = record;
+    const { transportType } = deviceProfile || {};
+    openDrawer(true, {
+      id,
+      tbDeviceId,
+      transportType,
+      deviceType,
+    });
+  }
 
-      async function handleEdit(record: Recordable) {
-        if (record.deviceType === 'SENSOR') {
-          const res = await getGATEWAY(record.tbDeviceId);
-          Reflect.set(record, 'gatewayId', res.tbDeviceId);
-        }
-        openModal(true, {
-          isUpdate: true,
-          record,
-        });
-      }
-      function handleSuccess() {
-        reload();
-      }
-      function handleSelect(organization) {
-        searchInfo.organizationId = organization;
-        handleSuccess();
-      }
-      function goDeviceProfile(e) {
-        go(PageEnum.DEVICE_PROFILE + '?name=' + encodeURIComponent(String(e)));
-      }
-      const { copied, copy } = useClipboard({ legacy: true });
-      const copySN = async (snCode: string) => {
-        await copy(snCode);
-        if (unref(copied)) {
-          createMessage.success('复制成功~');
-        }
-      };
+  async function handleEdit(record: Recordable) {
+    if (record.deviceType === 'SENSOR') {
+      const res = await getGATEWAY(record.tbDeviceId);
+      Reflect.set(record, 'gatewayId', res.tbDeviceId);
+    }
+    openModal(true, {
+      isUpdate: true,
+      record,
+    });
+  }
+  function handleSuccess() {
+    reload();
+  }
+  function handleSelect(organization) {
+    searchInfo.organizationId = organization;
+    handleSuccess();
+  }
+  function goDeviceProfile(e) {
+    go(PageEnum.DEVICE_PROFILE + '?name=' + encodeURIComponent(String(e)));
+  }
 
-      const handleOpenTbDeviceDetail = (data: { id: string; tbDeviceId: string }) => {
-        openTbDeviceDrawer(true, data);
-      };
+  const handleOpenTbDeviceDetail = (data: { id: string; tbDeviceId: string }) => {
+    openTbDeviceDrawer(true, data);
+  };
 
-      const handleOpenGatewayDetail = (data: { id: string; tbDeviceId: string }) => {
-        openGatewayDetailDrawer(true, data);
-      };
+  const handleOpenGatewayDetail = (data: { id: string; tbDeviceId: string }) => {
+    openGatewayDetailDrawer(true, data);
+  };
 
-      const handleUpAndDownRecord = (record: Record<'name' | 'alias', string>) => {
-        ROUTER.push({
-          path: '/operation/onlinerecord',
-          query: { deviceName: record.alias || record.name },
-        });
-      };
+  const handleUpAndDownRecord = (record: Record<'name' | 'alias', string>) => {
+    ROUTER.push({
+      path: '/operation/onlinerecord',
+      query: { deviceName: record.alias || record.name },
+    });
+  };
 
-      const handleCheckHasDiffenterOrg = (options: DeviceModel[]) => {
-        let orgId: string | undefined;
-        let flag = false;
-        for (const item of options) {
-          const _orgId = item.organizationId;
-          if (!orgId) orgId = _orgId;
-          if (orgId !== _orgId) {
-            flag = true;
-            break;
-          }
-        }
-        return flag;
-      };
+  const handleCheckHasDiffenterOrg = (options: DeviceModel[]) => {
+    let orgId: string | undefined;
+    let flag = false;
+    for (const item of options) {
+      const _orgId = item.organizationId;
+      if (!orgId) orgId = _orgId;
+      if (orgId !== _orgId) {
+        flag = true;
+        break;
+      }
+    }
+    return flag;
+  };
 
-      const handleBatchAssign = () => {
-        const options = getSelectRows();
-        if (handleCheckHasDiffenterOrg(options as DeviceModel[])) {
-          createMessage.error('当前选中项中存在不同所属组织的设备！');
-          return;
-        }
-        openCustomerModal(true, options);
-      };
+  const handleBatchAssign = () => {
+    const options = getSelectRows();
+    if (handleCheckHasDiffenterOrg(options as DeviceModel[])) {
+      createMessage.error('当前选中项中存在不同所属组织的设备！');
+      return;
+    }
+    openCustomerModal(true, options);
+  };
 
-      const handleDelete = async (record?: DeviceRecord) => {
-        let ids: string[] = [];
-        if (record) {
-          ids.push(record.id);
-        } else {
-          ids = getSelectRowKeys();
-        }
-        try {
-          setLoading(true);
-          await deleteDevice(ids);
-          createMessage.success('删除成功');
-          handleReload();
-        } catch (error) {
-          throw error;
-        } finally {
-          setLoading(false);
-        }
-      };
+  const handleDelete = async (record?: DeviceRecord) => {
+    let ids: string[] = [];
+    if (record) {
+      ids.push(record.id);
+    } else {
+      ids = getSelectRowKeys();
+    }
+    try {
+      setLoading(true);
+      await deleteDevice(ids);
+      createMessage.success('删除成功');
+      handleReload();
+    } catch (error) {
+      throw error;
+    } finally {
+      setLoading(false);
+    }
+  };
 
-      const handleBatchImport = () => {
-        openImportModal(true);
-      };
+  const handleBatchImport = () => {
+    openImportModal(true);
+  };
 
-      const handleImportFinally = () => {
-        reload();
-      };
+  const handleImportFinally = () => {
+    reload();
+  };
 
-      const { createSyncConfirm } = useSyncConfirm();
-      const handlePublicDevice = async (record: DeviceRecord) => {
-        try {
-          const publicFlag = record?.customerAdditionalInfo?.isPublic;
-          const type = publicFlag ? '私有' : '公开';
-          const flag = await createSyncConfirm({
-            iconType: 'warning',
-            title: `您确定要将设备 '${record.name}' 设为${type}吗？`,
-            content: `确认后，设备及其所有数据将被设为${type}并${
-              publicFlag ? '不' : ''
-            }可被其他人访问。`,
-          });
-          if (!flag) return;
-          if (publicFlag) {
-            await privateDevice(record.tbDeviceId);
-          } else {
-            await publicDevice(record.tbDeviceId);
-          }
-          reload();
-        } catch (error) {}
-      };
+  const { createSyncConfirm } = useSyncConfirm();
+  const handlePublicDevice = async (record: DeviceRecord) => {
+    try {
+      const publicFlag = record?.customerAdditionalInfo?.isPublic;
+      const type = publicFlag ? '私有' : '公开';
+      const flag = await createSyncConfirm({
+        iconType: 'warning',
+        title: `您确定要将设备 '${record.name}' 设为${type}吗？`,
+        content: `确认后，设备及其所有数据将被设为${type}并${
+          publicFlag ? '不' : ''
+        }可被其他人访问。`,
+      });
+      if (!flag) return;
+      if (publicFlag) {
+        await privateDevice(record.tbDeviceId);
+      } else {
+        await publicDevice(record.tbDeviceId);
+      }
+      reload();
+    } catch (error) {}
+  };
 
-      // 收藏 && 批量收藏
-      const handelCollect = async (record?: Recordable) => {
-        let ids: string[] = [];
-        if (record) {
-          ids.push(record.id);
-        } else {
-          ids = await getSelectRowKeys();
-        }
-        try {
-          setLoading(true);
-          await deviceCollect(ids);
-          createMessage.success('操作成功');
-          handleReload();
-        } catch (error) {
-          throw error;
-        } finally {
-          setLoading(false);
-        }
-      };
+  // 收藏 && 批量收藏
+  const handelCollect = async (record?: Recordable) => {
+    let ids: string[] = [];
+    if (record) {
+      ids.push(record.id);
+    } else {
+      ids = await getSelectRowKeys();
+    }
+    try {
+      setLoading(true);
+      await deviceCollect(ids);
+      createMessage.success('操作成功');
+      handleReload();
+    } catch (error) {
+      throw error;
+    } finally {
+      setLoading(false);
+    }
+  };
 
-      onMounted(() => {
-        const queryParams = ROUTE.query as Record<'deviceProfileId', undefined | string>;
-        const { setFieldsValue } = getForm();
-        setFieldsValue({ deviceProfileId: queryParams.deviceProfileId });
-      });
-      return {
-        registerTable,
-        handleCreate,
-        handleDetail,
-        handleEdit,
-        handleSuccess,
-        goDeviceProfile,
-        handleSelect,
-        registerModal,
-        registerDetailDrawer,
-        DeviceTypeEnum,
-        DeviceState,
-        searchInfo,
-        organizationIdTreeRef,
-        handleDispatchCustomer,
-        handleCancelDispatchCustomer,
-        registerCustomerModal,
-        authBtn,
-        role,
-        copySN,
-        isExistOption,
-        handleDelete,
-        handelCollect,
-        // hasBatchDelete,
-        // handleDeleteOrBatchDelete,
-        handleReload,
-        registerTbDetailDrawer,
-        handleOpenTbDeviceDetail,
-        handleOpenGatewayDetail,
-        registerGatewayDetailDrawer,
-        handleUpAndDownRecord,
-        handleBatchAssign,
-        registerImportModal,
-        handleBatchImport,
-        handleImportFinally,
-        handlePublicDevice,
-        isCustomer,
-      };
-    },
+  onMounted(() => {
+    const queryParams = ROUTE.query as Record<'deviceProfileId', undefined | string>;
+    const { setFieldsValue } = getForm();
+    setFieldsValue({ deviceProfileId: queryParams.deviceProfileId });
   });
+
+  const handelOpenBatchUpdateProductModal = () => {
+    const rows: DeviceRecord[] = getSelectRows();
+    const [firstItem] = rows;
+
+    openBatchUpdateProductModal(true, {
+      mode: DataActionModeEnum.UPDATE,
+      record: {
+        sourceDeviceProfileName: firstItem.deviceProfile.name,
+        deviceType: firstItem.deviceType,
+        deviceIds: rows.map((item) => item.tbDeviceId),
+      },
+    } as BatchUpdateProductModalParamsType);
+  };
+
+  const handleBatchUpdateProductSuccess = () => {
+    reload();
+    clearSelectedRowKeys();
+    batchUpdateProductFlag.value = true;
+  };
 </script>
 
-<style scoped lang="css">
-  /* /deep/.ant-message-notice-content {
-    max-width: 600px !important;
-  } */
-</style>
+<style scoped lang="css"></style>

@@ -346,7 +346,6 @@ export const schemas: FormSchema[] = [
       return {
         onChange(value) {
           const { updateSchema } = formActionType;
-          console.log(value);
           formModel.interval = '';
           updateSchema({
             field: 'interval',

@@ -235,7 +235,6 @@
 
   function loadDataSuccess(excelDataList: ExcelData[]) {
     tableListRef.value = [];
-    console.log(excelDataList);
     for (const excelData of excelDataList) {
       const {
         header,
@@ -294,9 +293,7 @@
     });
   };
   //导入
-  function handleImport() {
-    console.log('record');
-  }
+  function handleImport() {}
   function handleSuccess() {
     reload();
   }

@@ -204,8 +204,7 @@
           });
       flag && createMessage.info(flag?.message);
     } catch (msg) {
-      // eslint-disable-next-line no-console
-      console.log(msg, 'msg');
+      console.error(msg, 'msg');
     } finally {
       closeLoading();
       closeModal();

@@ -96,7 +96,6 @@
       render: (_, data: Bootstrap) => (data.notifIfDisabled ? '启用' : '禁用'),
     },
   ];
-  console.log(unref(getOtherSetting));
   const [registerOtherSettings] = useDescription({
     layout: 'vertical',
     column: 2,

@@ -68,21 +68,18 @@
               <Button v-if="isShowBtn" class="!bg-gray-200" type="text" @click="handleReturn">
                 返回
               </Button>
-              <Authority :value="[ModelOfMatterPermission.DELETE, ModelCategoryPermission.DELETE]">
+              <Authority
+                v-if="isShowBtn"
+                :value="[ModelOfMatterPermission.DELETE, ModelCategoryPermission.DELETE]"
+              >
                 <Popconfirm
                   title="您确定要批量删除数据"
                   ok-text="确定"
                   cancel-text="取消"
-                  @confirm="handleDeleteOrBatchDelete(null)"
+                  @confirm="handleDeleteOrBatchDelete()"
+                  :disabled="getHasBatchDelete"
                 >
-                  <Button
-                    style="display: none"
-                    type="primary"
-                    color="error"
-                    :disabled="hasBatchDelete"
-                  >
-                    批量删除
-                  </Button>
+                  <Button type="primary" danger :disabled="getHasBatchDelete"> 批量删除 </Button>
                 </Popconfirm>
               </Authority>
             </div>
@@ -120,11 +117,7 @@
         />
       </template>
     </BasicTable>
-    <PhysicalModelModal
-      :record="$props.record"
-      @register="registerModal"
-      @success="handleSuccess"
-    />
+    <PhysicalModelModal :record="$props.record" @register="registerModal" @success="reload" />
     <PhysicalModelTsl :record="$props.record" @register="registerModalTsl" />
     <SelectImport
       :record="$props.record"
@@ -142,7 +135,6 @@
     ModelCategoryPermission,
     physicalColumn,
   } from '../device.profile.data';
-  import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Authority } from '/@/components/Authority';
   import PhysicalModelModal from './cpns/physical/PhysicalModelModal.vue';
   import PhysicalModelTsl from './cpns/physical/PhysicalModelTsl.vue';
@@ -156,8 +148,11 @@
     releaseModel,
   } from '/@/api/device/modelOfMatter';
   import { OpenModelOfMatterModelParams, OpenModelMode } from './cpns/physical/types';
-  import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
-  import { ref, unref } from 'vue';
+  import {
+    ModelOfMatterItemRecordType,
+    ModelOfMatterParams,
+  } from '/@/api/device/model/modelOfMatterModel';
+  import { computed, ref, unref } from 'vue';
   import { isObject } from '/@/utils/is';
   import { useRole } from '/@/hooks/business/useRole';
   import { ExportModelCategory } from '/@/api/device/modelOfMatter';
@@ -177,50 +172,45 @@
   const [registerModalTsl, { openModal: openModalTsl }] = useModal();
   const [registerModalSelect, { openModal: openModalSelect }] = useModal();
 
-  const [registerTable, { reload, setProps }] = useTable({
-    api: async (params: Record<'page' | 'pageSize', number>) => {
-      return await getModelList({
-        ...params,
-        id: props.record.id,
-        selectType: props.record.ifShowClass ? 'category' : undefined,
-      });
-    },
-    columns: props.record.ifShowClass
-      ? physicalColumn.filter((item) => item.dataIndex !== 'status')
-      : physicalColumn,
-    showIndexColumn: false,
-    clickToRowSelect: false,
-    showTableSetting: true,
-    bordered: true,
-    useSearchForm: true,
-    formConfig: {
-      schemas: modelOfMatterForm,
-      labelWidth: 120,
-    },
-    actionColumn: {
-      width: 200,
-      title: '操作',
-      dataIndex: 'action',
-      slots: { customRender: 'action' },
-      fixed: 'right',
-    },
-  });
-
-  // 刷新
-  const handleSuccess = () => {
-    reload();
-  };
-  const { hasBatchDelete, handleDeleteOrBatchDelete, selectionOptions } = useBatchDelete(
-    props.record.ifShowClass && (unref(isPlatformAdmin) || unref(isSysadmin))
-      ? deleteModelCategory
-      : deleteModel,
-    handleSuccess,
-    setProps
-  );
+  const [registerTable, { reload, getSelectRowKeys, getRowSelection, clearSelectedRowKeys }] =
+    useTable({
+      api: async (params: Record<'page' | 'pageSize', number>) => {
+        return await getModelList({
+          ...params,
+          id: props.record.id,
+          selectType: props.record.ifShowClass ? 'category' : undefined,
+        });
+      },
+      columns: props.record.ifShowClass
+        ? physicalColumn.filter((item) => item.dataIndex !== 'status')
+        : physicalColumn,
+      showIndexColumn: false,
+      clickToRowSelect: false,
+      showTableSetting: true,
+      bordered: true,
+      useSearchForm: true,
+      rowKey: 'id',
+      formConfig: {
+        schemas: modelOfMatterForm,
+        labelWidth: 120,
+      },
+      actionColumn: {
+        width: 200,
+        title: '操作',
+        dataIndex: 'action',
+        slots: { customRender: 'action' },
+        fixed: 'right',
+      },
+      rowSelection: {
+        getCheckboxProps: (record: ModelOfMatterItemRecordType) => {
+          return {
+            disabled: record.status === 1,
+          };
+        },
+      },
+    });
 
-  selectionOptions.rowSelection.getCheckboxProps = (record: Recordable) => {
-    return { disabled: record.status === 1 };
-  };
+  const getHasBatchDelete = computed(() => !getRowSelection().selectedRowKeys?.length);
 
   const handleViewDetail = (record: ModelOfMatterParams) => {
     if (record) {
@@ -245,6 +235,19 @@
     }
   };
 
+  const handleDeleteOrBatchDelete = async (record?: ModelOfMatterItemRecordType) => {
+    const deleteFn =
+      props.record.ifShowClass && (unref(isPlatformAdmin) || unref(isSysadmin))
+        ? deleteModelCategory
+        : deleteModel;
+
+    const ids = record ? [record.id] : getSelectRowKeys();
+    await deleteFn(ids);
+    createMessage.success('删除成功');
+    clearSelectedRowKeys();
+    reload();
+  };
+
   const handleOpenTsl = () => {
     openModalTsl(true, {
       isUpdate: true,

@@ -30,9 +30,7 @@
   import { SelectTypes } from 'ant-design-vue/es/select';
 
   const emit = defineEmits(['register', 'emitSelect']);
-  const [register] = useModalInner((data) => {
-    console.log(data);
-  });
+  const [register] = useModalInner(() => {});
   const heightNum = ref(80);
   const visible = ref(false);
   const selectValue = ref('LwM2M');

@@ -130,14 +130,13 @@
     telemetry: [],
   });
 
-  const [registerModel, { resetFields: resetObjectListValue, getFieldsValue: getObjectListValue }] =
-    useForm({
-      labelWidth: 100,
-      schemas: modelSchemas,
-      actionColOptions: {
-        span: 14,
-      },
-    });
+  const [registerModel, { resetFields: resetObjectListValue }] = useForm({
+    labelWidth: 100,
+    schemas: modelSchemas,
+    actionColOptions: {
+      span: 14,
+    },
+  });
   const [
     registerSettings,
     {
@@ -152,14 +151,13 @@
       span: 14,
     },
   });
-  const [registerDevice, { resetFields: resetDeviceValue, getFieldsValue: getDeviceValue }] =
-    useForm({
-      labelWidth: 100,
-      schemas: deviceSchemas,
-      actionColOptions: {
-        span: 14,
-      },
-    });
+  const [registerDevice, { resetFields: resetDeviceValue }] = useForm({
+    labelWidth: 100,
+    schemas: deviceSchemas,
+    actionColOptions: {
+      span: 14,
+    },
+  });
   const [registerModal, { openModal }] = useModal();
 
   const handleAdd = () => {
@@ -205,10 +203,6 @@
   };
 
   const getFormData = async () => {
-    const objectListVal = getObjectListValue();
-    const deviceVal = getDeviceValue();
-    console.log('第一个tab', objectListVal);
-    console.log('第四个tab', deviceVal);
     getBootStrapFormValue();
     const settingsVal = await settingsValidate();
     if (!settingsVal) return;

@@ -69,7 +69,7 @@
       if (unref(copied)) createMessage.success('复制成功！');
       else createMessage.error('复制失败！');
     } catch (e) {
-      console.log(e);
+      console.error(e);
     }
   };
 

@@ -172,8 +172,7 @@ export const formSchema: FormSchema[] = [
             const record = await findMessageConfig(params);
             return record.filter((item) => item.status === 1);
           } catch (error) {
-            // eslint-disable-next-line no-console
-            console.log(error);
+            console.error(error);
             return [];
           }
         },

@@ -41,7 +41,7 @@
         checksumAlgorithm: value.checksumAlgorithm,
       });
     } catch (error) {
-      console.log(error);
+      console.error(error);
       if ((error as { status: number }).status) {
         await deleteOtaPackage(id);
       }

@@ -6,7 +6,7 @@
   border-color: #6b7280;
 }
 
-.vue-flow__handle:hover{
+.vue-flow__handle:hover {
   background-color: #000;
 }
 
@@ -15,7 +15,7 @@
 }
 
 .vue-flow__handle-left {
-  left: -12px; 
+  left: -12px;
 }
 
 .vue-flow__background.vue-flow__container {
@@ -32,7 +32,7 @@
   stroke-width: 4;
   stroke: gray;
   transition: stroke-width 0.3s;
-} 
+}
 
 .connection-focus {
   stroke-width: 6;
@@ -44,7 +44,7 @@
 }
 
 /* 连接线移入放大效果 */
-.vue-flow__edge:hover >  .vue-flow__edge-path {
+.vue-flow__edge:hover > .vue-flow__edge-path {
   stroke-width: 6 !important;
 }
 
@@ -54,18 +54,19 @@
 }
 
 .vue-flow__edge:hover .vue-flow__edge-textbg {
-  transform: scale(1.1)
+  transform: scale(1.1);
 }
 
-.vue-flow__edge:hover .vue-flow__edge-text{
-  transform: scale(1.1)
+.vue-flow__edge:hover .vue-flow__edge-text {
+  transform: scale(1.1);
 }
 
 /* selection 选择框 */
-.vue-flow__nodesselection-rect, .vue-flow__selection{
+.vue-flow__nodesselection-rect,
+.vue-flow__selection {
   border-width: 3px;
 }
 
-.vue-flow__nodesselection-rect { 
+.vue-flow__nodesselection-rect {
   pointer-events: none;
 }

@@ -236,7 +236,7 @@
       // 设置输出值
       outputEditor.value.set(result);
     } catch (e) {
-      console.log(e);
+      console.error(e);
       const { createMessage } = useMessage();
       createMessage.error(e.toString());
     }

@@ -85,9 +85,7 @@
       /^[1](([3][0-9])|([4][0,1,4-9])|([5][0-3,5-9])|([6][2,5,6,7])|([7][0-8])|([8][0-9])|([9][0-3,5-9]))[0-9]{8}$/;
     if (reg.test(formData.mobile)) {
       const sendRes = await passwordResetCode(formData.mobile);
-      console.log(sendRes);
       if (sendRes === '') {
-        console.log('发送成功了');
         return true;
       }
       return false;

@@ -99,6 +99,5 @@
   async function handleRegister() {
     const data = await validForm();
     if (!data) return;
-    console.log(data);
   }
 </script>

@@ -27,7 +27,6 @@
   onMounted(() => {
     // 记录当前的UserId
     userId.value = userStore.getUserInfo?.userId;
-    console.log('Mounted', userStore.getUserInfo);
   });
 
   onBeforeUnmount(() => {

@@ -69,8 +69,8 @@ export function useFormRules(formData?: Recordable) {
     const mobileFormRule = unref(getMobileFormRule);
 
     const mobileRule = {
-      sms: smsFormRule,
-      mobile: mobileFormRule,
+      code: smsFormRule,
+      phoneNumber: mobileFormRule,
     };
     switch (unref(currentState)) {
       // register form rules

@@ -14,7 +14,6 @@
   Reflect.deleteProperty(params, 'path');
 
   const _path = Array.isArray(path) ? path.join('/') : path;
-  console.log(unref(currentRoute));
   if (_redirect_type === 'name') {
     replace({
       name: _path,

@@ -138,7 +138,6 @@
           }
           if (newFieldValue.codeTown == undefined) {
             validateArray.push('prov');
-            console.log(validateArray);
           } else {
             const findExistIndex1 = validateArray.findIndex((o) => o == 'prov');
             if (findExistIndex1 !== -1) {

@@ -5,7 +5,8 @@
         <Tabs.TabPane
           v-if="
             isWhereAdmin == 'TENANT_ADMIN' ||
-            (isWhereAdmin == 'SYS_ADMIN' || isWhereAdmin == 'CUSTOMER_USER')
+            isWhereAdmin == 'SYS_ADMIN' ||
+            isWhereAdmin == 'CUSTOMER_USER'
           "
           key="企业信息"
           tab="企业信息"

@@ -264,7 +264,6 @@
     setProps({
       loading: true,
     });
-    console.log(sendTime.value);
     let startTime = null;
     let endTime = null;
     if (sendTime.value.length > 0) {

@@ -49,6 +49,7 @@
     font-size: 16px;
     font-weight: 500;
   }
+
   :deep(.vben-collapse-container__header) {
     border-bottom: none;
   }

@@ -134,7 +134,7 @@
                 copyTransFun(data as any);
                 return data;
               } catch (error) {
-                console.log(error);
+                console.error(error);
                 return [];
               }
             },

@@ -77,7 +77,7 @@
                 copyTransFun(data as any);
                 return data;
               } catch (error) {
-                console.log(error);
+                console.error(error);
                 return [];
               }
             },

@@ -10,7 +10,8 @@
 
   const alert = {
     [PackagesCategoryEnum.MAP]: [
-      '地图组件，需绑定两个数据源，且数据源为同一设备。第一数据源为经度，第二数据源为纬度，否则地图组件不能正常显示。',
+      '1、绑定数据源为结构体时，可以自行选择结构体里的属性作为经纬度',
+      '2、绑定数据源为非结构体时，第一数据源为经度，第二数据源为纬度，且数据源为同一设备，并同时上报。否则地图组件不能正常显示。',
     ],
   };
 

@@ -34,14 +34,6 @@
         const { unit, fontColor, showDeviceName } = item.componentInfo || {};
         const { deviceName, deviceRename, attribute, attributeRename, deviceId, attributeName } =
           item;
-        // return {
-        //   unit: unit ?? persetUnit,
-        //   fontColor: fontColor ?? persetFontColor,
-        //   showDeviceName: showDeviceName ?? persetShowDeviceName,
-        //   attribute,
-        //   deviceName,
-        //   deviceRename,
-        // };
         return {
           unit: unit ?? presetUnit,
           fontColor: fontColor ?? presetFontColor,
@@ -58,7 +50,6 @@
   });
 
   const getOffset = (length: number, index: number) => {
-    // try {
     const offsetList = ref<any>([]);
     switch (length) {
       case 1:
@@ -147,7 +138,6 @@
         break;
     }
     return unref(offsetList);
-    // } catch {}
   };
 
   const series = ref(
@@ -263,7 +253,6 @@
       series.value.forEach((item) => {
         if (item.id === deviceId && item.attribute === attribute && value) {
           item.value = getNumberValue(value);
-          // time.value = timespan;
         }
       });
     });

@@ -62,7 +62,6 @@
   const options = (): EChartsOption => {
     const { unit, fontColor, pointerColor, maxNumber, valueSize } = unref(getDesign);
 
-    // getStageColor(gradientInfo);
     return {
       series: [
         {
@@ -103,14 +102,6 @@
               color: pointerColor,
             },
           },
-          // anchor: {
-          //   show: true,
-          //   showAbove: true,
-          //   size: 10,
-          //   itemStyle: {
-          //     borderWidth: 4,
-          //   },
-          // },
           title: {
             show: false,
           },

@@ -3,7 +3,7 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { formSchema, getHistorySearchParams, SchemaFiled } from './history.config';
   import { HistoryModalOkEmitParams } from './type';
-  import { ref } from 'vue';
+  import { ref, unref } from 'vue';
   import { getAllDeviceByOrg } from '/@/api/dataBoard';
   import { getDeviceHistoryInfo } from '/@/api/alarm/position';
   import { DataSource } from '/@/views/visual/palette/types';
@@ -19,58 +19,154 @@
     ],
   });
 
-  const [registerModal, { closeModal }] = useModalInner(async (dataSource: DataSource[]) => {
-    try {
-      dataSource = cloneDeep(dataSource);
-      if (dataSource.length < 2) return;
-      dataSource = dataSource.splice(0, 2);
-      const deviceRecord = dataSource?.at(0) || ({} as DataSource);
-      if (!deviceRecord.organizationId) return;
-      const deviceList = await getAllDeviceByOrg(
-        deviceRecord.organizationId,
-        deviceRecord.deviceProfileId
-      );
-      const options = deviceList
-        .filter((item) => item.tbDeviceId === deviceRecord.deviceId)
-        .map((item) => ({ ...item, label: item.alias || item.name, value: item.tbDeviceId }));
-
-      const attKey = dataSource.map((item) => ({
-        ...item,
-        label: item.attribute,
-        value: item.attribute,
-      }));
-      updateSchema([
-        {
-          field: SchemaFiled.DEVICE_ID,
-          componentProps: {
-            options,
-          },
+  const loading = ref(false);
+  const getDesign = ref();
+
+  const getTwoMap = async (dataSource) => {
+    if (dataSource.length < 2) return;
+    dataSource = dataSource.splice(0, 2);
+    const deviceRecord = dataSource?.at(0) || ({} as DataSource);
+
+    if (!deviceRecord.organizationId) return;
+    const deviceList = await getAllDeviceByOrg(
+      deviceRecord.organizationId,
+      deviceRecord.deviceProfileId
+    );
+    const options = deviceList
+      .filter((item) => item.tbDeviceId === deviceRecord.deviceId)
+      .map((item) => ({ ...item, label: item.alias || item.name, value: item.tbDeviceId }));
+
+    const attKey = dataSource.map((item) => ({
+      ...item,
+      label: item.attribute,
+      value: item.attribute,
+    }));
+
+    updateSchemaMap(options, attKey, deviceRecord);
+  };
+
+  const getOneMap = async (dataSource) => {
+    const deviceRecord = dataSource?.[0];
+    if (!deviceRecord.organizationId) return;
+    const deviceList = await getAllDeviceByOrg(
+      deviceRecord.organizationId,
+      deviceRecord.deviceProfileId
+    );
+    const options = deviceList
+      .filter((item) => item.tbDeviceId === deviceRecord.deviceId)
+      .map((item) => ({ ...item, label: item.alias || item.name, value: item.tbDeviceId }));
+
+    const attKey = dataSource?.map((item) => ({
+      ...item,
+      label: item.attributeName,
+      value: item.attribute,
+    }));
+    updateSchemaMap(options, attKey, deviceRecord);
+  };
+
+  const updateSchemaMap = (options, attKey, deviceRecord) => {
+    updateSchema([
+      {
+        field: SchemaFiled.DEVICE_ID,
+        componentProps: {
+          options,
         },
-        {
-          field: SchemaFiled.KEYS,
-          component: 'Select',
-          defaultValue: attKey.map((item) => item.value),
-          componentProps: {
-            options: attKey,
-            mode: 'multiple',
-            disabled: true,
-          },
+      },
+      {
+        field: SchemaFiled.KEYS,
+        component: 'Select',
+        defaultValue: attKey.map((item) => item.value),
+        componentProps: {
+          options: attKey,
+          mode: 'multiple',
+          disabled: true,
         },
-      ]);
+      },
+    ]);
 
-      setFieldsValue({
-        [SchemaFiled.DEVICE_ID]: deviceRecord.deviceId,
-        [SchemaFiled.KEYS]: attKey.map((item) => item.value),
-      });
+    setFieldsValue({
+      [SchemaFiled.DEVICE_ID]: deviceRecord.deviceId,
+      [SchemaFiled.KEYS]: attKey.map((item) => item.value),
+    });
+  };
+
+  const [registerModal, { closeModal }] = useModalInner(async (dataSource: DataSource[]) => {
+    try {
+      getDesign.value = dataSource;
+      dataSource = cloneDeep(dataSource);
+      //判断选择是不是结构体
+      if (dataSource.length == 1 && dataSource?.[0]?.lal) {
+        getOneMap(dataSource);
+        return;
+      }
+      getTwoMap(dataSource);
     } catch (error) {
       throw error;
     }
   });
 
+  const getMultipleDataSource = async (res) => {
+    let timespanList = Object.keys(res).reduce((prev, next) => {
+      const ts = res[next].map((item) => item.ts);
+      return [...prev, ...ts];
+    }, [] as number[]);
+    timespanList = [...new Set(timespanList)];
+
+    const track: Record<'lng' | 'lat', number>[] = [];
+    const keys = Object.keys(res);
+
+    for (const ts of timespanList) {
+      const list: { ts: number; value: number }[] = [];
+      for (const key of keys) {
+        const record = res[key].find((item) => ts === item.ts);
+        if (!validEffective(record?.value)) {
+          continue;
+        }
+        list.push(record as any);
+      }
+
+      if (list.length === 2 && list.every(Boolean)) {
+        const lng = list.at(0)?.value;
+        const lat = list.at(1)?.value;
+        if (lng && lat) track.push({ lng, lat });
+      }
+    }
+    return track;
+  };
+
+  // 单数据源选择结构体
+  const getSingleDataSource = async (res) => {
+    const [keys] = Object.keys(res);
+    const track: Record<'lng' | 'lat', number>[] = [];
+    const dataSource = res[keys]?.map((item) => {
+      return {
+        value: item.value ? JSON.parse(item.value) : {},
+      };
+    });
+    const list: { value: number }[] = [];
+    dataSource?.forEach((item) => {
+      if (
+        //判断结构体得值是不是数字
+        Object.values(item.value).every((item1) => {
+          return validEffective(item1 as any);
+        })
+      ) {
+        list.push(item.value);
+      }
+    });
+    const { latitude, longitude } = unref(getDesign)?.[0]; //获取选择的经纬度选项
+
+    list.forEach((item) => {
+      const lng = item[longitude];
+      const lat = item[latitude];
+      if (lng && lat) track.push({ lng, lat });
+    });
+    return track;
+  };
+
   const validEffective = (value = '') => {
     return !!(value && !isNaN(value as unknown as number));
   };
-  const loading = ref(false);
   const handleOk = async () => {
     try {
       await validate();
@@ -84,33 +180,9 @@
         ...value,
         [SchemaFiled.KEYS]: value[SchemaFiled.KEYS].join(','),
       });
+      const ifSingle = unref(getDesign)?.length === 1 && unref(getDesign)?.[0]?.lal;
 
-      let timespanList = Object.keys(res).reduce((prev, next) => {
-        const ts = res[next].map((item) => item.ts);
-        return [...prev, ...ts];
-      }, [] as number[]);
-      timespanList = [...new Set(timespanList)];
-
-      const track: Record<'lng' | 'lat', number>[] = [];
-      const keys = Object.keys(res);
-
-      for (const ts of timespanList) {
-        const list: { ts: number; value: number }[] = [];
-        for (const key of keys) {
-          const record = res[key].find((item) => ts === item.ts);
-          if (!validEffective(record?.value)) {
-            continue;
-          }
-          list.push(record as any);
-        }
-
-        if (list.length === 2 && list.every(Boolean)) {
-          const lng = list.at(0)?.value;
-          const lat = list.at(1)?.value;
-          if (lng && lat) track.push({ lng, lat });
-        }
-      }
-
+      const track = ifSingle ? await getSingleDataSource(res) : await getMultipleDataSource(res);
       emit('ok', { track, value } as HistoryModalOkEmitParams);
       closeModal();
     } catch (error) {

@@ -24,6 +24,14 @@
     return props.config.option.dataSource?.at(0)?.deviceId;
   });
 
+  const getDesign = computed(() => {
+    const { option } = props.config;
+    const { dataSource } = option || {};
+    return {
+      dataSource: dataSource,
+    };
+  });
+
   /**
    * @description 经度key
    */
@@ -42,7 +50,7 @@
     return !!(value && !isNaN(value as unknown as number));
   };
 
-  const updateFn: MultipleDataFetchUpdateFn = (message, deviceId) => {
+  const getTwoMap = (message, deviceId) => {
     if (unref(getDeviceId) !== deviceId) return;
 
     const { data = {} } = message;
@@ -51,7 +59,7 @@
 
     const lngData = bindMessage[unref(getLngKey)] || [];
     const [lngLatest] = lngData;
-    const [, lng] = lngLatest;
+    const [, lng] = lngLatest || [];
 
     const latData = bindMessage[unref(getLatKey)] || [];
     const [latLatest] = latData;
@@ -62,6 +70,34 @@
     }
   };
 
+  const getOneMap = (message, deviceId) => {
+    if (unref(getDeviceId) !== deviceId) return;
+
+    const { longitude, latitude, attribute } = unref(getDesign)?.dataSource?.[0] || {};
+    const { data } = message || {};
+    const bindMessage = data[deviceId];
+    const [, values] = attribute && bindMessage?.[attribute][0];
+
+    const mapValues = values ? JSON.parse(values) : {};
+    const lng = longitude && mapValues[longitude];
+    const lat = latitude && mapValues[latitude];
+
+    if (validEffective(lng) && validEffective(lat)) {
+      drawLine({ lng: Number(lng), lat: Number(lat) });
+    }
+  };
+
+  const updateFn: MultipleDataFetchUpdateFn = (message, deviceId) => {
+    const { lal } = unref(getDesign)?.dataSource?.[0] || {};
+    // 属性选择结构体类型时
+    if (lal && unref(getDesign)?.dataSource?.length == 1) {
+      getOneMap(message, deviceId);
+      return;
+    }
+    // 选择两个属性时
+    getTwoMap(message, deviceId);
+  };
+
   useMultipleDataFetch(props, updateFn);
 
   const { drawLine } = useMapTrackPlayBack(mapInstance);
@@ -100,11 +136,3 @@
     <div v-show="!loading" ref="wrapRef" :id="wrapId" class="w-full h-full no-drag"> </div>
   </main>
 </template>
-
-<style lang="less" scoped>
-  // .map-spin-wrapper {
-  //   :deep(.ant-spin-container) {
-  //     @apply justify-center items-center p-2 w-full h-full;
-  //   }
-  // }
-</style>

@@ -247,7 +247,6 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
             });
           },
           placeholder: '请选择设备',
-          getPopupContainer: () => document.body,
           ...createPickerSearch(),
         };
       },
@@ -382,11 +381,18 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
             return [];
           },
           placeholder: '请选择属性',
-          getPopupContainer: () => document.body,
           onChange(value: string, option: Record<'label' | 'value' | any, string>) {
+            const { detail }: any = option || {};
             setFieldsValue({
               [DataSourceField.ATTRIBUTE_NAME]: value ? option.label : null,
               [DataSourceField.EXTENSION_DESC]: value ? JSON.stringify(option.extensionDesc) : '',
+              // 地图组件结构体
+              lal:
+                category === 'MAP' && value && detail?.dataType.type === 'STRUCT'
+                  ? JSON.stringify(detail?.dataType.specs)
+                  : null,
+              latitude: null,
+              longitude: null,
             });
           },
           ...createPickerSearch(),
@@ -394,6 +400,46 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
       },
     },
     {
+      field: 'lal',
+      label: '经纬度存储的值',
+      component: 'Input',
+      show: false,
+    },
+    {
+      field: 'longitude',
+      label: '经度',
+      colProps: { span: 8 },
+      component: 'Select',
+      required: true,
+      ifShow: ({ model }) => category === 'MAP' && model.lal,
+      componentProps({ formModel }) {
+        const { lal } = formModel || {};
+        return {
+          placeholder: '请选择经度',
+          options: lal
+            ? JSON.parse(lal)?.map((item) => ({ label: item.functionName, value: item.identifier }))
+            : [],
+        };
+      },
+    },
+    {
+      field: 'latitude',
+      label: '纬度',
+      colProps: { span: 8 },
+      required: true,
+      component: 'Select',
+      ifShow: ({ model }) => category === 'MAP' && model.lal,
+      componentProps({ formModel }) {
+        const { lal } = formModel || {};
+        return {
+          placeholder: '请选择纬度',
+          options: lal
+            ? JSON.parse(lal)?.map((item) => ({ label: item.functionName, value: item.identifier }))
+            : [],
+        };
+      },
+    },
+    {
       field: DataSourceField.EXTENSION_DESC,
       component: 'Input',
       show: false,

-import { ReceiveTsSubCmdsGroupMessageType } from '../index.type';
+import { ReceiveTsSubCmdsGroupMessageType } from './socket/useSocket.type';
 
 export const useReceiveMessage = () => {
   const forEachGroupMessage = (

-import cloneDeep from 'lodash-es/cloneDeep';
-import { ComponentConfig } from '.';
-import {
-  ConfigType,
-  CreateComponentType,
-  PublicComponentOptions,
-  PublicPresetOptions,
-} from '/@/views/visual/packages/index.type';
-import { PublicConfigClass, componentInitConfig } from '/@/views/visual/packages/publicConfig';
-import { ComponentConfigFieldEnum } from '/@/views/visual/packages/enum';
-
-export const option: PublicPresetOptions = {
-  [ComponentConfigFieldEnum.FONT_COLOR]: '#',
-  [ComponentConfigFieldEnum.SHOW_DEVICE_NAME]: false,
-};
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
-  public key: string = ComponentConfig.key;
-
-  public attr = { ...componentInitConfig };
-
-  public componentConfig: ConfigType = cloneDeep(ComponentConfig);
-
-  public persetOption = cloneDeep(option);
-
-  public option: PublicComponentOptions;
-
-  constructor(option: PublicComponentOptions) {
-    super();
-    this.option = { ...option };
-  }
-}

-<script lang="ts" setup>
-  import { ComponentConfigFieldEnum } from '/@/views/visual/packages/enum';
-  import { useForm, BasicForm } from '/@/components/Form';
-  import { PublicFormInstaceType } from '/@/views/visual/dataSourceBindPanel/index.type';
-
-  const [register, { getFieldsValue, setFieldsValue, resetFields }] = useForm({
-    schemas: [
-      {
-        field: ComponentConfigFieldEnum.FONT_COLOR,
-        label: '数值字体颜色',
-        component: 'ColorPicker',
-        changeEvent: 'update:value',
-        componentProps: {
-          defaultValue: '#FD7347',
-        },
-      },
-      {
-        field: ComponentConfigFieldEnum.SHOW_DEVICE_NAME,
-        label: '显示设备名称',
-        component: 'Checkbox',
-      },
-    ],
-    showActionButtonGroup: false,
-    labelWidth: 120,
-    baseColProps: {
-      span: 12,
-    },
-  });
-
-  const getFormValues = () => {
-    return getFieldsValue();
-  };
-
-  const setFormValues = (data: Recordable) => {
-    return setFieldsValue(data);
-  };
-
-  defineExpose({
-    getFormValues,
-    setFormValues,
-    resetFormValues: resetFields,
-  } as PublicFormInstaceType);
-</script>
-
-<template>
-  <BasicForm @register="register" />
-</template>

-<script lang="ts" setup>
-  import { CreateComponentType } from '/@/views/visual/packages/index.type';
-  import { BasicForm, useForm } from '/@/components/Form';
-  import {
-    PublicComponentValueType,
-    PublicFormInstaceType,
-  } from '/@/views/visual/dataSourceBindPanel/index.type';
-  import { commonDataSourceSchemas } from '../config/common.config';
-
-  defineProps<{
-    values: PublicComponentValueType;
-    componentConfig: CreateComponentType;
-  }>();
-
-  const [register, { getFieldsValue, setFieldsValue, validate, resetFields }] = useForm({
-    labelWidth: 0,
-    showActionButtonGroup: false,
-    layout: 'horizontal',
-    labelCol: { span: 0 },
-    schemas: commonDataSourceSchemas(),
-  });
-
-  const getFormValues = () => {
-    return getFieldsValue();
-  };
-
-  const setFormValues = (record: Recordable) => {
-    return setFieldsValue(record);
-  };
-
-  defineExpose({
-    getFormValues,
-    setFormValues,
-    validate,
-    resetFormValues: resetFields,
-  } as PublicFormInstaceType);
-</script>
-
-<template>
-  <BasicForm @register="register" />
-</template>

-import { useComponentKeys } from '/@/views/visual/packages/hook/useComponentKeys';
-import { ConfigType, PackagesCategoryEnum } from '/@/views/visual/packages/index.type';
-
-const componentKeys = useComponentKeys('componentKeys');
-
-export const ComponentConfig: ConfigType = {
-  ...componentKeys,
-  title: '组件名',
-  package: PackagesCategoryEnum.TEXT,
-};

-<script lang="ts" setup>
-  import { ComponentPropsConfigType } from '/@/views/visual/packages/index.type';
-  import { option } from './config';
-  import { useDataFetch } from '../hook/socket/useSocket';
-  import { DataFetchUpdateFn } from '../hook/socket/useSocket.type';
-
-  const props = defineProps<{
-    config: ComponentPropsConfigType<typeof option>;
-  }>();
-
-  const updateFn: DataFetchUpdateFn = (_message) => {};
-
-  useDataFetch(props, updateFn);
-</script>
-
-<template>
-  <main class="w-full h-full flex flex-col justify-center items-center"> </main>
-</template>

@@ -150,7 +150,6 @@
     getIsSharePage,
     (value) => {
       if (value) {
-        console.log(unref(getDarkMode));
         const root = document.querySelector('#app');
         (root as HTMLDivElement).style.backgroundColor =
           unref(getDarkMode) === ThemeEnum.LIGHT ? '#F5F5F5' : '#1b1b1b';

@@ -29,6 +29,9 @@ export interface DataSource {
   customCommand: CustomCommand;
   videoConfig?: VideoConfigType;
   [key: string]: any;
+  lal?: string;
+  latitude?: string | number;
+  longitude?: string | number;
 }
 
 export interface ExtraDataSource extends DataSource, PublicComponentOptions {

@@ -32,7 +32,6 @@ app.ws.use(
         });
         ctx.websocket.send(data);
       }
-      console.log(message);
     });
   })
 );
@@ -59,5 +58,6 @@ app.use(router.allowedMethods());
 app.use(koaStatic(path.join(__dirname)));
 
 app.listen(PORT, () => {
+  // eslint-disable-next-line no-console
   console.log(`Application started successfully: http://localhost:${PORT}`);
 });