Commit 765a723533a2bad62206fea34c904d738c2d9f9a
Merge branch 'fix/DEFECT-1650' into 'main_dev'
fix: DEFECT-1650修复物模型表单功能名称和标识符字段限制 See merge request yunteng/thingskit-front!926
Showing
3 changed files
with
10 additions
and
6 deletions
| @@ -39,7 +39,7 @@ export const formSchemas = (hasStructForm: boolean, isTcp = false): FormSchema[] | @@ -39,7 +39,7 @@ export const formSchemas = (hasStructForm: boolean, isTcp = false): FormSchema[] | ||
| 39 | span: 18, | 39 | span: 18, |
| 40 | }, | 40 | }, |
| 41 | componentProps: { | 41 | componentProps: { |
| 42 | - maxLength: 255, | 42 | + maxLength: 32, |
| 43 | placeholder: '请输入功能名称', | 43 | placeholder: '请输入功能名称', |
| 44 | }, | 44 | }, |
| 45 | }, | 45 | }, |
| @@ -52,7 +52,7 @@ export const formSchemas = (hasStructForm: boolean, isTcp = false): FormSchema[] | @@ -52,7 +52,7 @@ export const formSchemas = (hasStructForm: boolean, isTcp = false): FormSchema[] | ||
| 52 | span: 18, | 52 | span: 18, |
| 53 | }, | 53 | }, |
| 54 | componentProps: { | 54 | componentProps: { |
| 55 | - maxLength: 255, | 55 | + maxLength: 128, |
| 56 | placeholder: '请输入标识符', | 56 | placeholder: '请输入标识符', |
| 57 | }, | 57 | }, |
| 58 | }, | 58 | }, |
| @@ -78,11 +78,13 @@ export const physicalColumn: BasicColumn[] = [ | @@ -78,11 +78,13 @@ export const physicalColumn: BasicColumn[] = [ | ||
| 78 | title: '功能名称', | 78 | title: '功能名称', |
| 79 | dataIndex: FormField.FUNCTION_NAME, | 79 | dataIndex: FormField.FUNCTION_NAME, |
| 80 | width: 90, | 80 | width: 90, |
| 81 | + ellipsis: true, | ||
| 81 | }, | 82 | }, |
| 82 | { | 83 | { |
| 83 | title: '标识符', | 84 | title: '标识符', |
| 84 | dataIndex: FormField.IDENTIFIER, | 85 | dataIndex: FormField.IDENTIFIER, |
| 85 | width: 90, | 86 | width: 90, |
| 87 | + ellipsis: true, | ||
| 86 | customRender: ({ text }: Record<'text', string>) => { | 88 | customRender: ({ text }: Record<'text', string>) => { |
| 87 | return h(Tooltip, { title: text }, () => | 89 | return h(Tooltip, { title: text }, () => |
| 88 | h('span', { class: 'cursor-pointer', onClick: () => handleCopy(text) }, text) | 90 | h('span', { class: 'cursor-pointer', onClick: () => handleCopy(text) }, text) |
| @@ -96,6 +98,7 @@ export const physicalColumn: BasicColumn[] = [ | @@ -96,6 +98,7 @@ export const physicalColumn: BasicColumn[] = [ | ||
| 96 | format: (text: string) => { | 98 | format: (text: string) => { |
| 97 | return text || '--'; | 99 | return text || '--'; |
| 98 | }, | 100 | }, |
| 101 | + ellipsis: true, | ||
| 99 | }, | 102 | }, |
| 100 | { | 103 | { |
| 101 | title: '事件类型', | 104 | title: '事件类型', |
| @@ -109,6 +112,7 @@ export const physicalColumn: BasicColumn[] = [ | @@ -109,6 +112,7 @@ export const physicalColumn: BasicColumn[] = [ | ||
| 109 | () => EventTypeName[text as EventType] | 112 | () => EventTypeName[text as EventType] |
| 110 | ); | 113 | ); |
| 111 | }, | 114 | }, |
| 115 | + ellipsis: true, | ||
| 112 | }, | 116 | }, |
| 113 | { | 117 | { |
| 114 | title: '状态', | 118 | title: '状态', |
| @@ -77,7 +77,7 @@ export const serviceSchemas = (tcpDeviceFlag: boolean): FormSchema[] => { | @@ -77,7 +77,7 @@ export const serviceSchemas = (tcpDeviceFlag: boolean): FormSchema[] => { | ||
| 77 | span: 18, | 77 | span: 18, |
| 78 | }, | 78 | }, |
| 79 | componentProps: { | 79 | componentProps: { |
| 80 | - maxLength: 255, | 80 | + maxLength: 32, |
| 81 | placeholder: '请输入功能名称', | 81 | placeholder: '请输入功能名称', |
| 82 | }, | 82 | }, |
| 83 | }, | 83 | }, |
| @@ -90,7 +90,7 @@ export const serviceSchemas = (tcpDeviceFlag: boolean): FormSchema[] => { | @@ -90,7 +90,7 @@ export const serviceSchemas = (tcpDeviceFlag: boolean): FormSchema[] => { | ||
| 90 | span: 18, | 90 | span: 18, |
| 91 | }, | 91 | }, |
| 92 | componentProps: { | 92 | componentProps: { |
| 93 | - maxLength: 255, | 93 | + maxLength: 128, |
| 94 | placeholder: '请输入标识符', | 94 | placeholder: '请输入标识符', |
| 95 | }, | 95 | }, |
| 96 | }, | 96 | }, |
| @@ -175,7 +175,7 @@ export const eventSchemas: FormSchema[] = [ | @@ -175,7 +175,7 @@ export const eventSchemas: FormSchema[] = [ | ||
| 175 | span: 18, | 175 | span: 18, |
| 176 | }, | 176 | }, |
| 177 | componentProps: { | 177 | componentProps: { |
| 178 | - maxLength: 255, | 178 | + maxLength: 32, |
| 179 | placeholder: '请输入功能名称', | 179 | placeholder: '请输入功能名称', |
| 180 | }, | 180 | }, |
| 181 | }, | 181 | }, |
| @@ -188,7 +188,7 @@ export const eventSchemas: FormSchema[] = [ | @@ -188,7 +188,7 @@ export const eventSchemas: FormSchema[] = [ | ||
| 188 | span: 18, | 188 | span: 18, |
| 189 | }, | 189 | }, |
| 190 | componentProps: { | 190 | componentProps: { |
| 191 | - maxLength: 255, | 191 | + maxLength: 128, |
| 192 | placeholder: '请输入标识符', | 192 | placeholder: '请输入标识符', |
| 193 | }, | 193 | }, |
| 194 | }, | 194 | }, |