Skip to content

Commit d9dc3db

Browse files
wangdan-fit2cloudwangdan-fit2cloud
committed
feat: user
1 parent 54578ef commit d9dc3db

File tree

16 files changed

+142
-176
lines changed

16 files changed

+142
-176
lines changed

‎ui/src/components/app-charts/components/LineCharts.vue‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ import { numberFormat } from '@/utils/utils'
88
const props = defineProps({
99
id: {
1010
type: String,
11-
default: 'lineChartId'
11+
default: 'lineChartId',
1212
},
1313
width: {
1414
type: String,
15-
default: '100%'
15+
default: '100%',
1616
},
1717
height: {
1818
type: String,
19-
default: '200px'
19+
default: '200px',
2020
},
2121
option: {
2222
type: Object,
23-
required: true
24-
} // option: { title , data }
23+
required: true,
24+
}, // option: { title , data }
2525
})
2626
2727
const color = ['rgba(82, 133, 255, 1)', 'rgba(255, 207, 47, 1)']
@@ -38,27 +38,27 @@ function initChart() {
3838
props.option?.yData.forEach((item: any, index: number) => {
3939
series.push({
4040
itemStyle: {
41-
color: color[index]
41+
color: color[index],
4242
},
4343
areaStyle: item.area
4444
? {
45-
color: areaColor[index]
45+
color: areaColor[index],
4646
}
4747
: null,
48-
...item
48+
...item,
4949
})
5050
})
5151
}
5252
const option = {
5353
title: {
5454
text: props.option?.title,
5555
textStyle: {
56-
fontSize: '16px'
57-
}
56+
fontSize: '16px',
57+
},
5858
},
5959
tooltip: {
6060
trigger: 'axis',
61-
valueFormatter: (value: any) => numberFormat(value)
61+
valueFormatter: (value: any) => numberFormat(value),
6262
// axisPointer: {
6363
// type: 'cross',
6464
// label: {
@@ -70,35 +70,35 @@ function initChart() {
7070
right: 0,
7171
itemWidth: 8,
7272
textStyle: {
73-
color: '#646A73'
73+
color: '#646A73',
7474
},
75-
icon: 'circle'
75+
icon: 'circle',
7676
},
7777
grid: {
7878
left: '1%',
7979
right: '1%',
8080
bottom: '0',
8181
top: '18%',
82-
containLabel: true
82+
containLabel: true,
8383
},
8484
xAxis: {
8585
type: 'category',
86-
data: props.option.xData
86+
data: props.option.xData,
8787
},
8888
yAxis: {
8989
type: 'value',
9090
splitLine: {
9191
lineStyle: {
92-
color: '#EFF0F1'
93-
}
92+
color: '#EFF0F1',
93+
},
9494
},
9595
axisLabel: {
9696
formatter: (value: any) => {
9797
return numberFormat(value)
98-
}
99-
}
98+
},
99+
},
100100
},
101-
series: series
101+
series: series,
102102
}
103103
104104
// 渲染数据
@@ -117,7 +117,7 @@ watch(
117117
initChart()
118118
})
119119
}
120-
}
120+
},
121121
)
122122
123123
onMounted(() => {
@@ -128,7 +128,8 @@ onMounted(() => {
128128
})
129129
130130
onBeforeUnmount(() => {
131-
echarts.getInstanceByDom(document.getElementById(props.id)!)?.dispose()
131+
console.log(document.getElementById(props.id))
132+
echarts?.getInstanceByDom(document.getElementById(props.id)!)?.dispose()
132133
window.removeEventListener('resize', changeChartSize)
133134
})
134135
</script>

‎ui/src/locales/lang/en-US/views/login.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@ export default {
1919
requiredMessage: 'Please enter verification code',
2020
validatorMessage: 'Verification code is incorrect',
2121
},
22+
new_password: {
23+
label: 'New Password',
24+
placeholder: 'Please enter new password',
25+
requiredMessage: 'Please enter new password',
26+
},
27+
re_password: {
28+
label: 'Confirm Password',
29+
placeholder: 'Please enter confirm password',
30+
requiredMessage: 'Please enter confirm password',
31+
validatorMessage: 'Password does not match',
32+
},
2233
},
2334
jump_tip: 'You will be redirected to the authentication source page for authentication',
2435
jump: 'Redirect',

‎ui/src/locales/lang/en-US/views/user-manage.ts‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,37 +17,23 @@ export default {
1717
'Deleting this user will also delete all resources (APP, knowledge, models) created by this user. Please proceed with caution.',
1818
},
1919
disabled: {
20-
confirmTitle: 'Confirm disable function:',
20+
confirmTitle: 'Confirm disable tool:',
2121
confirmMessage:
22-
'Disabling this function will cause errors when APP that reference it are queried. Please proceed with caution.',
22+
'Disabling this tool will cause errors when APP that reference it are queried. Please proceed with caution.',
2323
},
2424
userForm: {
25-
form: {
26-
nick_name: {
27-
label: 'Name',
28-
placeholder: 'Please enter name',
29-
},
30-
email: {
31-
label: 'Email',
32-
placeholder: 'Please enter email',
33-
requiredMessage: 'Please enter email',
34-
},
35-
phone: {
36-
label: 'Phone',
37-
placeholder: 'Please enter phone',
38-
},
39-
40-
new_password: {
41-
label: 'New Password',
42-
placeholder: 'Please enter new password',
43-
requiredMessage: 'Please enter new password',
44-
},
45-
re_password: {
46-
label: 'Confirm Password',
47-
placeholder: 'Please enter confirm password',
48-
requiredMessage: 'Please enter confirm password',
49-
validatorMessage: 'Passwords do not match',
50-
},
25+
nick_name: {
26+
label: 'Name',
27+
placeholder: 'Please enter name',
28+
},
29+
email: {
30+
label: 'Email',
31+
placeholder: 'Please enter email',
32+
requiredMessage: 'Please enter email',
33+
},
34+
phone: {
35+
label: 'Phone',
36+
placeholder: 'Please enter phone',
5137
},
5238
},
5339
source: {

‎ui/src/locales/lang/zh-CN/views/login.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,17 @@ export default {
1919
requiredMessage: '请输入验证码',
2020
validatorMessage: '验证码不正确',
2121
},
22+
new_password: {
23+
label: '新密码',
24+
placeholder: '请输入新密码',
25+
requiredMessage: '请输入新密码',
26+
},
27+
re_password: {
28+
label: '确认密码',
29+
placeholder: '请输入确认密码',
30+
requiredMessage: '请输入确认密码',
31+
validatorMessage: '密码不一致',
32+
},
2233
},
2334
jump_tip: '即将跳转至认证源页面进行认证',
2435
jump: '跳转',

‎ui/src/locales/lang/zh-CN/views/user-manage.ts‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,10 @@ export default {
1515
confirmMessage: '删除用户，该用户创建的资源（应用、知识库、模型）都会删除，请谨慎操作。',
1616
},
1717
disabled: {
18-
confirmTitle: '是否禁用函数：',
19-
confirmMessage: '禁用后，引用了该函数的应用提问时会报错 ，请谨慎操作。',
18+
confirmTitle: '是否禁用工具：',
19+
confirmMessage: '禁用后，引用了该工具的应用提问时会报错 ，请谨慎操作。',
2020
},
21-
22-
form: {
23-
username: {
24-
label: '用户名',
25-
placeholder: '请输入用户名',
26-
requiredMessage: '请输入用户名',
27-
lengthMessage: '长度在 6 到 20 个字符',
28-
},
29-
captcha: {
30-
label: '验证码',
31-
placeholder: '请输入验证码',
32-
},
21+
userForm: {
3322
nick_name: {
3423
label: '姓名',
3524
placeholder: '请输入姓名',
@@ -44,25 +33,7 @@ export default {
4433
label: '手机号',
4534
placeholder: '请输入手机号',
4635
},
47-
password: {
48-
label: '登录密码',
49-
placeholder: '请输入密码',
50-
requiredMessage: '请输入密码',
51-
lengthMessage: '长度在 6 到 20 个字符',
52-
},
53-
new_password: {
54-
label: '新密码',
55-
placeholder: '请输入新密码',
56-
requiredMessage: '请输入新密码',
57-
},
58-
re_password: {
59-
label: '确认密码',
60-
placeholder: '请输入确认密码',
61-
requiredMessage: '请输入确认密码',
62-
validatorMessage: '密码不一致',
63-
},
6436
},
65-
6637
source: {
6738
label: '用户来源',
6839
local: '系统用户',

‎ui/src/locales/lang/zh-Hant/views/login.ts‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,31 @@ export default {
55
label: '使用者名稱',
66
placeholder: '請輸入使用者名稱',
77
requiredMessage: '請輸入使用者名稱',
8-
lengthMessage: '長度須介於 6 到 20 個字元之間'
8+
lengthMessage: '長度須介於 6 到 20 個字元之間',
99
},
1010
password: {
1111
label: '登入密碼',
1212
placeholder: '請輸入密碼',
1313
requiredMessage: '請輸入密碼',
14-
lengthMessage: '長度須介於 6 到 20 個字元之間'
14+
lengthMessage: '長度須介於 6 到 20 個字元之間',
1515
},
1616
captcha: {
1717
label: '驗證碼',
1818
placeholder: '請輸入驗證碼',
1919
requiredMessage: '請輸入驗證碼',
2020
validatorMessage: '驗證碼不正確',
2121
},
22+
new_password: {
23+
label: '新密碼',
24+
placeholder: '請輸入新密碼',
25+
requiredMessage: '請輸入新密碼',
26+
},
27+
re_password: {
28+
label: '確認密碼',
29+
placeholder: '請輸入確認密碼',
30+
requiredMessage: '請輸入確認密碼',
31+
validatorMessage: '密碼不一致',
32+
},
2233
},
2334
jump_tip: '即將跳轉至認證源頁面進行認證',
2435
jump: '跳轉',
@@ -29,7 +40,7 @@ export default {
2940
login: '登錄',
3041
register: '註冊',
3142
backLogin: '返回登錄',
32-
checkCode: '立即驗證'
43+
checkCode: '立即驗證',
3344
},
3445
newPassword: '新密碼',
3546
enterPassword: '請輸入新密碼',
@@ -39,6 +50,6 @@ export default {
3950
placeholder: '請輸入驗證碼',
4051
getVerificationCode: '獲取驗證碼',
4152
successMessage: '驗證碼發送成功',
42-
resend: '重新發送'
43-
}
53+
resend: '重新發送',
54+
},
4455
}

‎ui/src/locales/lang/zh-Hant/views/user-manage.ts‎

Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,47 +16,22 @@ export default {
1616
'刪除該使用者後，該使用者建立的所有資源（應用、知識庫、模型）都會被刪除，請謹慎操作。',
1717
},
1818
disabled: {
19-
confirmTitle: '是否停用函數？',
20-
confirmMessage: '停用後，引用該函數的應用在查詢時會報錯，請謹慎操作。',
19+
confirmTitle: '是否停用工具？',
20+
confirmMessage: '停用後，引用該工具的應用在查詢時會報錯，請謹慎操作。',
2121
},
2222
userForm: {
23-
form: {
24-
username: {
25-
label: '使用者名稱',
26-
placeholder: '請輸入使用者名稱',
27-
requiredMessage: '請輸入使用者名稱',
28-
lengthMessage: '長度須介於 6 到 20 個字元之間',
29-
},
30-
nick_name: {
31-
label: '姓名',
32-
placeholder: '請輸入姓名',
33-
},
34-
email: {
35-
label: '電子信箱',
36-
placeholder: '請輸入電子信箱',
37-
requiredMessage: '請輸入電子信箱',
38-
},
39-
phone: {
40-
label: '手機號碼',
41-
placeholder: '請輸入手機號碼',
42-
},
43-
password: {
44-
label: '登入密碼',
45-
placeholder: '請輸入密碼',
46-
requiredMessage: '請輸入密碼',
47-
lengthMessage: '長度須介於 6 到 20 個字元之間',
48-
},
49-
new_password: {
50-
label: '新密碼',
51-
placeholder: '請輸入新密碼',
52-
requiredMessage: '請輸入新密碼',
53-
},
54-
re_password: {
55-
label: '確認密碼',
56-
placeholder: '請輸入確認密碼',
57-
requiredMessage: '請輸入確認密碼',
58-
validatorMessage: '密碼不一致',
59-
},
23+
nick_name: {
24+
label: '姓名',
25+
placeholder: '請輸入姓名',
26+
},
27+
email: {
28+
label: '電子信箱',
29+
placeholder: '請輸入電子信箱',
30+
requiredMessage: '請輸入電子信箱',
31+
},
32+
phone: {
33+
label: '手機號碼',
34+
placeholder: '請輸入手機號碼',
6035
},
6136
},
6237
source: {

ui/src/views/document/component/SelectDatasetDialog.vue renamed to ui/src/views/document/component/SelectKnowledgeDialog.vue

File renamed without changes.

‎ui/src/views/document/index.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@
525525
<ImportDocumentDialog ref="ImportDocumentDialogRef" :title="title" @refresh="refresh" />
526526
<SyncWebDialog ref="SyncWebDialogRef" @refresh="refresh" />
527527
<!-- 选择知识库 -->
528-
<selectKnowledgeDialog ref="selectKnowledgeDialogRef" @refresh="refreshMigrate" />
528+
<SelectKnowledgeDialog ref="selectKnowledgeDialogRef" @refresh="refreshMigrate" />
529529
<GenerateRelatedDialog ref="GenerateRelatedDialogRef" @refresh="getList" />
530530
</div>
531531
</template>
@@ -536,7 +536,7 @@ import { ElTable } from 'element-plus'
536536
import documentApi from '@/api/knowledge/document'
537537
import ImportDocumentDialog from './component/ImportDocumentDialog.vue'
538538
import SyncWebDialog from '@/views/knowledge/component/SyncWebDialog.vue'
539-
import selectKnowledgeDialog from './component/selectKnowledgeDialog.vue'
539+
import SelectKnowledgeDialog from './component/SelectKnowledgeDialog.vue'
540540
import { numberFormat } from '@/utils/common'
541541
import { datetimeFormat } from '@/utils/time'
542542
import { hitHandlingMethod } from '@/enums/document'

0 commit comments

Comments
 (0)