1、svg本地化V3
2、批量管理V3 3、其他微调
This commit is contained in:
parent
8c4cea16cb
commit
8bca7077e5
1
cds-fontend-2025.V1/src/assets/svg-icon/menu/ziyuan1.svg
Normal file
1
cds-fontend-2025.V1/src/assets/svg-icon/menu/ziyuan1.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg t="1755758559509" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="40246" width="200" height="200"><path d="M510.203509 589.249123c-10.778947 0-23.354386-3.592982-35.929825-8.982456L104.196491 393.431579c-39.522807-19.761404-55.691228-66.470175-35.929824-105.992983 7.185965-16.168421 19.761404-26.947368 35.929824-35.929824L476.070175 62.877193c10.778947-5.389474 23.354386-8.982456 35.929825-8.982456 10.778947 0 23.354386 3.592982 35.929825 8.982456L918.007018 251.508772h1.796491c16.168421 7.185965 28.74386 21.557895 37.726316 46.708772 7.185965 16.168421 5.389474 34.133333-3.592983 57.487719-7.185965 16.168421-19.761404 26.947368-34.133333 34.133333L547.929825 580.266667c-14.37193 3.592982-25.150877 8.982456-37.726316 8.982456z m0-470.680702c-1.796491 0-5.389474 0-7.185965 1.796491L132.940351 307.2c-5.389474 1.796491-8.982456 7.185965-8.982456 14.37193s3.592982 10.778947 8.982456 14.37193L503.017544 524.575439c1.796491 1.796491 5.389474 1.796491 7.185965 1.796491 1.796491 0 5.389474 0 7.185965-1.796491l371.873684-188.631579c5.389474-1.796491 8.982456-7.185965 8.982456-14.37193s-3.592982-10.778947-8.982456-14.37193L519.185965 120.364912c-3.592982-1.796491-5.389474-1.796491-8.982456-1.796491z m0 0" p-id="40247"></path><path d="M510.203509 776.084211c-10.778947 0-23.354386-3.592982-35.929825-8.982457L104.196491 580.266667c-39.522807-19.761404-55.691228-66.470175-35.929824-105.992983v-1.796491c3.592982-10.778947 16.168421-16.168421 25.150877-16.168421 3.592982 0 7.185965 0 10.778947 3.592982 1.796491 1.796491 1.796491 1.796491 3.592983 1.796492 7.185965 1.796491 12.575439 8.982456 14.37193 17.964912 1.796491 7.185965 1.796491 14.37193-1.796492 19.761403-1.796491 3.592982-3.592982 8.982456-1.796491 12.575439 1.796491 5.389474 3.592982 8.982456 8.982456 10.778947l371.873684 188.631579c1.796491 1.796491 5.389474 1.796491 7.185965 1.796492 1.796491 0 5.389474 0 7.185965-1.796492l371.873684-188.631579c3.592982-1.796491 7.185965-5.389474 8.982457-10.778947 1.796491-5.389474 0-8.982456-1.796492-12.575439-5.389474-7.185965-7.185965-17.964912-5.389473-26.947368 1.796491-7.185965 5.389474-12.575439 10.778947-16.168421 0 0 1.796491 0 1.796491-1.796491 5.389474-3.592982 12.575439-7.185965 19.761404-7.185965 5.389474 0 16.168421 1.796491 21.557895 10.778947l1.796491 1.796491c19.761404 23.354386 23.354386 57.487719 8.982456 80.842106 0 0 0 1.796491-1.796491 1.796491-7.185965 16.168421-19.761404 26.947368-35.929825 35.929824L542.540351 770.694737c-5.389474 0-17.964912 5.389474-32.336842 5.389474z m0 0" p-id="40248"></path><path d="M510.203509 964.715789c-10.778947 0-23.354386-3.592982-35.929825-8.982456L104.196491 768.898246h-1.796491c-16.168421-7.185965-28.74386-21.557895-37.726316-46.708772-7.185965-19.761404-3.592982-43.115789 3.592983-57.48772v-1.796491c5.389474-10.778947 16.168421-16.168421 25.150877-16.168421 3.592982 0 7.185965 0 10.778947 3.592983 1.796491 1.796491 1.796491 1.796491 3.592983 1.796491 7.185965 1.796491 12.575439 8.982456 14.37193 17.964912 1.796491 7.185965 1.796491 14.37193-1.796492 19.761404-1.796491 3.592982-3.592982 8.982456-1.796491 12.575438 1.796491 5.389474 3.592982 8.982456 8.982456 10.778948l371.873684 188.631578c1.796491 1.796491 5.389474 1.796491 7.185965 1.796492 1.796491 0 5.389474 0 7.185965-1.796492l371.873684-188.631578c3.592982-1.796491 7.185965-5.389474 8.982457-10.778948 1.796491-5.389474 0-8.982456-1.796492-12.575438-5.389474-7.185965-7.185965-17.964912-5.389473-26.947369 1.796491-7.185965 5.389474-12.575439 10.778947-16.168421 0 0 1.796491 0 1.796491-1.796491 5.389474-3.592982 12.575439-7.185965 19.761404-7.185965 5.389474 0 16.168421 1.796491 21.557895 10.778947l1.796491 1.796492c19.761404 23.354386 23.354386 57.487719 8.982456 80.842105 0 0 0 1.796491-1.796491 1.796491-7.185965 16.168421-19.761404 26.947368-35.929825 35.929825L542.540351 959.326316c-5.389474 0-17.964912 5.389474-32.336842 5.389473z m0 0" p-id="40249"></path></svg>
|
After Width: | Height: | Size: 3.9 KiB |
@ -72,10 +72,10 @@ function renderLabel({ option }: { option: TreeOption }) {
|
||||
function renderPrefix({ option }: { option: TreeOption }) {
|
||||
const renderLocalIcon = String(option.icon).startsWith('local-icon-');
|
||||
let icon = renderLocalIcon ? undefined : String(option.icon ?? 'local-icon-default');
|
||||
const localIcon = renderLocalIcon ? String(option.icon).replace('local-icon-', 'menu-') : undefined;
|
||||
const localIcon = renderLocalIcon ? String(option.icon).replace('local-icon-', 'menu-') : 'menu-default';
|
||||
if (icon === '#') {
|
||||
/*icon = 'material-symbols:buttons-alt-outline-rounded';*/
|
||||
icon = 'local-icon-default';
|
||||
icon = '#';
|
||||
}
|
||||
return <SvgIcon icon={icon} localIcon={localIcon} />;
|
||||
}
|
||||
|
@ -19,13 +19,23 @@ const appStore = useAppStore();
|
||||
<NDrawer v-model:show="appStore.themeDrawerVisible" display-directive="show" :width="360">
|
||||
<NDrawerContent :title="$t('theme.themeDrawerTitle')" :native-scrollbar="false" closable>
|
||||
<DarkMode />
|
||||
|
||||
<!-- 布局模式-->
|
||||
<LayoutMode />
|
||||
|
||||
<!-- 主题颜色-->
|
||||
<ThemeColor />
|
||||
<PageFun />
|
||||
<TableProps />
|
||||
<template #footer>
|
||||
|
||||
<!--页面功能-->
|
||||
<!-- <PageFun />-->
|
||||
|
||||
<!--表格配置-->
|
||||
<!-- <TableProps />-->
|
||||
|
||||
<!--复制及重置-->
|
||||
<!-- <template #footer>
|
||||
<ConfigOperation />
|
||||
</template>
|
||||
</template>-->
|
||||
</NDrawerContent>
|
||||
</NDrawer>
|
||||
</template>
|
||||
|
@ -142,18 +142,17 @@ const {
|
||||
render: row => {
|
||||
const editBtn = () => {
|
||||
if (!hasAuth('mps:batch:edit')) {
|
||||
return 'NA';
|
||||
return <span style="color: #ccc; font-style: italic;">NA</span>;
|
||||
}
|
||||
|
||||
/*状态控制,注意要和数据库&字典保持一致*/
|
||||
if(row.preBatchStatus != '1'){
|
||||
return 'NA';
|
||||
return <span style="color: #ccc; font-style: italic;">NA</span>;
|
||||
}
|
||||
if(row.afterBatchStatus != '0'){
|
||||
return 'NA';
|
||||
return <span style="color: #ccc; font-style: italic;">NA</span>;
|
||||
}
|
||||
if(row.checkStatus != '0'){
|
||||
return 'NA';
|
||||
return <span style="color: #ccc; font-style: italic;">NA</span>;
|
||||
}
|
||||
return (
|
||||
<ButtonIcon
|
||||
|
@ -144,7 +144,7 @@ watch(visible, () => {
|
||||
/>
|
||||
</NFormItem>
|
||||
<NFormItem label="正式批量时间" path="afterBatchDate">
|
||||
<NDatePicker
|
||||
<NDatePicker style="width: 100%"
|
||||
:disabled="true"
|
||||
v-model:formatted-value="model.afterBatchDate"
|
||||
type="datetime"
|
||||
|
@ -33,6 +33,10 @@ async function search() {
|
||||
await validate();
|
||||
emit('search');
|
||||
}
|
||||
|
||||
function disablePreviousDate(ts) {
|
||||
return ts > Date.now()
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@ -44,9 +48,14 @@ async function search() {
|
||||
<NFormItemGi span="24 s:12 m:6" label="批次月份" path="batchMonth" class="pr-24px">
|
||||
<NDatePicker
|
||||
v-model:formatted-value="model.batchMonth"
|
||||
type="datetime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
type="month"
|
||||
format="y年 M月"
|
||||
year-format="y年"
|
||||
month-format="M月"
|
||||
value-format="yyyyMM"
|
||||
clearable
|
||||
:is-date-disabled="disablePreviousDate"
|
||||
:update-value-on-close="true"
|
||||
/>
|
||||
</NFormItemGi>
|
||||
<NFormItemGi span="24 s:12 m:6" label="核对备注" path="checkRemark" class="pr-24px">
|
||||
|
@ -1,8 +1,2 @@
|
||||
Application Version: ${revision}
|
||||
Spring Boot Version: ${spring-boot.version}
|
||||
__________ _____.___.__ ____ ____ __________.__
|
||||
\______ \__ __ ____\__ | |__| \ \ / /_ __ ____ \______ \ | __ __ ______
|
||||
| _/ | \/ _ \/ | | | ______ \ Y / | \_/ __ \ ______ | ___/ | | | \/ ___/
|
||||
| | \ | ( <_> )____ | | /_____/ \ /| | /\ ___/ /_____/ | | | |_| | /\___ \
|
||||
|____|_ /____/ \____// ______|__| \___/ |____/ \___ > |____| |____/____//____ >
|
||||
\/ \/ \/ \/
|
||||
|
Loading…
Reference in New Issue
Block a user