Commit e3bcb99bf04145360e7133536c5057096c444918
1 parent
9f6f0b53
style:修改租户管理选择框后面提示,fix:修改设备配置路径问题
Showing
2 changed files
with
15 additions
and
4 deletions
| @@ -20,13 +20,13 @@ | @@ -20,13 +20,13 @@ | ||
| 20 | label: '编辑', | 20 | label: '编辑', |
| 21 | icon: 'clarity:note-edit-line', | 21 | icon: 'clarity:note-edit-line', |
| 22 | onClick: handleEdit.bind(null, record), | 22 | onClick: handleEdit.bind(null, record), |
| 23 | - ifShow: isTenant, | 23 | + ifShow: isTenant || isCustomer, |
| 24 | }, | 24 | }, |
| 25 | { | 25 | { |
| 26 | label: '删除', | 26 | label: '删除', |
| 27 | icon: 'ant-design:delete-outlined', | 27 | icon: 'ant-design:delete-outlined', |
| 28 | color: 'error', | 28 | color: 'error', |
| 29 | - ifShow: isTenant, | 29 | + ifShow: isTenant || isCustomer, |
| 30 | popConfirm: { | 30 | popConfirm: { |
| 31 | title: '是否确认删除', | 31 | title: '是否确认删除', |
| 32 | confirm: handleDeleteOrBatchDelete.bind(null, record), | 32 | confirm: handleDeleteOrBatchDelete.bind(null, record), |
| 1 | import { BasicColumn, FormSchema } from '/@/components/Table'; | 1 | import { BasicColumn, FormSchema } from '/@/components/Table'; |
| 2 | import { transformTime } from '/@/hooks/web/useDateToLocaleString'; | 2 | import { transformTime } from '/@/hooks/web/useDateToLocaleString'; |
| 3 | +import { h } from 'vue'; | ||
| 3 | 4 | ||
| 4 | export const columns: BasicColumn[] = [ | 5 | export const columns: BasicColumn[] = [ |
| 5 | { | 6 | { |
| @@ -58,13 +59,23 @@ export const formSchema: FormSchema[] = [ | @@ -58,13 +59,23 @@ export const formSchema: FormSchema[] = [ | ||
| 58 | field: 'isolatedTbRuleEngine', | 59 | field: 'isolatedTbRuleEngine', |
| 59 | label: '', | 60 | label: '', |
| 60 | component: 'Checkbox', | 61 | component: 'Checkbox', |
| 61 | - renderComponentContent: '隔离板芯容器的加工', | 62 | + renderComponentContent: () => { |
| 63 | + return h('span', {}, [ | ||
| 64 | + h('span', {}, '隔离板芯容器的加工'), | ||
| 65 | + h('span', { style: { color: 'grey' } }, '（每个独立租户需要单独的微服务）'), | ||
| 66 | + ]); | ||
| 67 | + }, | ||
| 62 | }, | 68 | }, |
| 63 | { | 69 | { |
| 64 | field: 'isolatedTbCore', | 70 | field: 'isolatedTbCore', |
| 65 | label: '', | 71 | label: '', |
| 66 | component: 'Checkbox', | 72 | component: 'Checkbox', |
| 67 | - renderComponentContent: '在独立的ThinngsBoard规则引擎中处理', | 73 | + renderComponentContent: () => { |
| 74 | + return h('span', {}, [ | ||
| 75 | + h('span', {}, '在独立的ThinngsBoard规则引擎中处理'), | ||
| 76 | + h('span', { style: { color: 'grey' } }, '（每个独立租户需要单独的微服务）'), | ||
| 77 | + ]); | ||
| 78 | + }, | ||
| 68 | }, | 79 | }, |
| 69 | { | 80 | { |
| 70 | field: 'description', | 81 | field: 'description', |