Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"explorer.fileNesting.expand": false,
"explorer.fileNesting.enabled": true,
"explorer.fileNesting.patterns": {
".gitignore": ".git*",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
}
},
"lint-staged": {
"{src,example,script}/**/*.{js,ts,wxml,wxss,html,json,less}": [
"{src,example,script}/**/*.{js,ts,wxs,wxml,wxss,html,json,less}": [
"prettier --write"
],
"{src,example}/**/*.{js,ts}": [
Expand All @@ -127,4 +127,4 @@
"dayjs": "^1.10.7",
"tinycolor2": "^1.4.2"
}
}
}
1 change: 1 addition & 0 deletions src/calendar/calendar.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ function isDateSelected(dateItem) {
}

function getMonthTitle(year, month, pattern = '') {
// prettier-ignore
var REGEXP = getRegExp('\{year\}|\{month\}', 'g');

return pattern.replace(REGEXP, function (match) {
Expand Down
2 changes: 2 additions & 0 deletions src/common/utils.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* addUnit */
// 为 css 添加单位
function addUnit(value) {
// prettier-ignore
var REGEXP = getRegExp('^-?\d+(.\d+)?$');
if (value == null) {
return undefined;
Expand Down Expand Up @@ -125,6 +126,7 @@ function _style(styles) {
}

function isValidIconName(str) {
// prettier-ignore
return getRegExp('^[A-Za-z0-9\-]+$').test(str);
}

Expand Down
1 change: 0 additions & 1 deletion src/empty/empty.wxml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<import src="../common/template/icon.wxml" />
<wxs src="../common/utils.wxs" module="_" />
<wxs src="./empty.wxs" module="utils" />

<view style="{{_._style([style, customStyle])}}" class="class {{prefix}}-class {{classPrefix}}">
<view aria-hidden="true" class="{{classPrefix}}__thumb">
Expand Down
12 changes: 0 additions & 12 deletions src/empty/empty.wxs

This file was deleted.

3 changes: 1 addition & 2 deletions src/grid/_example/badge/index.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,12 @@
display: flex;
}


.badge .image {
position: inherit;
}

.badge .image::before {
content: " ";
content: ' ';
position: absolute;
top: 0;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/grid/_example/base/index.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

.block .image::before {
content: " ";
content: ' ';
position: absolute;
top: 0;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/grid/_example/border/index.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

.block .image::before {
content: " ";
content: ' ';
position: absolute;
top: 0;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/grid/_example/card/index.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

.block .image::before {
content: " ";
content: ' ';
position: absolute;
top: 0;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/grid/_example/description/index.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

.block .image::before {
content: " ";
content: ' ';
position: absolute;
top: 0;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/grid/_example/multiple/index.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

.block .image::before {
content: " ";
content: ' ';
position: absolute;
top: 0;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/grid/_example/scroll/index.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}

.block .image::before {
content: " ";
content: ' ';
position: absolute;
top: 0;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/side-bar/_example/base/index.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ page .round-image {
}

.side-bar-wrapper .image::before {
content: " ";
content: ' ';
position: absolute;
top: 0;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/side-bar/_example/custom/index.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ page .round-image {
}

.side-bar-wrapper .image::before {
content: " ";
content: ' ';
position: absolute;
top: 0;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/side-bar/_example/switch/index.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ page .round-image {
}

.side-bar-wrapper .image::before {
content: " ";
content: ' ';
position: absolute;
top: 0;
left: 0;
Expand Down
2 changes: 1 addition & 1 deletion src/side-bar/_example/with-icon/index.wxss
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ page .round-image {
}

.side-bar-wrapper .image::before {
content: " ";
content: ' ';
position: absolute;
top: 0;
left: 0;
Expand Down
Loading