Skip to content

Commit 69c5500

Browse files
kailong321200875kailong321200875
authored
Merge pull request kailong321200875#476 from tnnevol/feat/fix-name
fix: less 变量命名与 css 关键字冲突 kailong321200875#475
2 parents 566a57a + 1c56e13 commit 69c5500

File tree

21 files changed

+24
-24
lines changed

21 files changed

+24
-24
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ dist-ssr
77
*-lock.*
88
pnpm-debug
99
stats.html
10-
10+
.idea

‎src/App.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ElNotification({
3434
</template>
3535

3636
<style lang="less">
37-
@prefix-cls: ~'@{namespace}-app';
37+
@prefix-cls: ~'@{adminNamespace}-app';
3838
3939
.size {
4040
width: 100%;

‎src/components/Avatars/src/Avatars.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const filterData = computed(() => props.data.slice(0, props.max))
6969
</template>
7070

7171
<style scoped lang="less">
72-
@prefix-cls: ~'@{namespace}-avatars';
72+
@prefix-cls: ~'@{adminNamespace}-avatars';
7373
7474
.@{prefix-cls} {
7575
.@{elNamespace}-avatar + .@{elNamespace}-avatar {

‎src/components/Descriptions/src/Descriptions.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ export default defineComponent({
163163
</script>
164164

165165
<style lang="less" scoped>
166-
@prefix-cls: ~'@{namespace}-descriptions';
166+
@prefix-cls: ~'@{adminNamespace}-descriptions';
167167
168168
:deep(.@{elNamespace}-descriptions__header) {
169169
display: none !important;

‎src/components/Form/src/Form.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ export default defineComponent({
420420
</script>
421421

422422
<style lang="less" scoped>
423-
.@{elNamespace}-form.@{namespace}-form .@{elNamespace}-row {
423+
.@{elNamespace}-form.@{adminNamespace}-form .@{elNamespace}-row {
424424
margin-right: 0 !important;
425425
margin-left: 0 !important;
426426
}

‎src/components/Icon/src/Icon.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ const getIconifyStyle = computed(() => {
5353
</template>
5454

5555
<style lang="less" scoped>
56-
@prefix-cls: ~'@{namespace}-icon';
56+
@prefix-cls: ~'@{adminNamespace}-icon';
5757
5858
.@{prefix-cls},
5959
.iconify {

‎src/components/IconPicker/src/IconPicker.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ const inputClear = () => {
182182
</template>
183183

184184
<style lang="less" scoped>
185-
@prefix-cls: ~'@{namespace}-icon-picker';
185+
@prefix-cls: ~'@{adminNamespace}-icon-picker';
186186
187187
.@{prefix-cls} {
188188
:deep(.@{elNamespace}-input__wrapper) {

‎src/components/InputPassword/src/InputPassword.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const getPasswordStrength = computed(() => {
6565
</template>
6666

6767
<style lang="less" scoped>
68-
@prefix-cls: ~'@{namespace}-input-password';
68+
@prefix-cls: ~'@{adminNamespace}-input-password';
6969
7070
.@{prefix-cls} {
7171
:deep(.@{elNamespace}-input__clear) {

‎src/components/Menu/src/Menu.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export default defineComponent({
126126
</script>
127127

128128
<style lang="less" scoped>
129-
@prefix-cls: ~'@{namespace}-menu';
129+
@prefix-cls: ~'@{adminNamespace}-menu';
130130
131131
.@{prefix-cls} {
132132
position: relative;
@@ -227,7 +227,7 @@ export default defineComponent({
227227
</style>
228228

229229
<style lang="less">
230-
@prefix-cls: ~'@{namespace}-menu-popper';
230+
@prefix-cls: ~'@{adminNamespace}-menu-popper';
231231
232232
.@{prefix-cls}--vertical,
233233
.@{prefix-cls}--horizontal {

‎src/components/Qrcode/src/Qrcode.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ const disabledClick = () => {
238238
</template>
239239

240240
<style lang="less" scoped>
241-
@prefix-cls: ~'@{namespace}-qrcode';
241+
@prefix-cls: ~'@{adminNamespace}-qrcode';
242242
243243
.@{prefix-cls} {
244244
&--disabled {

‎src/components/Setting/src/Setting.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ const themeChange = () => {
249249
</template>
250250

251251
<style lang="less" scoped>
252-
@prefix-cls: ~'@{namespace}-setting';
252+
@prefix-cls: ~'@{adminNamespace}-setting';
253253
254254
.@{prefix-cls} {
255255
border-radius: 6px 0 0 6px;

‎src/components/Setting/src/components/ColorRadioPicker.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ watch(
5555
</template>
5656

5757
<style lang="less" scoped>
58-
@prefix-cls: ~'@{namespace}-color-radio-picker';
58+
@prefix-cls: ~'@{adminNamespace}-color-radio-picker';
5959
6060
.@{prefix-cls} {
6161
.is-active {

‎src/components/Setting/src/components/LayoutRadioPicker.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const layout = computed(() => appStore.getLayout)
6060
</template>
6161

6262
<style lang="less" scoped>
63-
@prefix-cls: ~'@{namespace}-layout-radio-picker';
63+
@prefix-cls: ~'@{adminNamespace}-layout-radio-picker';
6464
6565
.@{prefix-cls} {
6666
&__classic {

‎src/components/TabMenu/src/TabMenu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ export default defineComponent({
223223
</script>
224224

225225
<style lang="less" scoped>
226-
@prefix-cls: ~'@{namespace}-tab-menu';
226+
@prefix-cls: ~'@{adminNamespace}-tab-menu';
227227
228228
.@{prefix-cls} {
229229
transition: all var(--transition-time-02);

‎src/components/TagsView/src/TagsView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ watch(
478478
</template>
479479

480480
<style lang="less" scoped>
481-
@prefix-cls: ~'@{namespace}-tags-view';
481+
@prefix-cls: ~'@{adminNamespace}-tags-view';
482482
483483
.@{prefix-cls} {
484484
:deep(.@{elNamespace}-scrollbar__view) {

‎src/components/UserInfo/src/components/LockPage.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ function handleShowForm(show = false) {
152152
</template>
153153

154154
<style lang="less" scoped>
155-
@prefix-cls: ~'@{namespace}-lock-page';
155+
@prefix-cls: ~'@{adminNamespace}-lock-page';
156156
157157
// Small screen / tablet
158158
@screen-sm: 576px;

‎src/layout/Layout.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export default defineComponent({
6767
</script>
6868

6969
<style lang="less" scoped>
70-
@prefix-cls: ~'@{namespace}-layout';
70+
@prefix-cls: ~'@{adminNamespace}-layout';
7171
7272
.@{prefix-cls} {
7373
background-color: var(--app-content-bg-color);

‎src/layout/components/ToolHeader.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export default defineComponent({
7474
</script>
7575

7676
<style lang="less" scoped>
77-
@prefix-cls: ~'@{namespace}-tool-header';
77+
@prefix-cls: ~'@{adminNamespace}-tool-header';
7878
7979
.@{prefix-cls} {
8080
transition: left var(--transition-time-02);

‎src/styles/variables.module.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// 命名空间
2-
@namespace: v;
2+
@adminNamespace: v;
33
// el命名空间
44
@elNamespace: el;
55

66
// 导出变量
77
:export {
8-
namespace: @namespace;
8+
namespace: @adminNamespace;
99
elNamespace: @elNamespace;
1010
}

‎src/views/Dashboard/components/PanelGroup.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ getCount()
155155
</template>
156156

157157
<style lang="less" scoped>
158-
@prefix-cls: ~'@{namespace}-panel';
158+
@prefix-cls: ~'@{adminNamespace}-panel';
159159
160160
.@{prefix-cls} {
161161
&__item {
@@ -176,7 +176,7 @@ getCount()
176176
}
177177
178178
&:hover {
179-
:deep(.@{namespace}-icon) {
179+
:deep(.@{adminNamespace}-icon) {
180180
color: #fff !important;
181181
}
182182
.@{prefix-cls}__item--icon {

‎src/views/Login/Login.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ const themeChange = () => {
9999
</template>
100100

101101
<style lang="less" scoped>
102-
@prefix-cls: ~'@{namespace}-login';
102+
@prefix-cls: ~'@{adminNamespace}-login';
103103
104104
.@{prefix-cls} {
105105
overflow: auto;

0 commit comments

Comments
 (0)