Skip to content

Commit 685e227

Browse files
committed
Merge branch 'main' into docs
2 parents 8cc7157 + a88ffb1 commit 685e227

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fit2cloud-ui-plus",
3-
"version": "1.1.17",
3+
"version": "1.1.18",
44
"private": false,
55
"main": "./lib/fit2cloud-ui-plus.es.js",
66
"files": [
@@ -24,7 +24,7 @@
2424
},
2525
"dependencies": {
2626
"@element-plus/icons-vue": "^1.1.4",
27-
"element-plus": "^2.8.0",
27+
"element-plus": "^2.9.1",
2828
"github-markdown-css": "^5.1.0",
2929
"prism-theme-vars": "^0.2.3",
3030
"prismjs": "^1.28.0",
@@ -39,7 +39,7 @@
3939
"@types/uuid": "^9.0.8",
4040
"@vitejs/plugin-vue": "^2.3.1",
4141
"sass": "^1.83.0",
42-
"sass-loader": "^16.0.1",
42+
"sass-loader": "^16.0.4",
4343
"typescript": "^4.5.4",
4444
"unplugin-vue-define-options": "^0.6.1",
4545
"vite": "^2.9.16",

src/styles/common/function.scss

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
@use 'config';
2+
@use 'sass:string';
3+
@use 'sass:meta';
24

35
// BEM support Func
46
@function selectorToString($selector) {
5-
$selector: inspect($selector);
6-
$selector: str-slice($selector, 2, -2);
7+
$selector: meta.inspect($selector);
8+
$selector: string.slice($selector, 2, -2);
79
@return $selector;
810
}
911

1012
@function containsModifier($selector) {
1113
$selector: selectorToString($selector);
1214

13-
@if str-index($selector, config.$modifier-separator) {
15+
@if string.index($selector, config.$modifier-separator) {
1416
@return true;
1517
} @else {
1618
@return false;
@@ -20,7 +22,7 @@
2022
@function containWhenFlag($selector) {
2123
$selector: selectorToString($selector);
2224

23-
@if str-index($selector, '.' + config.$state-prefix) {
25+
@if string.index($selector, '.' + config.$state-prefix) {
2426
@return true;
2527
} @else {
2628
@return false;
@@ -30,7 +32,7 @@
3032
@function containPseudoClass($selector) {
3133
$selector: selectorToString($selector);
3234

33-
@if str-index($selector, ':') {
35+
@if string.index($selector, ':') {
3436
@return true;
3537
} @else {
3638
@return false;
@@ -81,10 +83,10 @@
8183
}
8284

8385
@function str-replace($string, $search, $replace: '') {
84-
$index: str-index($string, $search);
86+
$index: string.index($string, $search);
8587

8688
@if $index {
87-
@return str-slice($string, 1, $index - 1) + $replace + str-replace(str-slice($string, $index + str-length($search)), $search, $replace);
89+
@return string.slice($string, 1, $index - 1) + $replace + str-replace(string.slice($string, $index + str-length($search)), $search, $replace);
8890
}
8991

9092
@return $string;

src/styles/common/mixins.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
@use 'function' as *;
22
@use 'config' as *;
3+
$B: null;
4+
$E: null;
35

46
// BEM
57
@mixin b($block) {
8+
69
$B: $namespace + '-' + $block !global;
710

811
.#{$B} {

0 commit comments

Comments
 (0)