Skip to content

Commit 629c177

Browse files
committed
1、应用管理缺少字段导致添加不了
2、短信模板添加缺少字段 3、短信日志导出接口错误 4、基础设施中英切换暂无用,先注释,生成json数据格式化 5、日志表格不显示链路地址(同vue2) 6、搜索框前字宽换行问题
1 parent c1be433 commit 629c177

File tree

6 files changed

+44
-11
lines changed

6 files changed

+44
-11
lines changed

src/api/system/sms/smsLog/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,5 @@ export const getSmsLogPageApi = (params: SmsLogPageReqVO) => {
5353

5454
// 导出短信日志
5555
export const exportSmsLogApi = (params: SmsLogExportReqVO) => {
56-
return request.download({ url: '/system/sms-log/export', params })
56+
return request.download({ url: '/system/sms-log/export-excel', params })
5757
}

src/components/XTable/src/XTable.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ const getColumnsConfig = (options: XTableProps) => {
128128
proxyForm = true
129129
options.formConfig = {
130130
enabled: true,
131-
titleWidth: 100,
131+
titleWidth: 180,
132132
titleAlign: 'right',
133133
items: allSchemas.searchSchema
134134
}

src/views/infra/apiAccessLog/apiAccessLog.data.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ const crudSchemas = reactive<VxeCrudSchema>({
1010
columns: [
1111
{
1212
title: '链路追踪',
13-
field: 'traceId'
13+
field: 'traceId',
14+
isTable: false
1415
},
1516
{
1617
title: '用户编号',

src/views/infra/build/index.vue

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<el-button size="small" type="primary" @click="showJson">生成JSON</el-button>
99
<el-button size="small" type="success" @click="showOption">生成Options</el-button>
1010
<el-button size="small" type="danger" @click="showTemplate">生成组件</el-button>
11-
<el-button size="small" @click="changeLocale">中英切换</el-button>
11+
<!-- <el-button size="small" @click="changeLocale">中英切换</el-button> -->
1212
</div>
1313
</el-col>
1414
<el-col>
@@ -19,9 +19,11 @@
1919
<div ref="editor" v-if="dialogVisible">
2020
<XTextButton style="float: right" :title="t('common.copy')" @click="copy(formValue)" />
2121
<el-scrollbar height="580">
22-
<pre>
23-
{{ formValue }}
24-
</pre>
22+
<div v-highlight>
23+
<code class="hljs">
24+
{{ formValue }}
25+
</code>
26+
</div>
2527
</el-scrollbar>
2628
</div>
2729
<span style="color: red" v-if="err">输入内容格式有误!</span>
@@ -69,9 +71,9 @@ const showTemplate = () => {
6971
type.value = 2
7072
formValue.value = makeTemplate()
7173
}
72-
const changeLocale = () => {
73-
console.info('changeLocale')
74-
}
74+
// const changeLocale = () => {
75+
// console.info('changeLocale')
76+
// }
7577
7678
/** 复制 **/
7779
const copy = async (text: string) => {

src/views/system/oauth2/client/client.data.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ const crudSchemas = reactive<VxeCrudSchema>({
2222
primaryType: null,
2323
action: true,
2424
columns: [
25+
{
26+
title: '客户端端号',
27+
field: 'clientId'
28+
},
2529
{
2630
title: '客户端密钥',
2731
field: 'secret'

src/views/system/sms/smsTemplate/sms.template.data.ts

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
2+
import * as smsApi from '@/api/system/sms/smsChannel'
23
const { t } = useI18n() // 国际化
3-
4+
const tenantPackageOption = []
5+
const getTenantPackageOptions = async () => {
6+
const res = await smsApi.getSimpleSmsChannels()
7+
console.log(res, 'resresres')
8+
res.forEach((tenantPackage: TenantPackageVO) => {
9+
tenantPackageOption.push({
10+
key: tenantPackage.id,
11+
value: tenantPackage.id,
12+
label: tenantPackage.signature
13+
})
14+
})
15+
}
16+
getTenantPackageOptions()
417
// 表单校验
518
export const rules = reactive({
619
type: [required],
@@ -20,6 +33,19 @@ const crudSchemas = reactive<VxeCrudSchema>({
2033
action: true,
2134
actionWidth: '280',
2235
columns: [
36+
{
37+
title: '短信渠道编码',
38+
field: 'channelId',
39+
isSearch: false,
40+
isForm: true,
41+
isTable: false,
42+
form: {
43+
component: 'Select',
44+
componentProps: {
45+
options: tenantPackageOption
46+
}
47+
}
48+
},
2349
{
2450
title: '模板编码',
2551
field: 'code',

0 commit comments

Comments
 (0)