yuanliang hai 1 ano
pai
achega
d058c6a19f

+ 1 - 2
src/views/message/message-config/email/email-config.tsx

@@ -335,12 +335,11 @@ export default defineComponent({
                   preset="dialog"
                   showIcon={false}
                   title={(state.editMode == 'add' ? '新增' : '编辑') + '邮件配置'}
-                  style={{width: 'auto'}}
+                  style={{width: '700px'}}
               >
                 <EmailConfigEdit
                     editMode={state.editMode}
                     rowData={state.editRowData}
-                    style={{width: '450'}}
                     onClose={() => (state.showEdit = false)}
                     onGetList={() => {
                       state.pagination.page = 1

+ 1 - 1
src/views/message/message-config/email/modal/email-config-edit.tsx

@@ -223,7 +223,7 @@ export default defineComponent({
                     rule={[
                       {
                         required: true,
-                        message: '请输入接入应用'
+                        message: '请选择接入应用'
                       }
                     ]}
                 >

+ 2 - 2
src/views/message/message-config/push/modal/push-config-edit.tsx

@@ -55,7 +55,7 @@ export default defineComponent({
         forms.apnsProduction = state.rowData.apnsProduction
         forms.account = state.rowData.account
         forms.password = state.rowData.password
-        forms.timeToLive = state.rowData.timeToLive
+        forms.timeToLive = Number.parseFloat(state.rowData.timeToLive)/3600
         forms.accessUrl = state.rowData.accessUrl
         forms.extendData = state.rowData.extendData
       }
@@ -268,7 +268,7 @@ export default defineComponent({
                   <NInputNumber
                       v-model:value={forms.timeToLive}
                       placeholder="请输入离线保留时长(小时)"
-                      clearable
+                      min={0}
                   />
                 </NFormItemGi>
               </NGrid>

+ 2 - 2
src/views/message/message-config/push/push-config.tsx

@@ -357,13 +357,13 @@ export default defineComponent({
                   preset="dialog"
                   showIcon={false}
                   title={(state.editMode == 'add' ? '新增' : '编辑') + '推送平台'}
-                  style={{width: 'auto'}}
+                  // style={{width: 'auto'}}
+                  style={{width: '700px'}}
               >
                 <PushConfigEdit
                     editMode={state.editMode}
                     rowData={state.editRowData}
                     appData={state.appData}
-                    style={{width: '450'}}
                     onClose={() => (state.showEdit = false)}
                     onGetList={() => {
                       state.pagination.page = 1

+ 22 - 1
src/views/message/message-config/sms/modal/sms-config-app-edit.tsx

@@ -29,6 +29,7 @@ export default defineComponent({
     const forms = reactive({
       appKey: null as any,
       sign: null,
+      extendData: null,
     })
     const formsRef = ref()
 
@@ -42,6 +43,7 @@ export default defineComponent({
       if (props.editMode == 'edit' && props.rowData) {
         forms.appKey = state.rowData.appKey
         forms.sign = state.rowData.sign
+        forms.extendData = state.rowData.extendData
       }
     })
 
@@ -86,7 +88,7 @@ export default defineComponent({
                 label-placement="left"
                 label-width="100"
             >
-              <NGrid cols={1}>
+              <NGrid cols={2}>
                 <NFormItemGi
                     label="应用"
                     path="appKey"
@@ -121,6 +123,25 @@ export default defineComponent({
                   />
                 </NFormItemGi>
               </NGrid>
+              <NGrid cols={1}>
+                <NFormItemGi
+                    label="拓展参数"
+                    path="extendData"
+                    rule={[
+                      {
+                        required: false,
+                        message: '请输入拓展参数'
+                      }
+                    ]}
+                >
+                  <NInput
+                      v-model:value={forms.extendData}
+                      placeholder="请输入拓展参数"
+                      autosize={{minRows: 3}}
+                      type={'textarea'}
+                  />
+                </NFormItemGi>
+              </NGrid>
             </NForm>
 
             <NSpace justify="end">

+ 2 - 1
src/views/message/message-config/sms/modal/sms-config-edit.tsx

@@ -184,6 +184,8 @@ export default defineComponent({
                       clearable
                   />
                 </NFormItemGi>
+              </NGrid>
+              <NGrid cols={1}>
                 <NFormItemGi
                     label="拓展参数"
                     path="extendData"
@@ -199,7 +201,6 @@ export default defineComponent({
                       placeholder="请输入拓展参数"
                       autosize={{minRows: 3}}
                       type={'textarea'}
-                      clearable
                   />
                 </NFormItemGi>
               </NGrid>

+ 12 - 5
src/views/message/message-config/sms/sms-config-app.tsx

@@ -8,6 +8,7 @@ import {smsAppConfigPage, smsAppConfigRemove, smsAppConfigStatus, smsConfigDetai
 import deepClone from "@/utils/deep.clone";
 import SmsConfigAppEdit from "@views/message/message-config/sms/modal/sms-config-app-edit";
 import {sysApplicationPage} from "@views/menu-manage/api";
+import TheTooltip from "@components/TheTooltip";
 
 export default defineComponent({
   name: 'sms-config-app',
@@ -46,10 +47,10 @@ export default defineComponent({
     }
 
     onMounted(async () => {
-      state.smsConfigId = route.query;
-      if (!state.smsConfigId) {
+      if (!route.query) {
         return
       }
+      state.smsConfigId = route.query.id;
       {
         const {data} = await smsConfigDetail(state.smsConfigId)
         if (data) {
@@ -160,6 +161,13 @@ export default defineComponent({
           key: 'sign'
         },
         {
+          title: '拓展参数',
+          key: 'extendData',
+          render: (row: any) => {
+            return <TheTooltip content={row.extendData}/>
+          }
+        },
+        {
           title: '状态',
           key: 'status',
           render(row: any) {
@@ -303,14 +311,13 @@ export default defineComponent({
                   v-model:show={state.showEdit}
                   preset="dialog"
                   showIcon={false}
-                  title={(state.editMode == 'add' ? '新增' : '编辑') + '短信平台'}
-                  style={{width: 'auto'}}
+                  title={(state.editMode == 'add' ? '新增' : '编辑') + '应用'}
+                  style={{width: '700px'}}
               >
                 <SmsConfigAppEdit
                     editMode={state.editMode}
                     rowData={state.editRowData}
                     appData={state.appData}
-                    style={{width: '450'}}
                     smsConfigId={state.smsConfigId}
                     onClose={() => (state.showEdit = false)}
                     onGetList={() => {

+ 5 - 3
src/views/message/message-config/sms/sms-config.tsx

@@ -184,7 +184,9 @@ export default defineComponent({
                       onClick={() => {
                         router.push({
                           path: '/message/messageConfigApp',
-                          query: row.id
+                          query: {
+                            id: row.id
+                          }
                         })
                       }}
                   >
@@ -310,12 +312,12 @@ export default defineComponent({
                 preset="dialog"
                 showIcon={false}
                 title={(state.editMode == 'add' ? '新增' : '编辑') + '短信平台'}
-                style={{width: 'auto'}}
+                // style={{width: 'auto'}}
+                style={{width: '700px'}}
             >
               <SmsConfigEdit
                   editMode={state.editMode}
                   rowData={state.editRowData}
-                  style={{width: '700px'}}
                   onClose={() => (state.showEdit = false)}
                   onGetList={() => {
                     state.pagination.page = 1

+ 1 - 2
src/views/message/message-config/wechat/wechat-config-template.tsx

@@ -332,13 +332,12 @@ export default defineComponent({
                   preset="dialog"
                   showIcon={false}
                   title={(state.editMode == 'add' ? '新增' : '编辑') + '模板'}
-                  style={{width: 'auto'}}
+                  style={{width: '700px'}}
               >
                 <WechatConfigTemplateEdit
                     appid = {state.appid}
                     editMode={state.editMode}
                     rowData={state.editRowData}
-                    style={{width: '450'}}
                     onClose={() => (state.showEdit = false)}
                     onGetList={() => {
                       state.pagination.page = 1

+ 2 - 2
src/views/message/message-config/wechat/wechat-config.tsx

@@ -325,13 +325,13 @@ export default defineComponent({
                   preset="dialog"
                   showIcon={false}
                   title={(state.editMode == 'add' ? '新增' : '编辑') + '短信平台'}
-                  style={{width: 'auto'}}
+                  // style={{width: 'auto'}}
+                  style={{width: '700px'}}
               >
                 <WechatConfigEdit
                     editMode={state.editMode}
                     rowData={state.editRowData}
                     appData={state.appData}
-                    style={{width: '450'}}
                     onClose={() => (state.showEdit = false)}
                     onGetList={() => {
                       state.pagination.page = 1