Merge branch 'main' of http://git.yuntengiot.com/huang/yun-teng-iot-front into sqy_dev

sqy
2 parents af1d655b b4ae23b4
Showing 5 changed files with 46 additions and 42 deletions
src/views/tenant/config/config.ts
src/views/tenant/config/cpns/config.ts
src/views/tenant/config/cpns/index.vue
src/views/tenant/config/index.vue
src/views/tenant/list/TenantAdminDrawer.vue
--- a/src/views/tenant/config/config.ts
View file @cf368d5
+++ b/src/views/tenant/config/config.ts
View file @cf368d5
@@ -61,7 +61,7 @@ export const formSchema: FormSchema[] = [
     component: 'Checkbox',
     renderComponentContent: () => {
       return h('span', {}, [
-        h('span', {}, '隔离板芯容器的加工'),
+        h('span', {}, '隔离板芯容器中的加工'),
         h('span', { style: { color: 'grey' } }, '（每个独立租户需要单独的微服务）'),
       ]);
     },
@@ -72,7 +72,7 @@ export const formSchema: FormSchema[] = [
     component: 'Checkbox',
     renderComponentContent: () => {
       return h('span', {}, [
-        h('span', {}, '在独立的ThingsBoard规则引擎中处理'),
+        h('span', {}, '在独立的规则引擎中处理'),
         h('span', { style: { color: 'grey' } }, '（每个独立租户需要单独的微服务）'),
       ]);
     },
--- a/src/views/tenant/config/cpns/config.ts
View file @cf368d5
+++ b/src/views/tenant/config/cpns/config.ts
View file @cf368d5
@@ -20,7 +20,7 @@ export const formSchema: FormSchema[] = [
     label: '最大设备数（0-无限制）',
     component: 'InputNumber',
     defaultValue: '0',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     componentProps: {
       placeholder: '请输入最大设备数（请输入数字）',
     },
@@ -29,9 +29,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxAssets',
     required: true,
     defaultValue: '0',
-
+    ifShow: false,
     label: '最大资产数（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大资产（请输入数字）',
@@ -43,7 +43,7 @@ export const formSchema: FormSchema[] = [
     defaultValue: '0',
     label: '最大客户数（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大客户数（请输入数字）',
@@ -53,9 +53,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxUsers',
     required: true,
     defaultValue: '0',
-
+    ifShow: false,
     label: '最大用户数（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大用户数（请输入数字）',
@@ -65,9 +65,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxDashboards',
     required: true,
     defaultValue: '0',
-
+    ifShow: false,
     label: '仪表板的最大数量（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入仪表板的最大数量（请输入数字）',
@@ -77,9 +77,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxRuleChains',
     required: true,
     defaultValue: '0',
-
+    ifShow: false,
     label: '最大规则链数（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大规则链数（请输入数字）',
@@ -89,9 +89,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxResourcesInBytes',
     required: true,
     defaultValue: '0',
-
+    ifShow: false,
     label: '以字节为单位的资源文件的最大总和（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入（请输入数字）',
@@ -101,9 +101,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxOtaPackagesInBytes',
     required: true,
     defaultValue: '0',
-
+    ifShow: false,
     label: 'Ota包文件大小的最大总和（字节）（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入（请输入数字）',
@@ -115,7 +115,7 @@ export const formSchema: FormSchema[] = [
     defaultValue: '0',
     label: '最大传输消息数（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大传输消息数（请输入数字）',
@@ -127,7 +127,7 @@ export const formSchema: FormSchema[] = [
     defaultValue: '0',
     label: '传输数据点的最大数量（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入传输数据点的最大数量（请输入数字）',
@@ -137,9 +137,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxREExecutions',
     required: true,
     defaultValue: '0',
-
+    ifShow: false,
     label: '最大规则引擎数（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大规则引擎数（请输入数字）',
@@ -152,7 +152,7 @@ export const formSchema: FormSchema[] = [
     defaultValue: '0',
     label: '最大JavaScript执行数（0-不受限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大JavaScript执行数（请输入数字）',
@@ -164,7 +164,7 @@ export const formSchema: FormSchema[] = [
     defaultValue: '0',
     label: '最大日存储数据点数（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入最大日存储数据点数（请输入数字）',
@@ -175,11 +175,11 @@ export const formSchema: FormSchema[] = [
     required: true,
     defaultValue: '0',
-    label: '默认存储 TTL 天数（0-无限制）',
-    colProps: { span: 24 },
+    label: '默认存储天数（0-无限制）',
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
-      placeholder: '请输入默认存储 TTL 天数（请输入数字）',
+      placeholder: '请输入默认存储天数（请输入数字）',
     },
   },
   {
@@ -187,11 +187,11 @@ export const formSchema: FormSchema[] = [
     required: true,
     defaultValue: '0',
-    label: 'Alams TTL days（0-无限制）',
-    colProps: { span: 24 },
+    label: '告警存储天数（0-无限制）',
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
-      placeholder: '请输入Alarms TTL days（请输入数字）',
+      placeholder: '请输入告警存储天数（请输入数字）',
     },
   },
   {
@@ -199,19 +199,20 @@ export const formSchema: FormSchema[] = [
     required: true,
     defaultValue: '0',
-    label: 'RPC TTL days（0-无限制）',
-    colProps: { span: 24 },
+    label: 'RPC存储天数（0-无限制）',
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
-      placeholder: '请输入RPC TTL days（请输入数字）',
+      placeholder: '请输入RPC存储天数（请输入数字）',
     },
   },
   {
+    ifShow: false,
     field: 'maxRuleNodeExecutionsPerMessage',
     required: true,
-    defaultValue: '1',
+    defaultValue: '0',
     label: '每条消息的最大规则节点执行数（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入每条消息的最大规则节点执行数（请输入数字）',
@@ -221,9 +222,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxEmails',
     required: true,
     label: '发送的最大电子邮件数（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     defaultValue: '0',
-
+    ifShow: false,
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入发送的最大电子邮件数（请输入数字）',
@@ -233,9 +234,9 @@ export const formSchema: FormSchema[] = [
     field: 'maxSms',
     required: true,
     defaultValue: '0',
-
+    ifShow: false,
     label: '发送的最大短信数（0-无限制）',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入发送的最大短信数（请输入数字）',
@@ -247,7 +248,7 @@ export const formSchema: FormSchema[] = [
     defaultValue: '0',
     label: '创建的最大报警数 (0 - 无限制)',
-    colProps: { span: 24 },
+    colProps: { span: 12 },
     component: 'InputNumber',
     componentProps: {
       placeholder: '请输入maxCreatedAlarms（请输入数字）',
--- a/src/views/tenant/config/cpns/index.vue
View file @cf368d5
+++ b/src/views/tenant/config/cpns/index.vue
View file @cf368d5
@@ -45,7 +45,7 @@
 <style lang="less" scoped>
   .tenant-class {
     :deep .ant-input-number {
-      width: 34vw !important;
+      width: 16vw !important;
     }
   }
 </style>
--- a/src/views/tenant/config/index.vue
View file @cf368d5
+++ b/src/views/tenant/config/index.vue
View file @cf368d5
@@ -18,6 +18,7 @@
               label: '设置该租户为默认',
               icon: 'ant-design:eye-outlined',
               onClick: handleDefault.bind(null, record),
+              ifShow: !record.default,
             },
             {
               label: '编辑',
@@ -32,6 +33,7 @@
                 title: '是否确认删除',
                 confirm: handleDelete.bind(null, record),
               },
+              ifShow: !record.default,
             },
           ]"
         />
--- a/src/views/tenant/list/TenantAdminDrawer.vue
View file @cf368d5
+++ b/src/views/tenant/list/TenantAdminDrawer.vue
View file @cf368d5
@@ -131,9 +131,10 @@
       }
       function handleResetPassword(record: Recordable) {
-        resetPassword(record.id);
-        createMessage.success('清空密码成功');
-        handleSuccess();
+        resetPassword(record.id).then(() => {
+          createMessage.success('清空密码成功');
+          handleSuccess();
+        });
       }
       function handleSendMsg(record: Recordable) {
         const req = new SendResetPasswordEmailMsg(record.id, MessageTypeEnum.PHONE_MESSAGE);