Merge branch 'local_dev_branch_by_ft' into 'main_dev'

perf: 修改设备列表 事件管理 标识符tooltip内容描述信息

See merge request yunteng/thingskit-front!979

@@ -34,7 +34,7 @@ export const columnSchema: BasicColumn[] = [
   {
     title: '标识符',
     dataIndex: 'eventIdentifier',
-    helpMessage: ['标识符格式为模块标识符: 功能定义标识符'],
+    helpMessage: ['标识符：物模型事件功能定义标识符'],
   },
   {
     title: '事件名称',

@@ -250,6 +250,7 @@ export function isType(operationType) {
           field: 'operation',
           label: '执行操作',
           component: 'Select',
+          getPopupContainer: (triggerNode) => triggerNode.parentNode,
           required: true,
           componentProps: {
             options: operationNumber_OR_TIME,
@@ -286,6 +287,7 @@ export function isType(operationType) {
           field: 'operation',
           label: '执行操作',
           component: 'Select',
+          getPopupContainer: (triggerNode) => triggerNode.parentNode,
           required: true,
           componentProps: {
             options: operationString,
@@ -310,6 +312,7 @@ export function isType(operationType) {
           field: 'operation',
           label: '执行操作',
           component: 'Select',
+          getPopupContainer: (triggerNode) => triggerNode.parentNode,
           required: true,
           componentProps: {
             options: operationBoolean,
@@ -322,6 +325,7 @@ export function isType(operationType) {
           field: 'value',
           label: '操作值',
           component: 'Select',
+          getPopupContainer: (triggerNode) => triggerNode.parentNode,
           required: true,
           componentProps: {
             options: [
@@ -347,6 +351,7 @@ export function isType(operationType) {
           label: '执行操作',
           required: true,
           component: 'Select',
+          getPopupContainer: (triggerNode) => triggerNode.parentNode,
           componentProps: {
             options: operationNumber_OR_TIME,
           },

@@ -31,6 +31,7 @@
             :options="options"
             :disabled="disabled"
             v-model:value="model[field]"
+            :getPopupContainer="(triggerNode) => triggerNode.parentNode"
             @change="operationType = model[field]"
             placeholder="请选择比较类型"
             allowClear