diff --git a/plugin/antdv.ts b/plugin/antdv.ts
index 1d051d09fa163076b559df1adf70e5e98f4b5600..fb7d12e381fcb6c2596fd43bfba1b4d427ac11ba 100644
--- a/plugin/antdv.ts
+++ b/plugin/antdv.ts
@@ -1,6 +1,6 @@
 import type { IMatcher } from './jetlinks'
 
-
+// kebab-case 要求短语内的各个单词或缩写之间以-（连字符）做间隔
 export function kebabCase(key: string) {
   const result = key.replace(/([A-Z])/g, ' $1').trim()
   return result.split(' ').join('-').toLowerCase()
diff --git a/src/api/account/notificationSubscription.ts b/src/api/account/notificationSubscription.ts
index f7dac85ccdbe0dba0fa8775c9733121a567ae5f8..afc034152cdf0c055b5fc983d387695bf963261c 100644
--- a/src/api/account/notificationSubscription.ts
+++ b/src/api/account/notificationSubscription.ts
@@ -30,7 +30,6 @@ export const getWechatOAuth2 = (configId: string, templateId: string, url: strin
 export const getDingTalkOAuth2 = (configId: string, url: string) => server.get(`/notifier/dingtalk/corp/${configId}/oauth2/binding-user-url?authCode=${url}`);
 
 // 获取oauth2授权的用户绑定码
-
 export const getUserBind = (type: 'wechat' | 'dingtalk', params: any) => server.get(`/notifier/${type}/corp/oauth2/user-bind-code`, params);
 
 // 根据绑定码绑定当前用户
diff --git a/src/api/rule-engine/configuration.ts b/src/api/rule-engine/configuration.ts
index 964c26f173f100d20d14da6b33103ccd6497fe33..f4f20f2c572ed62d3046eb27ef2c149b816721bc 100644
--- a/src/api/rule-engine/configuration.ts
+++ b/src/api/rule-engine/configuration.ts
@@ -34,7 +34,7 @@ export const save = (data:any) =>server.post('/alarm/config',data);
 /**
  * 更新基础设置
  */
-export const updata = (data:any) => server.patch('/alarm/config',data);
+export const update = (data:any) => server.patch('/alarm/config',data);
 /**
  * 获取基础设置数据
  */
diff --git a/src/store/alarm.ts b/src/store/alarm.ts
index b0f998e4c1ea071d248b4fab30edf1bb40d9d9cc..5a6d6756daad3129179ce1a7c09d2c228071e33f 100644
--- a/src/store/alarm.ts
+++ b/src/store/alarm.ts
@@ -39,9 +39,7 @@ export const useAlarmStore = defineStore('alarm', () => {
 
 export const useAlarmConfigurationStore = defineStore('alarmConfigration', () => {
   const configurationData = reactive({
-    current:{
-
-    }
+    current:{}
   })
   return { configurationData }
 })
\ No newline at end of file
diff --git a/src/store/department.ts b/src/store/department.ts
index ca278f3771a2f699d152b1e6db9b30ee1c632bbd..afb92003bc6670a00068a682c74a12db12264664 100644
--- a/src/store/department.ts
+++ b/src/store/department.ts
@@ -12,9 +12,9 @@ export const useDepartmentStore = defineStore({
     id: 'department',
     state: (): DepartmentStateType => ({
         productId: undefined,
-        // 设备资产分配弹窗操作类型: 
-        // 1. optType === 'handle': 手动点击资产分配按钮; 
-        // 2. optType === ': 产品资产分配后, 自动弹出设备资产分配
+        // 设备资产分配弹窗操作类型:
+        // 1. optType === 'handle': 手动点击资产分配按钮;
+        // 2. optType === '': 产品资产分配后, 自动弹出设备资产分配
         optType: '',
         crossPageKeys: [], // 表格跨页多选的keys
         changedApis: {},
diff --git a/src/utils/consts.ts b/src/utils/consts.ts
index c2561832413043b2f842b950b337597eb7b38b45..62c5acb1492e44e565ad41d88170572df940c20d 100644
--- a/src/utils/consts.ts
+++ b/src/utils/consts.ts
@@ -29,6 +29,7 @@ export const StatusColorEnum = {
   'default': 'default',
 }
 
+/** 系统设置 */
 export const SystemConst = {
   API_BASE: 'api',
   SYSTEM_NAME: 'Jetlinks',
@@ -52,7 +53,7 @@ export const USER_CENTER_MENU_CODE = 'account-center'
 export const USER_CENTER_MENU_BUTTON_CODE = 'user-center-passwd-update'
 export const messageSubscribe  = 'message-subscribe'
 
-/**协议列表 */
+/** 协议列表 */
 export const protocolList = [
     { label: 'OPC_UA', value: 'OPC_UA', alias: 'opc-ua' },
     { label: 'MODBUS_TCP', value: 'MODBUS_TCP', alias: 'Modbus/TCP' },
diff --git a/src/views/device/Firmware/Task/Save/SelectDevices.vue b/src/views/device/Firmware/Task/Save/SelectDevices.vue
index d080fdc10085f342fb3db337be9e0068c1618334..c969e687e7fe9f537bbe8cefeed3502b4250d137 100644
--- a/src/views/device/Firmware/Task/Save/SelectDevices.vue
+++ b/src/views/device/Firmware/Task/Save/SelectDevices.vue
@@ -266,7 +266,6 @@ onMounted(() => {
                 if (props.data.id) {
                     checkLable.value = updateSelect(props.data.deviceId);
                     emit('update:modelValue', props.data.deviceId);
-                    console.log(111, checkLable.value, props.data.deviceId);
                 }
             }
         },
diff --git a/src/views/device/components/Metadata/Base/Base.vue b/src/views/device/components/Metadata/Base/Base.vue
index 09b5e9c2ef70b88b4a70b8b6276ceeb13063e1e8..ca22d2a78a39caa2edaf32116afe87d25a815b4d 100644
--- a/src/views/device/components/Metadata/Base/Base.vue
+++ b/src/views/device/components/Metadata/Base/Base.vue
@@ -12,6 +12,7 @@
         @change="(data) => dataSourceCache = data"
     >
         <template #expand>
+          <!-- @click="handleAddClick()" -->
           <PermissionButton
               type="primary"
               v-if="!showSave"
@@ -26,7 +27,7 @@
                         : '新增',
                         getPopupContainer: getPopupContainer,
                 }"
-              @click="handleAddClick()"
+              @click="showDrawer({}, 'create')"
               placement="topRight"
           >
             新增
@@ -136,19 +137,20 @@
         </template>
         <template #action="{data}">
           <j-space>
+            <!-- @click="handleAddClick(null, data.index)" -->
             <PermissionButton
                 :has-permission="`${permission}:update`"
                 type="link"
                 key="edit"
                 style="padding: 0"
-                :disabled="!!operateLimits('add', type)"
-                @click="copyItem(data.record, data.index)"
+                :disabled="!!operateLimits('update', type)"
+                @click="showDrawer(data.record, 'edit')"
                 :tooltip="{
-                  title: operateLimits('add', type) ? '当前的存储方式不支持复制' : '复制',
+                  title: operateLimits('update', type) ? '当前的存储方式不支持编辑' : '编辑',
                   getPopupContainer: getPopupContainer,
                 }"
             >
-              <AIcon type="CopyOutlined" />
+              <AIcon type="EditOutlined" />
             </PermissionButton>
             <PermissionButton
                 :has-permission="`${permission}:update`"
@@ -156,7 +158,7 @@
                 key="edit"
                 style="padding: 0"
                 :disabled="!!operateLimits('add', type)"
-                @click="handleAddClick(null, data.index)"
+                @click="showDrawer({}, 'create')"
                 :tooltip="{
                   title: operateLimits('add', type) ? '当前的存储方式不支持新增' : '新增',
                   getPopupContainer: getPopupContainer,
@@ -177,6 +179,20 @@
             >
               <AIcon type="FileSearchOutlined" />
             </PermissionButton>
+            <PermissionButton
+                :has-permission="`${permission}:update`"
+                type="link"
+                key="edit"
+                style="padding: 0"
+                :disabled="!!operateLimits('add', type)"
+                @click="copyItem(data.record, data.index)"
+                :tooltip="{
+                  title: operateLimits('add', type) ? '当前的存储方式不支持复制' : '复制',
+                  getPopupContainer: getPopupContainer,
+                }"
+            >
+              <AIcon type="CopyOutlined" />
+            </PermissionButton>
             <PermissionButton
                 :has-permission="`${permission}:update`"
                 type="link"
@@ -203,26 +219,60 @@
           </j-space>
         </template>
     </j-data-table>
+    <!-- 新增/编辑视图 -->
+    <PropertiesDrawer
+        v-if="type === 'properties' && detailData.type !== 'view' && detailData.visible"
+        :data="detailData.data"
+        :type="detailData.type"
+        @change="(data) => detailData.data = data"
+        @save="handleSaveClick"
+        @cancel="cancelDrawer"
+    />
+    <FunctionDrawer
+        v-else-if="type === 'functions' && detailData.type !== 'view' && detailData.visible"
+        :data="detailData.data"
+        :type="detailData.type"
+        @change="(data) => detailData.data = data"
+        @save="handleSaveClick"
+        @cancel="cancelDrawer"
+    />
+    <EventDrawer
+        v-else-if="type === 'events' && detailData.type !== 'view' && detailData.visible"
+        :data="detailData.data"
+        :type="detailData.type"
+        @change="(data) => detailData.data = data"
+        @save="handleSaveClick"
+        @cancel="cancelDrawer"
+    />
+    <TagsDrawer
+        v-else-if="type === 'tags' && detailData.type !== 'view' && detailData.visible"
+        :data="detailData.data"
+        :type="detailData.type"
+        @change="(data) => detailData.data = data"
+        @save="handleSaveClick"
+        @cancel="cancelDrawer"
+    />
+    <!-- 查看视图 -->
     <PropertiesModal
-        v-if="type === 'properties' && detailData.visible"
+        v-if="type === 'properties' && detailData.type === 'view' && detailData.visible"
         :data="detailData.data"
         :getPopupContainer="getPopupContainer"
         @cancel="cancelDetailModal"
     />
     <FunctionModal
-        v-else-if="type === 'functions' && detailData.visible"
+        v-else-if="type === 'functions' && detailData.type === 'view' && detailData.visible"
         :data="detailData.data"
         :getPopupContainer="getPopupContainer"
         @cancel="cancelDetailModal"
     />
     <EventModal
-        v-else-if="type === 'events' && detailData.visible"
+        v-else-if="type === 'events' && detailData.type === 'view' && detailData.visible"
         :data="detailData.data"
         :getPopupContainer="getPopupContainer"
         @cancel="cancelDetailModal"
     />
     <TagsModal
-        v-else-if="type === 'tags' && detailData.visible"
+        v-else-if="type === 'tags' && detailData.type === 'view' && detailData.visible"
         :data="detailData.data"
         :getPopupContainer="getPopupContainer"
         @cancel="cancelDetailModal"
@@ -252,6 +302,7 @@ import { DeviceInstance } from '@/views/device/Instance/typings';
 import { onlyMessage , LocalStore} from '@/utils/comm';
 import {omit} from "lodash-es";
 import { PropertiesModal, FunctionModal, EventModal, TagsModal } from './DetailModal'
+import { PropertiesDrawer, FunctionDrawer, EventDrawer, TagsDrawer } from './DetailDrawer'
 import { Modal } from 'jetlinks-ui-components'
 import {EventEmitter} from "@/utils/utils";
 import {computed, watch} from "vue";
@@ -300,7 +351,8 @@ const {columns} = useColumns(props.type, _target, noEdit, productNoEdit)
 
 const detailData = reactive({
   data: {},
-  visible:false
+  visible:false,
+  type: '' // 可选值：create、edit、view
 })
 
 
@@ -320,17 +372,30 @@ const showLastDelete = computed(() => {
 })
 
 provide('_dataSource', dataSourceCache)
+
 const showDetail = (data: any) => {
   detailData.data = data
+  detailData.type = 'view'
   detailData.visible = true
 }
 
 const cancelDetailModal = () => {
   detailData.data = {}
+  detailData.type = 'view'
   detailData.visible = false
 }
 
-const operateLimits = (action: 'add' | 'updata', types: MetadataType) => {
+const showDrawer = (data: any, type: string) => {
+  detailData.data = data
+  detailData.type = type
+  detailData.visible = true
+}
+
+const cancelDrawer = () => {
+  detailData.visible = false
+}
+
+const operateLimits = (action: 'add' | 'update', types: MetadataType) => {
   return (
       _target === 'device' &&
       (instanceStore.detail.features || []).find((item: { id: string; name: string }) => item.id === limitsMap.get(`${types}-${action}`))
@@ -398,7 +463,6 @@ const getDataByType = () => {
 }
 
 const handleAddClick = async (_data?: any, index?: number) => {
-
   const newObject = _data || getDataByType()
 
   const _addData = await tableRef.value.addItem(newObject, index)
@@ -435,13 +499,16 @@ const editStatusChange = (status: boolean) => {
 }
 
 const handleSaveClick = async (next?: Function) => {
-    let resp = await tableRef.value.getData().finally(() => {
-
-    });
+    let resp = await tableRef.value.getData().finally(() => {});
+    if(detailData.type === 'create') {
+      resp.push(detailData.data);
+    }
     if(resp) {
-
       const virtual: any[] = [];
       const arr = resp.map((item: any) => {
+        if(detailData.type === 'edit' && item.id === detailData.data.id) {
+          item = detailData.data;
+        }
         if(item.expands?.virtualRule) {
           const triggerProperties = item.expands.virtualRule.triggerProperties
           const rule = omit(item.expands.virtualRule, ['triggerProperties'])
@@ -488,7 +555,9 @@ const handleSaveClick = async (next?: Function) => {
         loading.value = false
       })
       if(result.success) {
-        dataSource.value = resp
+        dataSource.value = arr
+        detailData.data = {}
+        detailData.type = ''
         tableRef.value.cleanEditStatus()
         editStatus.value = false
         onlyMessage('操作成功！')
diff --git a/src/views/device/components/Metadata/Base/DetailDrawer/EventDrawer.vue b/src/views/device/components/Metadata/Base/DetailDrawer/EventDrawer.vue
new file mode 100644
index 0000000000000000000000000000000000000000..e3fec157264f53e92dee1f1a1066cc5e48c3449c
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/DetailDrawer/EventDrawer.vue
@@ -0,0 +1,64 @@
+<template>
+  <j-drawer
+        visible
+        :title="props.type === 'create' ? '新增事件': '编辑事件'"
+        placement="right"
+        @close="cancel"
+    >
+      <j-form ref="formRef" :model="formData" layout="vertical">
+        <BaseForm type="product" modelType="events" v-model:value="formData"></BaseForm>
+      </j-form>
+      <template #extra>
+        <j-button style="margin-right: 8px" @click="cancel">取消</j-button>
+        <j-button type="primary" @click="ok">确认</j-button>
+      </template>
+    </j-drawer>
+</template>
+
+<script setup lang="ts" name="EventDrawer">
+import { cloneDeep } from "lodash-es";
+import { watch } from "vue";
+import BaseForm from '@/views/device/components/Metadata/Base/Edit/BaseForm.vue';
+
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => ({})
+  },
+  type: {
+    type: String,
+    default: '' // create, edit
+  }
+})
+
+const emit = defineEmits(['change', 'save', 'cancel'])
+
+const formRef = ref<any>(null)
+
+const formData = reactive({})
+
+const cancel = () => {
+  emit('cancel');
+}
+
+const ok = () => {
+  formRef.value?.validateFields().then(async (formValue: any) => {
+    emit('change', formValue);
+    emit('save');
+    cancel();
+  })
+}
+
+watch(() => props.data, () => {
+  if(props.type === 'create') {
+    Object.assign(formData, {});
+  } else if(props.type === 'edit') {
+    Object.assign(formData, cloneDeep(props.data));
+  }
+}, { immediate: true })
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/device/components/Metadata/Base/DetailDrawer/FunctionDrawer.vue b/src/views/device/components/Metadata/Base/DetailDrawer/FunctionDrawer.vue
new file mode 100644
index 0000000000000000000000000000000000000000..1540c6dc57232664bc651815814cadc9ac840b36
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/DetailDrawer/FunctionDrawer.vue
@@ -0,0 +1,64 @@
+<template>
+  <j-drawer
+        visible
+        :title="props.type === 'create' ? '新增功能': '编辑功能'"
+        placement="right"
+        @close="cancel"
+    >
+      <j-form ref="formRef" :model="formData" layout="vertical">
+        <BaseForm type="product" modelType="functions" v-model:value="formData"></BaseForm>
+      </j-form>
+      <template #extra>
+        <j-button style="margin-right: 8px" @click="cancel">取消</j-button>
+        <j-button type="primary" @click="ok">确认</j-button>
+      </template>
+    </j-drawer>
+</template>
+
+<script setup lang="ts" name="FunctionDrawer">
+import { cloneDeep } from "lodash-es";
+import { watch } from "vue";
+import BaseForm from '@/views/device/components/Metadata/Base/Edit/BaseForm.vue';
+
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => ({})
+  },
+  type: {
+    type: String,
+    default: '' // create, edit
+  }
+})
+
+const emit = defineEmits(['change', 'save', 'cancel'])
+
+const formRef = ref<any>(null)
+
+const formData = reactive({})
+
+const cancel = () => {
+  emit('cancel');
+}
+
+const ok = () => {
+  formRef.value?.validateFields().then(async (formValue: any) => {
+    emit('change', formValue);
+    emit('save');
+    cancel();
+  })
+}
+
+watch(() => props.data, () => {
+  if(props.type === 'create') {
+    Object.assign(formData, {});
+  } else if(props.type === 'edit') {
+    Object.assign(formData, cloneDeep(props.data));
+  }
+}, { immediate: true })
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/device/components/Metadata/Base/DetailDrawer/JsonView.vue b/src/views/device/components/Metadata/Base/DetailDrawer/JsonView.vue
new file mode 100644
index 0000000000000000000000000000000000000000..95ad70215f786edee2374fe5258e38c1001ea15b
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/DetailDrawer/JsonView.vue
@@ -0,0 +1,38 @@
+<template>
+  <div class="json-view-box">
+    <div class="json-view-border">
+      <j-scrollbar :height="height">
+        <JsonViewer :value="value" :expanded="true" :expandDepth="4" />
+      </j-scrollbar>
+    </div>
+
+  </div>
+</template>
+
+<script setup lang="ts" name="JsonView">
+import 'vue3-json-viewer/dist/index.css';
+import { JsonViewer } from 'vue3-json-viewer';
+
+const props = defineProps({
+  value: {
+    type: [Object, Array],
+    default: () => ({})
+  },
+  height: {
+    type: Number,
+    default: 250
+  }
+})
+
+</script>
+
+<style scoped lang="less">
+.json-view-box {
+  width: 100%;
+  padding-left: 32px;
+  .json-view-border {
+    border: 1px solid rgba(0,0,0,.15);
+    border-radius:2px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/device/components/Metadata/Base/DetailDrawer/PropertiesDrawer.vue b/src/views/device/components/Metadata/Base/DetailDrawer/PropertiesDrawer.vue
new file mode 100644
index 0000000000000000000000000000000000000000..f00aab5741ffaa4d9e4734f136bd06ce59d490ef
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/DetailDrawer/PropertiesDrawer.vue
@@ -0,0 +1,64 @@
+<template>
+  <j-drawer
+        visible
+        :title="props.type === 'create' ? '新增属性': '编辑属性'"
+        placement="right"
+        @close="cancel"
+    >
+      <j-form ref="formRef" :model="formData" layout="vertical">
+        <BaseForm type="product" modelType="properties" v-model:value="formData"></BaseForm>
+      </j-form>
+      <template #extra>
+        <j-button style="margin-right: 8px" @click="cancel">取消</j-button>
+        <j-button type="primary" @click="ok">确认</j-button>
+      </template>
+    </j-drawer>
+</template>
+
+<script setup lang="ts" name="PropertiesDrawer">
+import { cloneDeep } from "lodash-es";
+import { watch } from "vue";
+import BaseForm from '@/views/device/components/Metadata/Base/Edit/BaseForm.vue';
+
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => ({})
+  },
+  type: {
+    type: String,
+    default: '' // create, edit
+  }
+})
+
+const emit = defineEmits(['change', 'save', 'cancel'])
+
+const formRef = ref<any>(null)
+
+const formData = reactive({})
+
+const cancel = () => {
+  emit('cancel');
+}
+
+const ok = () => {
+  formRef.value?.validateFields().then(async (formValue: any) => {
+    emit('change', formValue);
+    emit('save');
+    cancel();
+  })
+}
+
+watch(() => props.data, () => {
+  if(props.type === 'create') {
+    Object.assign(formData, {});
+  } else if(props.type === 'edit') {
+    Object.assign(formData, cloneDeep(props.data));
+  }
+}, { immediate: true })
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/device/components/Metadata/Base/DetailDrawer/TagsDrawer.vue b/src/views/device/components/Metadata/Base/DetailDrawer/TagsDrawer.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2fd964bbf7223acecc48057c0cb1d52224688e4c
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/DetailDrawer/TagsDrawer.vue
@@ -0,0 +1,64 @@
+<template>
+  <j-drawer
+        visible
+        :title="props.type === 'create' ? '新增标签': '编辑标签'"
+        placement="right"
+        @close="cancel"
+    >
+      <j-form ref="formRef" :model="formData" layout="vertical">
+        <BaseForm type="product" modelType="tags" v-model:value="formData"></BaseForm>
+      </j-form>
+      <template #extra>
+        <j-button style="margin-right: 8px" @click="cancel">取消</j-button>
+        <j-button type="primary" @click="ok">确认</j-button>
+      </template>
+    </j-drawer>
+</template>
+
+<script setup lang="ts" name="TagsDrawer">
+import { cloneDeep } from "lodash-es";
+import { watch } from "vue";
+import BaseForm from '@/views/device/components/Metadata/Base/Edit/BaseForm.vue';
+
+const props = defineProps({
+  data: {
+    type: Object,
+    default: () => ({})
+  },
+  type: {
+    type: String,
+    default: '' // create, edit
+  }
+})
+
+const emit = defineEmits(['change', 'save', 'cancel'])
+
+const formRef = ref<any>(null)
+
+const formData = reactive({})
+
+const cancel = () => {
+  emit('cancel');
+}
+
+const ok = () => {
+  formRef.value?.validateFields().then(async (formValue: any) => {
+    emit('change', formValue);
+    emit('save');
+    cancel();
+  })
+}
+
+watch(() => props.data, () => {
+  if(props.type === 'create') {
+    Object.assign(formData, {});
+  } else if(props.type === 'edit') {
+    Object.assign(formData, cloneDeep(props.data));
+  }
+}, { immediate: true })
+
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/device/components/Metadata/Base/DetailDrawer/index.ts b/src/views/device/components/Metadata/Base/DetailDrawer/index.ts
new file mode 100644
index 0000000000000000000000000000000000000000..6e1a6530b88dba2691c57a2f9f2422750464ab4a
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/DetailDrawer/index.ts
@@ -0,0 +1,4 @@
+export { default as PropertiesDrawer } from './PropertiesDrawer.vue'
+export { default as FunctionDrawer } from './FunctionDrawer.vue'
+export { default as EventDrawer } from './EventDrawer.vue'
+export { default as TagsDrawer } from './TagsDrawer.vue'
\ No newline at end of file
diff --git a/src/views/device/components/Metadata/Base/Edit/BaseForm.vue b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
index c177612614e7b2ab315bc573c4a5c401c2c4d9f6..303fa93b3bd59c0ad7eab2f9d30e2f0a0b9b24a7 100644
--- a/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
+++ b/src/views/device/components/Metadata/Base/Edit/BaseForm.vue
@@ -59,6 +59,7 @@
     <j-textarea v-model:value="value.description" size="small" placeholder="请输入说明"></j-textarea>
   </j-form-item>
 </template>
+
 <script setup lang="ts" name="BaseForm">
 import { PropType } from 'vue';
 import ExpandsForm from './ExpandsForm.vue';
diff --git a/src/views/device/components/Metadata/Base/columns.tsx b/src/views/device/components/Metadata/Base/columns.tsx
index 5c0ba07b14a6fba681f90864a22796a8f50cade2..2f08dc7b507564aff4ad5edb2b14db0285aad88b 100644
--- a/src/views/device/components/Metadata/Base/columns.tsx
+++ b/src/views/device/components/Metadata/Base/columns.tsx
@@ -284,7 +284,7 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', n
     {
       title: '操作',
       dataIndex: 'action',
-      width: 120
+      width: 150
     }
   ]);
 
@@ -386,7 +386,7 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', n
     {
       title: '操作',
       dataIndex: 'action',
-      width: 120
+      width: 150
     }
     // {
     //   title: '读写类型',
@@ -500,7 +500,7 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', n
     {
       title: '操作',
       dataIndex: 'action',
-      width: 120
+      width: 150
     }
   ]);
 
@@ -593,7 +593,7 @@ export const useColumns = (type?: MetadataType, target?: 'device' | 'product', n
     {
       title: '操作',
       dataIndex: 'action',
-      width: 120
+      width: 150
     }
   ]);
 
diff --git a/src/views/device/components/Metadata/Base/components/Source.vue b/src/views/device/components/Metadata/Base/components/Source.vue
index cec352776c88f4e6f308e79db54191f6ea03aeb0..19cecc027fe62119548cf4619c275bad770cd1d7 100644
--- a/src/views/device/components/Metadata/Base/components/Source.vue
+++ b/src/views/device/components/Metadata/Base/components/Source.vue
@@ -97,7 +97,7 @@ import { Form } from 'jetlinks-ui-components';
 import { FULL_CODE } from 'jetlinks-ui-components/es/DataTable'
 import { useInstanceStore } from '@/store/instance';
 import { resetRule } from '@/api/device/instance';
-import { updata } from '@/api/rule-engine/configuration';
+import { update } from '@/api/rule-engine/configuration';
 import { onlyMessage } from '@/utils/comm';
 import { provide } from 'vue';
 import { queryDeviceVirtualProperty } from '@/api/device/instance';
@@ -271,7 +271,7 @@ const handleSearch = async () => {
                     virtualRule:{
                     triggerProperties: _triggerProperties?.length ? _triggerProperties : ['*'],
                     ...resp.result.rule
-                }             
+                }
         });
       }
 };
diff --git a/src/views/device/components/Metadata/Base/hooks/useOperateLimits.ts b/src/views/device/components/Metadata/Base/hooks/useOperateLimits.ts
index 1257ba7067f4880f1c91b84460a326e3ef02f90b..547f156de85ecb2716439fee7882dff463edbf28 100644
--- a/src/views/device/components/Metadata/Base/hooks/useOperateLimits.ts
+++ b/src/views/device/components/Metadata/Base/hooks/useOperateLimits.ts
@@ -3,9 +3,9 @@ import type {MetadataType} from "@/views/device/Product/typings";
 
 const limitsMap = new Map<string, any>();
 limitsMap.set('events-add', 'eventNotInsertable');
-limitsMap.set('events-updata', 'eventNotModifiable');
+limitsMap.set('events-update', 'eventNotModifiable');
 limitsMap.set('properties-add', 'propertyNotInsertable');
-limitsMap.set('properties-updata', 'propertyNotModifiable');
+limitsMap.set('properties-update', 'propertyNotModifiable');
 
 const useOperateLimits = (target: 'device' | 'product') => {
 
diff --git a/src/views/device/components/Metadata/Base/index.vue b/src/views/device/components/Metadata/Base/index.vue
index 48cefb9385d91f47d3a03bcc0739156114648734..9c3a3ead20f601fda35c89197262549ad248d766 100644
--- a/src/views/device/components/Metadata/Base/index.vue
+++ b/src/views/device/components/Metadata/Base/index.vue
@@ -48,8 +48,8 @@
       <template v-if="column.dataIndex === 'action'">
         <j-space>
           <PermissionButton :has-permission="`${permission}:update`" type="link" key="edit" style="padding: 0"
-            :disabled="operateLimits('updata', type)" @click="handleEditClick(record)" :tooltip="{
-              title: operateLimits('updata', type) ? '当前的存储方式不支持编辑' : '编辑',
+            :disabled="operateLimits('update', type)" @click="handleEditClick(record)" :tooltip="{
+              title: operateLimits('update', type) ? '当前的存储方式不支持编辑' : '编辑',
             }">
             <AIcon type="EditOutlined" />
           </PermissionButton>
@@ -171,10 +171,10 @@ const handleAddClick = () => {
 
 const limitsMap = new Map<string, any>();
 limitsMap.set('events-add', 'eventNotInsertable');
-limitsMap.set('events-updata', 'eventNotModifiable');
+limitsMap.set('events-update', 'eventNotModifiable');
 limitsMap.set('properties-add', 'propertyNotInsertable');
-limitsMap.set('properties-updata', 'propertyNotModifiable');
-const operateLimits = (action: 'add' | 'updata', types: MetadataType) => {
+limitsMap.set('properties-update', 'propertyNotModifiable');
+const operateLimits = (action: 'add' | 'update', types: MetadataType) => {
   return (
     target === 'device' &&
     (instanceStore.detail.features || []).find((item: { id: string; name: string }) => item.id === limitsMap.get(`${types}-${action}`))
@@ -204,7 +204,7 @@ const resetMetadata = async () => {
     await productStore.getDetail(id as string)
   }
   metadataStore.set('importMetadata', true)
-  
+
 };
 
 const removeItem = async (record: MetadataItem) => {
diff --git a/src/views/device/components/Metadata/Base/utils.ts b/src/views/device/components/Metadata/Base/utils.ts
index bd9700b42db94b205344a35fb98efe29cba40bf7..d337a07945006d856f49706575da92a1351b4670 100644
--- a/src/views/device/components/Metadata/Base/utils.ts
+++ b/src/views/device/components/Metadata/Base/utils.ts
@@ -16,6 +16,6 @@ export const expandsType = ref({
 
 export const limitsMap = new Map<string, any>();
 limitsMap.set('events-add', 'eventNotInsertable');
-limitsMap.set('events-updata', 'eventNotModifiable');
+limitsMap.set('events-update', 'eventNotModifiable');
 limitsMap.set('properties-add', 'propertyNotInsertable');
-limitsMap.set('properties-updata', 'propertyNotModifiable');
\ No newline at end of file
+limitsMap.set('properties-update', 'propertyNotModifiable');
\ No newline at end of file
diff --git a/src/views/init-home/Menu/index.vue b/src/views/init-home/Menu/index.vue
index d4270dde322d7454b2992f614b458f6f35f3bcbb..d826cf50a721defa3c97d4418c20f53e0b2ac0d5 100644
--- a/src/views/init-home/Menu/index.vue
+++ b/src/views/init-home/Menu/index.vue
@@ -114,7 +114,7 @@ const initMenu = async () => {
 const { count } = toRefs(menuDatas);
 getSystemPermissionData();
 defineExpose({
-    updataMenu: initMenu,
+    updateMenu: initMenu,
 });
 </script>
 <style lang="less" scoped>
diff --git a/src/views/init-home/index.vue b/src/views/init-home/index.vue
index f8becc64294da5fea136c6796d3af1b07fc4291f..07b57693808cabdb6836cd22ffee5403b0b4c42c 100644
--- a/src/views/init-home/index.vue
+++ b/src/views/init-home/index.vue
@@ -101,7 +101,7 @@ const submitData = async () => {
         loading.value = false;
         return;
     }
-    const menuRes = await menuRef.value.updataMenu();
+    const menuRes = await menuRef.value.updateMenu();
     if (!menuRes) {
         loading.value = false;
         return;
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
index 4fc26e98fa583c55b0fe1c1644af49f55067f5f6..cc4e1eb071ebc28b2d0821fc0ffed05ec4a558e2 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Base/index.vue
@@ -96,7 +96,7 @@ import {
     getTargetTypes,
     save,
     detail,
-    updata,
+    update,
 } from '@/api/rule-engine/configuration';
 import { queryLevel } from '@/api/rule-engine/config';
 import { query } from '@/api/rule-engine/scene';
@@ -224,7 +224,7 @@ const handleSave = async () => {
         .validate()
         .then(async () => {
             const res = route.query?.id
-                ? await updata(form.value)
+                ? await update(form.value)
                 : await save(form.value);
             if (res.status === 200) {
                 onlyMessage('操作成功,请配置关联的场景联动');
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index 03d7e048c333dfb31c161831b918d47377edaa57..784926b416c0aa211933855af6d53f64e81d305a 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -406,7 +406,6 @@ const table = {
     },
     // 取消全选
     cancelSelect: () => {
-        // console.log(1111);
         tableData._selectedRowKeys = [];
         tableData.selectedRows = [];
     },
diff --git a/vite.config.ts b/vite.config.ts
index 0986ae204950606bff85cf1d78710c2db512e76e..2b4fe794aca1822d7d5daf6194428c541daffa36 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -17,7 +17,7 @@ import copy from 'rollup-plugin-copy';
 import progress from 'vite-plugin-progress'
 
 // https://vitejs.dev/config/
-export default defineConfig(({ mode}) => {
+export default defineConfig(({ mode }) => {
   const env: Partial<ImportMetaEnv> = loadEnv(mode, process.cwd());
 
   return {
@@ -94,11 +94,11 @@ export default defineConfig(({ mode}) => {
               [env.VITE_APP_BASE_API]: {
                   // target: 'http://192.168.32.226:8844',
                   // target: 'http://192.168.32.244:8881',
-                //   target: 'http://192.168.32.163:8844', //张季本地
-                //   target: 'http://120.77.179.54:8844', // 120测试
-                // target: 'http://192.168.33.46:8844', // 本地开发环境
-                target: 'http://192.168.33.1:8845', // 社区版开发环境
-                //   target: 'http://192.168.32.5:8848', // 刘本地
+                  //   target: 'http://192.168.32.163:8844', //张季本地
+                  //   target: 'http://120.77.179.54:8844', // 120测试
+                  // target: 'http://192.168.1.10:8848', // 富林本地
+                  target: 'http://192.168.1.32:8848', // 陈本地
+                  //   target: 'http://192.168.32.5:8848', // 刘本地
                   ws: 'ws://192.168.33.46:8844',
                   changeOrigin: true,
                   rewrite: (path) => path.replace(/^\/api/, '')