Skip to content

Commit 818e6a0

Browse files
authored
fix(icons): add single icon's js file, rename icon from SubScript to Subscript (#3868)
* fix(icons): add single icon's js file, rename icon from SubScript to Subscript * fix(icon): add build icon's files
1 parent 9b53d76 commit 818e6a0

File tree

14 files changed

+45
-26
lines changed

14 files changed

+45
-26
lines changed

examples/sites/demos/pc/app/icon/advance-icons.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ export const advanceIcons = [
234234
'IconStarDisable',
235235
'IconStartCircle',
236236
'IconStatistics',
237-
'IconSubScript',
237+
'IconSubscript',
238238
'IconSubstituteMaterial',
239239
'IconSuccessful',
240240
'IconSummit',

internals/automate/src/build-svg-to-js/config-saas.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ export const iconsPath = '../../packages/vue-icon-saas'
44

55
export const rewriteConfig = {
66
'total-nolume': 'total-volume',
7-
'subscript': 'sub-script'
7+
'sub-script': 'subscript'
88
}

internals/automate/src/build-svg-to-js/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ export const svgsPath = '../../packages/theme/src/svgs'
33
export const iconsPath = '../../packages/vue-icon'
44

55
export const rewriteConfig = {
6-
'subscript': 'sub-script'
6+
'sub-script': 'subscript'
77
}

internals/automate/src/build-svg-to-js/index.ts

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,28 @@ svgsFiles.forEach((filename) => {
8181
// 2、生成组件的js
8282
const fillList: { capName: string; svgName: string }[] = []
8383
const uncheckedList: { capName: string; svgName: string }[] = []
84+
85+
// 2.1 写入重命名图标的js
8486
const rewriteList = Object.keys(rewriteConfig).map((wrongName) => {
8587
return {
8688
capName: camelize('-' + wrongName),
8789
svgName: wrongName,
88-
rewriteName: camelize('-' + rewriteConfig[wrongName])
90+
rewriteName: rewriteConfig[wrongName],
91+
rewriteCapName: camelize('-' + rewriteConfig[wrongName])
8992
}
9093
})
9194

95+
rewriteList.forEach((item) => {
96+
const tmplStr = `import Icon${item.capName} from "./${item.rewriteName}";
97+
export default Icon${item.capName};
98+
`
99+
fs.writeFileSync(`${iconsPath}/src/${item.svgName}.ts`, tmplStr, 'utf-8')
100+
})
101+
92102
Object.values(svgsMap).forEach((item) => {
93103
const capName = camelize('-' + item.svgName)
94104

95-
// 支持线&面的图标
105+
// 2.2 支持线&面的图标js
96106
if (item.hasFill) {
97107
fillList.push({ capName, svgName: item.svgName })
98108
const tmplStr = `import { svg } from '@opentiny/vue-common'
@@ -105,7 +115,7 @@ export default () => svg({ name: 'Icon${capName}', component: ${capName}, filled
105115
fs.writeFileSync(`${iconsPath}/src/${item.svgName}.ts`, tmplStr, 'utf-8')
106116
return
107117
}
108-
// 未梳理到的图标
118+
// 2.3 未梳理到的图标js
109119
uncheckedList.push({ capName, svgName: item.svgName })
110120
const tmplStr = `import { svg } from '@opentiny/vue-common'
111121
import ${capName} from '${themePackage}/svgs/${item.svgName}.svg'
@@ -130,7 +140,7 @@ const tmplUnchecked = uncheckedList
130140
const tmplRewrite = rewriteList
131141
.map(
132142
(exp) =>
133-
`export const Icon${exp.capName} = () => ({...Icon${exp.rewriteName}(), name:'Icon${exp.capName}', deprecatedBy: 'Icon${exp.rewriteName}' })
143+
`export const Icon${exp.capName} = () => ({...Icon${exp.rewriteCapName}(), name:'Icon${exp.capName}', deprecatedBy: 'Icon${exp.rewriteCapName}' })
134144
export const icon${exp.capName} = Icon${exp.capName}`
135145
)
136146
.join('\n')
File renamed without changes.
File renamed without changes.

packages/vue-icon-saas/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ import IconSplit from './src/split'
233233
import IconStarDisable from './src/star-disable'
234234
import IconStartCircle from './src/start-circle'
235235
import IconStatistics from './src/statistics'
236-
import IconSubScript from './src/sub-script'
236+
import IconSubscript from './src/subscript'
237237
import IconSubstituteMaterial from './src/substitute-material'
238238
import IconSuccessful from './src/successful'
239239
import IconSummit from './src/summit'
@@ -815,7 +815,7 @@ export { IconSplit, IconSplit as iconSplit }
815815
export { IconStarDisable, IconStarDisable as iconStarDisable }
816816
export { IconStartCircle, IconStartCircle as iconStartCircle }
817817
export { IconStatistics, IconStatistics as iconStatistics }
818-
export { IconSubScript, IconSubScript as iconSubScript }
818+
export { IconSubscript, IconSubscript as iconSubscript }
819819
export { IconSubstituteMaterial, IconSubstituteMaterial as iconSubstituteMaterial }
820820
export { IconSuccessful, IconSuccessful as iconSuccessful }
821821
export { IconSummit, IconSummit as iconSummit }
@@ -1170,8 +1170,8 @@ export const IconTotalNolume = () => ({
11701170
deprecatedBy: 'IconTotalVolume'
11711171
})
11721172
export const iconTotalNolume = IconTotalNolume
1173-
export const IconSubscript = () => ({ ...IconSubScript(), name: 'IconSubscript', deprecatedBy: 'IconSubScript' })
1174-
export const iconSubscript = IconSubscript
1173+
export const IconSubScript = () => ({ ...IconSubscript(), name: 'IconSubScript', deprecatedBy: 'IconSubscript' })
1174+
export const iconSubScript = IconSubScript
11751175

11761176
export default {
11771177
IconAcceptance,
@@ -1409,7 +1409,7 @@ export default {
14091409
IconStarDisable,
14101410
IconStartCircle,
14111411
IconStatistics,
1412-
IconSubScript,
1412+
IconSubscript,
14131413
IconSubstituteMaterial,
14141414
IconSuccessful,
14151415
IconSummit,
@@ -1755,5 +1755,5 @@ export default {
17551755
IconWord,
17561756
IconZip,
17571757
IconTotalNolume,
1758-
IconSubscript
1758+
IconSubScript
17591759
}
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { svg } from '@opentiny/vue-common'
2-
import SubScript from '@opentiny/vue-theme-saas/svgs/sub-script.svg'
3-
import SubScriptFilled from '@opentiny/vue-theme-saas/svgs/sub-script-filled.svg'
1+
import IconSubScript from './subscript'
42

5-
export default () => svg({ name: 'IconSubScript', component: SubScript, filledComponent: SubScriptFilled })()
3+
export default IconSubScript
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { svg } from '@opentiny/vue-common'
2+
import Subscript from '@opentiny/vue-theme-saas/svgs/subscript.svg'
3+
import SubscriptFilled from '@opentiny/vue-theme-saas/svgs/subscript-filled.svg'
4+
5+
export default () => svg({ name: 'IconSubscript', component: Subscript, filledComponent: SubscriptFilled })()

0 commit comments

Comments
 (0)