Oak-Team
/
oak-general-business
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 38 Wiki Activity

Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev

This commit is contained in:
wenjiarui 2023-12-05 14:09:27 +08:00
parent 229bbbb2c4 991de084b9
commit 14874ec2cd
6 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/application/panel/web.pc.module.less
View File

@ -1,4 +1,4 @@
.tabLabel { // .tabLabel {
writing-mode: vertical-rl; // writing-mode: vertical-rl;
letter-spacing: .2rem; // letter-spacing: .2rem;
} // }

27
src/components/application/panel/web.pc.tsx
View File

@ -72,7 +72,7 @@ export default function Render(props: WebComponentProps<EntityDict, 'application
oakPath={`$application-panel-menu-${id}`} oakPath={`$application-panel-menu-${id}`}
tabKey={tabKey} tabKey={tabKey}
/> />
) ),
}, },
{ {
label: <div className={Styles.tabLabel}>{t('autoReply')}</div>, label: <div className={Styles.tabLabel}>{t('autoReply')}</div>,
@ -83,7 +83,7 @@ export default function Render(props: WebComponentProps<EntityDict, 'application
applicationId={id} applicationId={id}
oakPath={`$application-panel-autoReply-${id}`} oakPath={`$application-panel-autoReply-${id}`}
/> />
) ),
}, },
{ {
label: <div className={Styles.tabLabel}>{t('tag')}</div>, label: <div className={Styles.tabLabel}>{t('tag')}</div>,
@ -94,7 +94,7 @@ export default function Render(props: WebComponentProps<EntityDict, 'application
applicationId={id} applicationId={id}
oakPath={`$application-panel-tag-${id}`} oakPath={`$application-panel-tag-${id}`}
/> />
) ),
}, },
{ {
label: <div className={Styles.tabLabel}>{t('user')}</div>, label: <div className={Styles.tabLabel}>{t('user')}</div>,
@ -105,7 +105,7 @@ export default function Render(props: WebComponentProps<EntityDict, 'application
applicationId={id} applicationId={id}
oakPath={`$application-panel-user-${id}`} oakPath={`$application-panel-user-${id}`}
/> />
) ),
}, },
{ {
label: <div className={Styles.tabLabel}>{t('template')}</div>, label: <div className={Styles.tabLabel}>{t('template')}</div>,
@ -113,12 +113,25 @@ export default function Render(props: WebComponentProps<EntityDict, 'application
children: ( children: (
<TemplateList <TemplateList
oakAutoUnmount={true} oakAutoUnmount={true}
oakPath={`templateUpsert-ApplicationId:${id}`} oakPath={`templateUpsert-wechatPublic-ApplicationId:${id}`}
applicationId={id} applicationId={id}
/> />
), ),
}, }
) );
}
else if (type === 'wechatMp') {
items.push({
label: <div className={Styles.tabLabel}>{t('template')}</div>,
key: 'template',
children: (
<TemplateList
oakAutoUnmount={true}
oakPath={`templateUpsert-wechatMp-ApplicationId:${id}`}
applicationId={id}
/>
),
});
} }
if (id && oakFullpath) { if (id && oakFullpath) {
return ( return (

2
src/components/messageTypeSmsTemplate/list/web.pc.tsx
View File

@ -48,7 +48,7 @@ export default function Render(
const { pageSize, total, currentPage } = oakPagination || {}; const { pageSize, total, currentPage } = oakPagination || {};
return ( return (
<> <>
<Space> <Space style={{ marginBottom: 16 }}>
<Button <Button
type="default" type="default"
disabled={ disabled={

1
src/components/messageTypeTemplate/list/index.ts
View File

@ -32,7 +32,6 @@ export default OakComponent({
) )
.filter((ele) => !!ele) .filter((ele) => !!ele)
: ([] as string[]); : ([] as string[]);
console.log(MessageTypes);
const selectedTypes = data ? data.map((ele) => ele.type) : []; const selectedTypes = data ? data.map((ele) => ele.type) : [];
const messageTypes = MessageTypes const messageTypes = MessageTypes
.filter((ele: string) => !selectedTypes.includes(ele)); .filter((ele: string) => !selectedTypes.includes(ele));

2
src/components/messageTypeTemplate/list/web.pc.tsx
View File

@ -47,7 +47,7 @@ export default function Render(
const { pageSize, total, currentPage } = oakPagination || {}; const { pageSize, total, currentPage } = oakPagination || {};
return ( return (
<> <>
<Space> <Space style={{ marginBottom: 16 }}>
<Button <Button
type="default" type="default"
disabled={ disabled={

8
src/components/system/panel/web.pc.module.less
View File

@ -3,8 +3,8 @@
padding: 8px; padding: 8px;
height: 100%; height: 100%;
.tabLabel { // .tabLabel {
writing-mode: vertical-rl; // writing-mode: vertical-rl;
letter-spacing: .2rem; // letter-spacing: .2rem;
} // }
} }