Skip to content

Commit afe6565

Browse files
CodeCasterXCodeCasterX
committed
Merge branch '1.3.x'
2 parents 0d06c93 + f21f976 commit afe6565

File tree

9 files changed

+11
-60
lines changed

9 files changed

+11
-60
lines changed

‎frontend/src/locale/en_US.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,10 +1051,10 @@
10511051
"tenantId": {
10521052
"description": "Unique identifier of the tenant"
10531053
},
1054-
"app_id": {
1054+
"appId": {
10551055
"description": "The unique identifier of the application"
10561056
},
1057-
"chat_id": {
1057+
"chatId": {
10581058
"description": "The unique identifier of the chat session to be deleted. If not specified, all chats will be deleted"
10591059
}
10601060
}

‎frontend/src/locale/zh_CN.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,10 +1051,10 @@
10511051
"tenantId": {
10521052
"description": "租户的唯一标识符"
10531053
},
1054-
"app_id": {
1054+
"appId": {
10551055
"description": "应用的唯一标识符"
10561056
},
1057-
"chat_id": {
1057+
"chatId": {
10581058
"description": "要删除的聊天会话的唯一标识符，若没有指定，则全部删除"
10591059
}
10601060
}

‎frontend/src/pages/appDetail/overview/common/config.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,23 +1369,23 @@ export const apiListData = {
13691369
{
13701370
schema: {
13711371
type: 'string',
1372-
description: 'north.api.deleteChat.parameters.app_id.description',
1372+
description: 'north.api.deleteChat.parameters.appId.description',
13731373
},
13741374
in: 'query',
13751375
deprecated: false,
1376-
name: 'app_id',
1377-
description: 'north.api.deleteChat.parameters.app_id.description',
1376+
name: 'appId',
1377+
description: 'north.api.deleteChat.parameters.appId.description',
13781378
required: false,
13791379
},
13801380
{
13811381
schema: {
13821382
type: 'string',
1383-
description: 'north.api.deleteChat.parameters.chat_id.description',
1383+
description: 'north.api.deleteChat.parameters.chatId.description',
13841384
},
13851385
in: 'query',
13861386
deprecated: false,
1387-
name: 'chat_id',
1388-
description: 'north.api.deleteChat.parameters.chat_id.description',
1387+
name: 'chatId',
1388+
description: 'north.api.deleteChat.parameters.chatId.description',
13891389
required: false,
13901390
},
13911391
],

‎frontend/src/pages/appDev/index.tsx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,6 @@ const AppDev: React.FC = () => {
243243
</div>
244244
};
245245

246-
// 联机帮助
247-
const onlineHelp = () => {
248-
window.open(`${window.parent.location.origin}/help${getCookie('locale').toLocaleLowerCase() === 'en-us' ? '/en' : '/zh'}/application_development.html`, '_blank');
249-
}
250-
251246
useEffect(() => {
252247
const fetchTab = async () => {
253248
const newTab = await queryAppCategories(tenantId, false);
@@ -260,7 +255,6 @@ const AppDev: React.FC = () => {
260255
<div className={setSpaClassName('apps_root')}>
261256
<div className='apps_header'>
262257
<div className='apps_title'>{t('appDevelopment')}</div>
263-
{ process.env.PACKAGE_MODE === 'spa' && <QuestionCircleOutlined onClick={onlineHelp} />}
264258
</div>
265259
<div className='apps_main'>
266260
<div className='apps-haeader-content'>

‎frontend/src/pages/apps/index.tsx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,13 @@ const Apps: React.FC = () => {
9999
}
100100
}
101101

102-
// 联机帮助
103-
const onlineHelp = () => {
104-
window.open(`${window.parent.location.origin}/help${getCookie('locale').toLocaleLowerCase() === 'en-us' ? '/en' : '/zh'}/application_market.html`, '_blank');
105-
}
106-
107102
useEffect(() => {
108103
queryApps();
109104
}, [page, pageSize, search]);
110105
return (
111106
<div className={setSpaClassName('apps_root')}>
112107
<div className='apps_header'>
113108
<div className='apps_title'>{t('applicationMarket')}</div>
114-
{ process.env.PACKAGE_MODE === 'spa' && <QuestionCircleOutlined onClick={onlineHelp} />}
115109
</div>
116110
<div className='apps_main_market'>
117111
<div className='operatorArea'>

‎frontend/src/pages/httpTool/components/http-information.tsx‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -234,15 +234,6 @@ const InformationConfiguration = (props: any) => {
234234
if (type === 'prev') {
235235
setStepCurrent(1);
236236
} else {
237-
if (!validateUrl(formParams.url)) {
238-
form.setFields([
239-
{
240-
name: 'url',
241-
errors: [t('plsEnterValidUrl')],
242-
},
243-
]);
244-
return;
245-
}
246237
setLoading(true);
247238
let params = requestParam(confirmHttpInfo);
248239
createHttp(params)
@@ -258,17 +249,6 @@ const InformationConfiguration = (props: any) => {
258249
}
259250
};
260251

261-
// url校验
262-
const validateUrl = (value: any) => {
263-
let strRegex =
264-
/^((((?!-)[A-Za-z0-9-]{1,63}(?<!-)\.)+[A-Za-z]{2,6})|(((2[0-4]\d|25[0-5])|[0-1]?\d{0,2})(\.((2[0-4]\d|25[0-5])|[0-1]?\d{0,2})){3}:((6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])|[0-5]?\d{0,4})))(\/[\w-?=&./{}]*)?$/;
265-
if (strRegex.test(value)) {
266-
return true;
267-
} else {
268-
return false;
269-
}
270-
};
271-
272252
useEffect(() => {
273253
if (httpInfo.schema?.name) {
274254
const HTTP = httpInfo.runnables?.HTTP;

‎frontend/src/pages/intelligent-form/index.tsx‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,10 @@ import './index.scss';
2121
const IntelligentForm = () => {
2222
const { t } = useTranslation();
2323

24-
// 联机帮助
25-
const onlineHelp = () => {
26-
window.open(`${window.parent.location.origin}/help${getCookie('locale').toLocaleLowerCase() === 'en-us' ? '/en' : '/zh'}/smart_forms.html`, '_blank');
27-
}
28-
2924
return <div className={setSpaClassName('app-fullpage')}>
3025
<div className='aui-header-1'>
3126
<div className='aui-title-1'>
3227
{t('intelligentForm')}
33-
{ process.env.PACKAGE_MODE === 'spa' && <QuestionCircleOutlined onClick={onlineHelp} style={{ marginLeft: '8px', fontSize: '18px' }} />}
3428
</div>
3529
</div>
3630
<div className='aui-block'>
@@ -39,4 +33,4 @@ const IntelligentForm = () => {
3933
</div>
4034
};
4135

42-
export default IntelligentForm;
36+
export default IntelligentForm;

‎frontend/src/pages/plugin/detail/plugin-list.tsx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ const PliginList = (props) => {
4949
}
5050
};
5151

52-
// 联机帮助
53-
const onlineHelp = () => {
54-
window.open(`${window.parent.location.origin}/help${getCookie('locale').toLocaleLowerCase() === 'en-us' ? '/en' : '/zh'}/application_plug-in.html`, '_blank');
55-
}
56-
5752
useEffect(() => {
5853
getPluginList();
5954
}, []);
@@ -64,7 +59,6 @@ const PliginList = (props) => {
6459
<div className='aui-header-1 '>
6560
<div className='aui-title-1'>
6661
{t('pluginManagement')}
67-
{ process.env.PACKAGE_MODE === 'spa' && <QuestionCircleOutlined onClick={onlineHelp} style={{ marginLeft: '8px', fontSize: '18px' }} />}
6862
</div>
6963
{ !readOnly && <Button type='primary' onClick={() => setOpen(true)}>{t('deploying')}</Button> }
7064
</div>

‎frontend/src/pages/plugin/index.tsx‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,11 @@ const Plugin = () => {
3636
setOpen(true);
3737
setReload(!reload);
3838
}
39-
// 联机帮助
40-
const onlineHelp = () => {
41-
window.open(`${window.parent.location.origin}/help${getCookie('locale').toLocaleLowerCase() === 'en-us' ? '/en' : '/zh'}/application_plug-in.html`, '_blank');
42-
}
4339
return (
4440
<div className={setSpaClassName('app-fullpage')} style={{ display: 'flex', flexDirection: 'column' }}>
4541
<div className='aui-header-1 '>
4642
<div className='aui-title-1'>
4743
{t('pluginManagement')}
48-
{ process.env.PACKAGE_MODE === 'spa' && <QuestionCircleOutlined onClick={onlineHelp} style={{ marginLeft: '8px', fontSize: '18px' }} /> }
4944
</div>
5045
{ !readOnly && <Button type='primary' onClick={setDeployOpen}>{t('deploying')}</Button> }
5146
</div>

0 commit comments

Comments
 (0)