简柏林 / thingskit-front · Commits

Commit cf1f90004ec90491fce6f35d0b28a0d5dee0b673

Authored by xp.Huang
2 parents 45281440 d033ff5a

Merge branch 'local_dev_branch_by_ft' into 'main_dev' 

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

See merge request yunteng/thingskit-front!979
Inline Side-by-side
Showing 3 changed files with 7 additions and 1 deletions
@@ -34,7 +34,7 @@ export const columnSchema: BasicColumn[] = [ @@ -34,7 +34,7 @@ export const columnSchema: BasicColumn[] = [
34 { 34 {
35 title: '标识符', 35 title: '标识符',
36 dataIndex: 'eventIdentifier', 36 dataIndex: 'eventIdentifier',
37 - helpMessage: ['标识符格式为模块标识符: 功能定义标识符'], 37 + helpMessage: ['标识符：物模型事件功能定义标识符'],
38 }, 38 },
39 { 39 {
40 title: '事件名称', 40 title: '事件名称',
@@ -250,6 +250,7 @@ export function isType(operationType) { @@ -250,6 +250,7 @@ export function isType(operationType) {
250 field: 'operation', 250 field: 'operation',
251 label: '执行操作', 251 label: '执行操作',
252 component: 'Select', 252 component: 'Select',
  253 + getPopupContainer: (triggerNode) => triggerNode.parentNode,
253 required: true, 254 required: true,
254 componentProps: { 255 componentProps: {
255 options: operationNumber_OR_TIME, 256 options: operationNumber_OR_TIME,
@@ -286,6 +287,7 @@ export function isType(operationType) { @@ -286,6 +287,7 @@ export function isType(operationType) {
286 field: 'operation', 287 field: 'operation',
287 label: '执行操作', 288 label: '执行操作',
288 component: 'Select', 289 component: 'Select',
  290 + getPopupContainer: (triggerNode) => triggerNode.parentNode,
289 required: true, 291 required: true,
290 componentProps: { 292 componentProps: {
291 options: operationString, 293 options: operationString,
@@ -310,6 +312,7 @@ export function isType(operationType) { @@ -310,6 +312,7 @@ export function isType(operationType) {
310 field: 'operation', 312 field: 'operation',
311 label: '执行操作', 313 label: '执行操作',
312 component: 'Select', 314 component: 'Select',
  315 + getPopupContainer: (triggerNode) => triggerNode.parentNode,
313 required: true, 316 required: true,
314 componentProps: { 317 componentProps: {
315 options: operationBoolean, 318 options: operationBoolean,
@@ -322,6 +325,7 @@ export function isType(operationType) { @@ -322,6 +325,7 @@ export function isType(operationType) {
322 field: 'value', 325 field: 'value',
323 label: '操作值', 326 label: '操作值',
324 component: 'Select', 327 component: 'Select',
  328 + getPopupContainer: (triggerNode) => triggerNode.parentNode,
325 required: true, 329 required: true,
326 componentProps: { 330 componentProps: {
327 options: [ 331 options: [
@@ -347,6 +351,7 @@ export function isType(operationType) { @@ -347,6 +351,7 @@ export function isType(operationType) {
347 label: '执行操作', 351 label: '执行操作',
348 required: true, 352 required: true,
349 component: 'Select', 353 component: 'Select',
  354 + getPopupContainer: (triggerNode) => triggerNode.parentNode,
350 componentProps: { 355 componentProps: {
351 options: operationNumber_OR_TIME, 356 options: operationNumber_OR_TIME,
352 }, 357 },
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
31 :options="options" 31 :options="options"
32 :disabled="disabled" 32 :disabled="disabled"
33 v-model:value="model[field]" 33 v-model:value="model[field]"
  34 + :getPopupContainer="(triggerNode) => triggerNode.parentNode"
34 @change="operationType = model[field]" 35 @change="operationType = model[field]"
35 placeholder="请选择比较类型" 36 placeholder="请选择比较类型"
36 allowClear 37 allowClear