diff --git a/packages/uni-components/package.json b/packages/uni-components/package.json
index c08db94a5c0a629c1aea0b97a4facd8c1328eb0c..7299f49aeabb6d55f3b5416879909730b4b7ec59 100644
--- a/packages/uni-components/package.json
+++ b/packages/uni-components/package.json
@@ -1,8 +1,10 @@
{
- "private": true,
"name": "@dcloudio/uni-components",
"version": "3.0.0",
"description": "@dcloudio/uni-components",
+ "files": [
+ "style"
+ ],
"repository": {
"type": "git",
"url": "git+https://github.com/dcloudio/uni-app.git",
diff --git a/packages/uni-components/src/components/canvas/index.vue b/packages/uni-components/src/components/canvas/index.vue
index 7efeb3e015340bd2c89d83da3fa1e31a70215a74..030b9a3d4e26a921483565fcdc0a156d91b01b3e 100644
--- a/packages/uni-components/src/components/canvas/index.vue
+++ b/packages/uni-components/src/components/canvas/index.vue
@@ -574,19 +574,3 @@ export default {
}
}
-
diff --git a/packages/uni-components/src/components/checkbox-group/index.vue b/packages/uni-components/src/components/checkbox-group/index.vue
index fe445550f04cf4ea6e17f3c230f8ea95a5745fcc..bfbd1f3b3e755830be9d5169d404bc04445097fe 100644
--- a/packages/uni-components/src/components/checkbox-group/index.vue
+++ b/packages/uni-components/src/components/checkbox-group/index.vue
@@ -75,10 +75,4 @@ export default {
}
}
}
-
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/editor/index.vue b/packages/uni-components/src/components/editor/index.vue
index d24e422acf55eaa8b5a5176a7e6bbb4a9cb765ff..a806445c1b2eee41c8a1cc2262acc21351ecaad3 100644
--- a/packages/uni-components/src/components/editor/index.vue
+++ b/packages/uni-components/src/components/editor/index.vue
@@ -340,8 +340,4 @@ export default {
}
}
}
-
-
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/label/index.vue b/packages/uni-components/src/components/label/index.vue
index d833320d764f5e830acbc3085e28430a5c2c4752..40a049d03378e0dc9e62a9deb584af801cdf7881 100644
--- a/packages/uni-components/src/components/label/index.vue
+++ b/packages/uni-components/src/components/label/index.vue
@@ -43,9 +43,4 @@ export default {
}
}
}
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/movable-area/index.vue b/packages/uni-components/src/components/movable-area/index.vue
index 9ca8188bc0acd97817a213e51f245d3575c35bea..f4bd6bdbd5bc1537175ebbf355c466fd9d251a48 100644
--- a/packages/uni-components/src/components/movable-area/index.vue
+++ b/packages/uni-components/src/components/movable-area/index.vue
@@ -168,16 +168,4 @@ export default {
}), $slots])
}
}
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/movable-view/index.vue b/packages/uni-components/src/components/movable-view/index.vue
index 35321c1f0ec7be96f963c225276796c0c0c86e5a..1f34ccf72d89d066e8ec88f0e35643e837b4f024 100644
--- a/packages/uni-components/src/components/movable-view/index.vue
+++ b/packages/uni-components/src/components/movable-view/index.vue
@@ -635,19 +635,4 @@ export default {
}
}
}
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/picker-view-column/index.vue b/packages/uni-components/src/components/picker-view-column/index.vue
index e45df8a308de2ccbfc3fc510627ec4182c3e5c9b..2b81d9953d27cd7cac65edd6a5c4ee05c3724e57 100644
--- a/packages/uni-components/src/components/picker-view-column/index.vue
+++ b/packages/uni-components/src/components/picker-view-column/index.vue
@@ -231,116 +231,4 @@ export default {
])
}
}
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/picker-view/index.vue b/packages/uni-components/src/components/picker-view/index.vue
index a1c9ec758731655bfc60a9977421a934627667d3..5724bb60cad30d2d54691d51ad2849dfc2345adf 100644
--- a/packages/uni-components/src/components/picker-view/index.vue
+++ b/packages/uni-components/src/components/picker-view/index.vue
@@ -121,20 +121,4 @@ export default {
])
}
}
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/radio-group/index.vue b/packages/uni-components/src/components/radio-group/index.vue
index 6f6e3747466aac4db71c522addf6f2fc5a2f0000..6eca1a28b7d6e6c10cb197c5d916a1017823e1bd 100644
--- a/packages/uni-components/src/components/radio-group/index.vue
+++ b/packages/uni-components/src/components/radio-group/index.vue
@@ -93,10 +93,4 @@ export default {
}
}
}
-
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/radio/index.vue b/packages/uni-components/src/components/radio/index.vue
index c59702c407361365a88a232b57eb191c144bc31a..35174b4fa597598c204a612f75fc688074f8e8ee 100644
--- a/packages/uni-components/src/components/radio/index.vue
+++ b/packages/uni-components/src/components/radio/index.vue
@@ -100,69 +100,4 @@ export default {
}
}
}
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/resize-sensor/index.vue b/packages/uni-components/src/components/resize-sensor/index.vue
index da07a6a229dbb05c6b58a71fec8661aeaae3869f..79c0f67edb161031ed0dc410ae9814725500d892 100644
--- a/packages/uni-components/src/components/resize-sensor/index.vue
+++ b/packages/uni-components/src/components/resize-sensor/index.vue
@@ -75,40 +75,4 @@ export default {
}
}
-
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/rich-text/index.vue b/packages/uni-components/src/components/rich-text/index.vue
index c9990a0853dbcfb605b638889b31fb443c6992ed..cb07cd49a437cd9fff702e5d6b252fc6a1272831 100644
--- a/packages/uni-components/src/components/rich-text/index.vue
+++ b/packages/uni-components/src/components/rich-text/index.vue
@@ -36,5 +36,4 @@ export default {
}
}
}
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/swiper-item/index.vue b/packages/uni-components/src/components/swiper-item/index.vue
index 32a57b4f7669e77736f63876b103540bb352b4dd..3463b43f9735078fd2886664975373a6206cc92e 100644
--- a/packages/uni-components/src/components/swiper-item/index.vue
+++ b/packages/uni-components/src/components/swiper-item/index.vue
@@ -25,19 +25,4 @@ export default {
}
}
}
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/swiper/index.vue b/packages/uni-components/src/components/swiper/index.vue
index f15ba3be7a1e01375a642886775c83a2e1213180..c1c62149b33bc884f6a39e966fa352db4960f38a 100644
--- a/packages/uni-components/src/components/swiper/index.vue
+++ b/packages/uni-components/src/components/swiper/index.vue
@@ -641,94 +641,4 @@ export default {
)
}
}
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/switch/index.vue b/packages/uni-components/src/components/switch/index.vue
index dc16772cffcda72c17be95c782df6e48cef68822..fd95077d65c6157717e6e8185eb16f1b50a59490 100644
--- a/packages/uni-components/src/components/switch/index.vue
+++ b/packages/uni-components/src/components/switch/index.vue
@@ -104,128 +104,4 @@ export default {
}
}
}
-
-
+
\ No newline at end of file
diff --git a/packages/uni-components/src/components/textarea/index.vue b/packages/uni-components/src/components/textarea/index.vue
index d990e8ee3966456f424dd3e97c6b5d1ef95b65e1..2e4cb99b0dc2533e216cf7b0c1014c0368e0dacc 100644
--- a/packages/uni-components/src/components/textarea/index.vue
+++ b/packages/uni-components/src/components/textarea/index.vue
@@ -277,81 +277,4 @@ export default {
}
}
}
-
-
-
+
\ No newline at end of file
diff --git a/packages/uni-h5/style/audio.css b/packages/uni-components/style/audio.css
similarity index 100%
rename from packages/uni-h5/style/audio.css
rename to packages/uni-components/style/audio.css
diff --git a/packages/uni-h5/style/button.css b/packages/uni-components/style/button.css
similarity index 97%
rename from packages/uni-h5/style/button.css
rename to packages/uni-components/style/button.css
index b4cac9e87d847b35f351a9e6e4ba09e9b0cf3c81..c65dcaa31a30ac2bca15b15f3a6c4b7809bbb681 100644
--- a/packages/uni-h5/style/button.css
+++ b/packages/uni-components/style/button.css
@@ -30,9 +30,7 @@ uni-button:after {
top: 0;
left: 0;
border: 1px solid rgba(0, 0, 0, 0.2);
- -webkit-transform: scale(0.5);
transform: scale(0.5);
- -webkit-transform-origin: 0 0;
transform-origin: 0 0;
box-sizing: border-box;
border-radius: 10px;
@@ -183,7 +181,6 @@ uni-button[loading]:before {
width: 18px;
height: 18px;
vertical-align: middle;
- -webkit-animation: uni-loading 1s steps(12, end) infinite;
animation: uni-loading 1s steps(12, end) infinite;
background-size: 100%;
}
diff --git a/packages/uni-components/style/canvas.css b/packages/uni-components/style/canvas.css
new file mode 100644
index 0000000000000000000000000000000000000000..b54ca7f54a771a158ee0127d39bde7dd3e137a46
--- /dev/null
+++ b/packages/uni-components/style/canvas.css
@@ -0,0 +1,14 @@
+uni-canvas {
+ width: 300px;
+ height: 150px;
+ display: block;
+ position: relative;
+}
+
+uni-canvas > canvas {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+}
diff --git a/packages/uni-components/style/checkbox-group.css b/packages/uni-components/style/checkbox-group.css
new file mode 100644
index 0000000000000000000000000000000000000000..9e0ab4a246c167844253a17b19e37f520f2db02e
--- /dev/null
+++ b/packages/uni-components/style/checkbox-group.css
@@ -0,0 +1,7 @@
+uni-checkbox-group {
+ display: block;
+}
+
+uni-checkbox-group[hidden] {
+ display: none;
+}
diff --git a/packages/uni-h5/style/checkbox.css b/packages/uni-components/style/checkbox.css
similarity index 88%
rename from packages/uni-h5/style/checkbox.css
rename to packages/uni-components/style/checkbox.css
index 3075a916b5dfc9228525628cea03c002aa8dd712..a9edb85d3e40ab2bfecd4c59a11c89467f06abab 100644
--- a/packages/uni-h5/style/checkbox.css
+++ b/packages/uni-components/style/checkbox.css
@@ -1,7 +1,3 @@
-uni-checkbox-group {
- display: block;
-}
-
uni-checkbox {
-webkit-tap-highlight-color: transparent;
display: inline-block;
@@ -17,16 +13,13 @@ uni-checkbox[disabled] {
}
.uni-checkbox-wrapper {
- display: -webkit-inline-flex;
display: inline-flex;
- -webkit-align-items: center;
align-items: center;
vertical-align: middle;
}
.uni-checkbox-input {
margin-right: 5px;
- -webkit-appearance: none;
appearance: none;
outline: 0;
border: 1px solid #d1d1d1;
@@ -53,7 +46,6 @@ uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
top: 50%;
left: 50%;
transform: translate(-50%, -48%) scale(0.73);
- -webkit-transform: translate(-50%, -48%) scale(0.73);
}
.uni-checkbox-input.uni-checkbox-input-disabled {
@@ -63,3 +55,7 @@ uni-checkbox:not([disabled]) .uni-checkbox-input:hover {
.uni-checkbox-input.uni-checkbox-input-disabled:before {
color: #adadad;
}
+
+uni-checkbox-group {
+ display: block;
+}
diff --git a/packages/uni-components/style/editor.css b/packages/uni-components/style/editor.css
new file mode 100644
index 0000000000000000000000000000000000000000..0486be154191e2313b1308ec9d9688a7fec023b3
--- /dev/null
+++ b/packages/uni-components/style/editor.css
@@ -0,0 +1,393 @@
+.ql-container {
+ display: block;
+ position: relative;
+ box-sizing: border-box;
+ user-select: text;
+ outline: none;
+ overflow: hidden;
+ width: 100%;
+ height: 200px;
+ min-height: 200px;
+}
+.ql-container[hidden] {
+ display: none;
+}
+.ql-container .ql-editor {
+ position: relative;
+ font-size: inherit;
+ line-height: inherit;
+ font-family: inherit;
+ min-height: inherit;
+ width: 100%;
+ height: 100%;
+ padding: 0;
+ overflow-x: hidden;
+ overflow-y: auto;
+ -webkit-tap-highlight-color: transparent;
+ -webkit-touch-callout: none;
+ -webkit-overflow-scrolling: touch;
+}
+.ql-container .ql-editor::-webkit-scrollbar {
+ width: 0 !important;
+}
+.ql-container .ql-editor.scroll-disabled {
+ overflow: hidden;
+}
+.ql-container .ql-image-overlay {
+ display: flex;
+ position: absolute;
+ box-sizing: border-box;
+ border: 1px dashed #ccc;
+ justify-content: center;
+ align-items: center;
+ user-select: none;
+}
+.ql-container .ql-image-overlay .ql-image-size {
+ position: absolute;
+ padding: 4px 8px;
+ text-align: center;
+ background-color: #fff;
+ color: #888;
+ border: 1px solid #ccc;
+ box-sizing: border-box;
+ opacity: 0.8;
+ right: 4px;
+ top: 4px;
+ font-size: 12px;
+ display: inline-block;
+ width: auto;
+}
+.ql-container .ql-image-overlay .ql-image-toolbar {
+ position: relative;
+ text-align: center;
+ box-sizing: border-box;
+ background: #000;
+ border-radius: 5px;
+ color: #fff;
+ font-size: 0;
+ min-height: 24px;
+ z-index: 100;
+}
+.ql-container .ql-image-overlay .ql-image-toolbar span {
+ display: inline-block;
+ cursor: pointer;
+ padding: 5px;
+ font-size: 12px;
+ border-right: 1px solid #fff;
+}
+.ql-container .ql-image-overlay .ql-image-toolbar span:last-child {
+ border-right: 0;
+}
+.ql-container .ql-image-overlay .ql-image-toolbar span.triangle-up {
+ padding: 0;
+ position: absolute;
+ top: -12px;
+ left: 50%;
+ transform: translatex(-50%);
+ width: 0;
+ height: 0;
+ border-width: 6px;
+ border-style: solid;
+ border-color: transparent transparent black transparent;
+}
+.ql-container .ql-image-overlay .ql-image-handle {
+ position: absolute;
+ height: 12px;
+ width: 12px;
+ border-radius: 50%;
+ border: 1px solid #ccc;
+ box-sizing: border-box;
+ background: #fff;
+}
+.ql-container img {
+ display: inline-block;
+ max-width: 100%;
+}
+.ql-clipboard p {
+ margin: 0;
+ padding: 0;
+}
+.ql-editor {
+ box-sizing: border-box;
+ height: 100%;
+ outline: none;
+ overflow-y: auto;
+ tab-size: 4;
+ -moz-tab-size: 4;
+ text-align: left;
+ white-space: pre-wrap;
+ word-wrap: break-word;
+}
+.ql-editor > * {
+ cursor: text;
+}
+.ql-editor p,
+.ql-editor ol,
+.ql-editor ul,
+.ql-editor pre,
+.ql-editor blockquote,
+.ql-editor h1,
+.ql-editor h2,
+.ql-editor h3,
+.ql-editor h4,
+.ql-editor h5,
+.ql-editor h6 {
+ margin: 0;
+ padding: 0;
+ counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+}
+.ql-editor ol > li,
+.ql-editor ul > li {
+ list-style-type: none;
+}
+.ql-editor ul > li::before {
+ content: '\2022';
+}
+.ql-editor ul[data-checked=true],
+.ql-editor ul[data-checked=false] {
+ pointer-events: none;
+}
+.ql-editor ul[data-checked=true] > li *,
+.ql-editor ul[data-checked=false] > li * {
+ pointer-events: all;
+}
+.ql-editor ul[data-checked=true] > li::before,
+.ql-editor ul[data-checked=false] > li::before {
+ color: #777;
+ cursor: pointer;
+ pointer-events: all;
+}
+.ql-editor ul[data-checked=true] > li::before {
+ content: '\2611';
+}
+.ql-editor ul[data-checked=false] > li::before {
+ content: '\2610';
+}
+.ql-editor li::before {
+ display: inline-block;
+ white-space: nowrap;
+ width: 2em;
+}
+.ql-editor ol li {
+ counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+ counter-increment: list-0;
+}
+.ql-editor ol li:before {
+ content: counter(list-0, decimal) '. ';
+}
+.ql-editor ol li.ql-indent-1 {
+ counter-increment: list-1;
+}
+.ql-editor ol li.ql-indent-1:before {
+ content: counter(list-1, lower-alpha) '. ';
+}
+.ql-editor ol li.ql-indent-1 {
+ counter-reset: list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+}
+.ql-editor ol li.ql-indent-2 {
+ counter-increment: list-2;
+}
+.ql-editor ol li.ql-indent-2:before {
+ content: counter(list-2, lower-roman) '. ';
+}
+.ql-editor ol li.ql-indent-2 {
+ counter-reset: list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+}
+.ql-editor ol li.ql-indent-3 {
+ counter-increment: list-3;
+}
+.ql-editor ol li.ql-indent-3:before {
+ content: counter(list-3, decimal) '. ';
+}
+.ql-editor ol li.ql-indent-3 {
+ counter-reset: list-4 list-5 list-6 list-7 list-8 list-9;
+}
+.ql-editor ol li.ql-indent-4 {
+ counter-increment: list-4;
+}
+.ql-editor ol li.ql-indent-4:before {
+ content: counter(list-4, lower-alpha) '. ';
+}
+.ql-editor ol li.ql-indent-4 {
+ counter-reset: list-5 list-6 list-7 list-8 list-9;
+}
+.ql-editor ol li.ql-indent-5 {
+ counter-increment: list-5;
+}
+.ql-editor ol li.ql-indent-5:before {
+ content: counter(list-5, lower-roman) '. ';
+}
+.ql-editor ol li.ql-indent-5 {
+ counter-reset: list-6 list-7 list-8 list-9;
+}
+.ql-editor ol li.ql-indent-6 {
+ counter-increment: list-6;
+}
+.ql-editor ol li.ql-indent-6:before {
+ content: counter(list-6, decimal) '. ';
+}
+.ql-editor ol li.ql-indent-6 {
+ counter-reset: list-7 list-8 list-9;
+}
+.ql-editor ol li.ql-indent-7 {
+ counter-increment: list-7;
+}
+.ql-editor ol li.ql-indent-7:before {
+ content: counter(list-7, lower-alpha) '. ';
+}
+.ql-editor ol li.ql-indent-7 {
+ counter-reset: list-8 list-9;
+}
+.ql-editor ol li.ql-indent-8 {
+ counter-increment: list-8;
+}
+.ql-editor ol li.ql-indent-8:before {
+ content: counter(list-8, lower-roman) '. ';
+}
+.ql-editor ol li.ql-indent-8 {
+ counter-reset: list-9;
+}
+.ql-editor ol li.ql-indent-9 {
+ counter-increment: list-9;
+}
+.ql-editor ol li.ql-indent-9:before {
+ content: counter(list-9, decimal) '. ';
+}
+.ql-editor .ql-indent-1:not(.ql-direction-rtl) {
+ padding-left: 2em;
+}
+.ql-editor li.ql-indent-1:not(.ql-direction-rtl) {
+ padding-left: 2em;
+}
+.ql-editor .ql-indent-1.ql-direction-rtl.ql-align-right {
+ padding-right: 2em;
+}
+.ql-editor li.ql-indent-1.ql-direction-rtl.ql-align-right {
+ padding-right: 2em;
+}
+.ql-editor .ql-indent-2:not(.ql-direction-rtl) {
+ padding-left: 4em;
+}
+.ql-editor li.ql-indent-2:not(.ql-direction-rtl) {
+ padding-left: 4em;
+}
+.ql-editor .ql-indent-2.ql-direction-rtl.ql-align-right {
+ padding-right: 4em;
+}
+.ql-editor li.ql-indent-2.ql-direction-rtl.ql-align-right {
+ padding-right: 4em;
+}
+.ql-editor .ql-indent-3:not(.ql-direction-rtl) {
+ padding-left: 6em;
+}
+.ql-editor li.ql-indent-3:not(.ql-direction-rtl) {
+ padding-left: 6em;
+}
+.ql-editor .ql-indent-3.ql-direction-rtl.ql-align-right {
+ padding-right: 6em;
+}
+.ql-editor li.ql-indent-3.ql-direction-rtl.ql-align-right {
+ padding-right: 6em;
+}
+.ql-editor .ql-indent-4:not(.ql-direction-rtl) {
+ padding-left: 8em;
+}
+.ql-editor li.ql-indent-4:not(.ql-direction-rtl) {
+ padding-left: 8em;
+}
+.ql-editor .ql-indent-4.ql-direction-rtl.ql-align-right {
+ padding-right: 8em;
+}
+.ql-editor li.ql-indent-4.ql-direction-rtl.ql-align-right {
+ padding-right: 8em;
+}
+.ql-editor .ql-indent-5:not(.ql-direction-rtl) {
+ padding-left: 10em;
+}
+.ql-editor li.ql-indent-5:not(.ql-direction-rtl) {
+ padding-left: 10em;
+}
+.ql-editor .ql-indent-5.ql-direction-rtl.ql-align-right {
+ padding-right: 10em;
+}
+.ql-editor li.ql-indent-5.ql-direction-rtl.ql-align-right {
+ padding-right: 10em;
+}
+.ql-editor .ql-indent-6:not(.ql-direction-rtl) {
+ padding-left: 12em;
+}
+.ql-editor li.ql-indent-6:not(.ql-direction-rtl) {
+ padding-left: 12em;
+}
+.ql-editor .ql-indent-6.ql-direction-rtl.ql-align-right {
+ padding-right: 12em;
+}
+.ql-editor li.ql-indent-6.ql-direction-rtl.ql-align-right {
+ padding-right: 12em;
+}
+.ql-editor .ql-indent-7:not(.ql-direction-rtl) {
+ padding-left: 14em;
+}
+.ql-editor li.ql-indent-7:not(.ql-direction-rtl) {
+ padding-left: 14em;
+}
+.ql-editor .ql-indent-7.ql-direction-rtl.ql-align-right {
+ padding-right: 14em;
+}
+.ql-editor li.ql-indent-7.ql-direction-rtl.ql-align-right {
+ padding-right: 14em;
+}
+.ql-editor .ql-indent-8:not(.ql-direction-rtl) {
+ padding-left: 16em;
+}
+.ql-editor li.ql-indent-8:not(.ql-direction-rtl) {
+ padding-left: 16em;
+}
+.ql-editor .ql-indent-8.ql-direction-rtl.ql-align-right {
+ padding-right: 16em;
+}
+.ql-editor li.ql-indent-8.ql-direction-rtl.ql-align-right {
+ padding-right: 16em;
+}
+.ql-editor .ql-indent-9:not(.ql-direction-rtl) {
+ padding-left: 18em;
+}
+.ql-editor li.ql-indent-9:not(.ql-direction-rtl) {
+ padding-left: 18em;
+}
+.ql-editor .ql-indent-9.ql-direction-rtl.ql-align-right {
+ padding-right: 18em;
+}
+.ql-editor li.ql-indent-9.ql-direction-rtl.ql-align-right {
+ padding-right: 18em;
+}
+.ql-editor .ql-direction-rtl {
+ direction: rtl;
+ text-align: inherit;
+}
+.ql-editor .ql-align-center {
+ text-align: center;
+}
+.ql-editor .ql-align-justify {
+ text-align: justify;
+}
+.ql-editor .ql-align-right {
+ text-align: right;
+}
+.ql-editor.ql-blank::before {
+ color: rgba(0, 0, 0, 0.6);
+ content: attr(data-placeholder);
+ font-style: italic;
+ pointer-events: none;
+ position: absolute;
+}
+.ql-container.ql-disabled .ql-editor ul[data-checked] > li::before {
+ pointer-events: none;
+}
+.ql-clipboard {
+ left: -100000px;
+ height: 1px;
+ overflow-y: hidden;
+ position: absolute;
+ top: 50%;
+}
diff --git a/packages/uni-h5/style/form.css b/packages/uni-components/style/form.css
similarity index 100%
rename from packages/uni-h5/style/form.css
rename to packages/uni-components/style/form.css
diff --git a/packages/uni-h5/style/icon.css b/packages/uni-components/style/icon.css
similarity index 100%
rename from packages/uni-h5/style/icon.css
rename to packages/uni-components/style/icon.css
diff --git a/packages/uni-h5/style/image.css b/packages/uni-components/style/image.css
similarity index 100%
rename from packages/uni-h5/style/image.css
rename to packages/uni-components/style/image.css
diff --git a/packages/uni-h5/style/input.css b/packages/uni-components/style/input.css
similarity index 91%
rename from packages/uni-h5/style/input.css
rename to packages/uni-components/style/input.css
index 2208f03ef9c5257b2eee17dc8642cc149242858f..d47515d89aa424306b84dd5364414cab1c4dab93 100644
--- a/packages/uni-h5/style/input.css
+++ b/packages/uni-components/style/input.css
@@ -51,12 +51,12 @@ uni-input[hidden] {
}
.uni-input-input {
+ position: relative;
display: block;
height: 100%;
background: none;
color: inherit;
opacity: 1;
- -webkit-text-fill-color: currentcolor;
font: inherit;
line-height: inherit;
letter-spacing: inherit;
@@ -72,10 +72,15 @@ uni-input[hidden] {
.uni-input-input::-webkit-outer-spin-button,
.uni-input-input::-webkit-inner-spin-button {
- -webkit-appearance: none;
+ appearance: none;
margin: 0;
}
.uni-input-input[type='number'] {
-moz-appearance: textfield;
}
+
+.uni-input-input:disabled {
+ /* 用于重置iOS14以下禁用状态文字颜色 */
+ -webkit-text-fill-color: currentcolor;
+}
diff --git a/packages/uni-components/style/label.css b/packages/uni-components/style/label.css
new file mode 100644
index 0000000000000000000000000000000000000000..b6e63fe858b894209cfaed8f6d9c0113a9e83b63
--- /dev/null
+++ b/packages/uni-components/style/label.css
@@ -0,0 +1,3 @@
+.uni-label-pointer {
+ cursor: pointer;
+}
diff --git a/packages/uni-components/style/movable-area.css b/packages/uni-components/style/movable-area.css
new file mode 100644
index 0000000000000000000000000000000000000000..bd5411e0a9e319d2932da93cb403c28934016618
--- /dev/null
+++ b/packages/uni-components/style/movable-area.css
@@ -0,0 +1,10 @@
+uni-movable-area {
+ display: block;
+ position: relative;
+ width: 10px;
+ height: 10px;
+}
+
+uni-movable-area[hidden] {
+ display: none;
+}
diff --git a/packages/uni-components/style/movable-view.css b/packages/uni-components/style/movable-view.css
new file mode 100644
index 0000000000000000000000000000000000000000..fb77b939b13b7f60adbf33815fab2c227927c56a
--- /dev/null
+++ b/packages/uni-components/style/movable-view.css
@@ -0,0 +1,13 @@
+uni-movable-view {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ top: 0px;
+ left: 0px;
+ position: absolute;
+ cursor: grab;
+}
+
+uni-movable-view[hidden] {
+ display: none;
+}
diff --git a/packages/uni-h5/style/navigator.css b/packages/uni-components/style/navigator.css
similarity index 100%
rename from packages/uni-h5/style/navigator.css
rename to packages/uni-components/style/navigator.css
diff --git a/packages/uni-components/style/picker-view-column.css b/packages/uni-components/style/picker-view-column.css
new file mode 100644
index 0000000000000000000000000000000000000000..0a5ef835dfd61a2c8454bb35eb17b6433af08f82
--- /dev/null
+++ b/packages/uni-components/style/picker-view-column.css
@@ -0,0 +1,99 @@
+uni-picker-view-column {
+ flex: 1;
+ position: relative;
+ height: 100%;
+ overflow: hidden;
+}
+
+uni-picker-view-column[hidden] {
+ display: none;
+}
+
+.uni-picker-view-group {
+ height: 100%;
+ overflow: hidden;
+}
+
+.uni-picker-view-mask {
+ transform: translateZ(0);
+}
+
+.uni-picker-view-indicator,
+.uni-picker-view-mask {
+ position: absolute;
+ left: 0;
+ width: 100%;
+ z-index: 3;
+ pointer-events: none;
+}
+
+.uni-picker-view-mask {
+ top: 0;
+ height: 100%;
+ margin: 0 auto;
+ background: linear-gradient(
+ 180deg,
+ hsla(0, 0%, 100%, 0.95),
+ hsla(0, 0%, 100%, 0.6)
+ ),
+ linear-gradient(0deg, hsla(0, 0%, 100%, 0.95), hsla(0, 0%, 100%, 0.6));
+ background-position: top, bottom;
+ background-size: 100% 102px;
+ background-repeat: no-repeat;
+}
+
+.uni-picker-view-indicator {
+ height: 34px;
+ /* top: 102px; */
+ top: 50%;
+ transform: translateY(-50%);
+}
+
+.uni-picker-view-content {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ will-change: transform;
+ padding: 102px 0;
+ cursor: pointer;
+}
+
+.uni-picker-view-content > * {
+ height: 34px;
+ overflow: hidden;
+}
+
+.uni-picker-view-indicator:after,
+.uni-picker-view-indicator:before {
+ content: ' ';
+ position: absolute;
+ left: 0;
+ right: 0;
+ height: 1px;
+ color: #e5e5e5;
+}
+
+.uni-picker-view-indicator:before {
+ top: 0;
+ border-top: 1px solid #e5e5e5;
+ transform-origin: 0 0;
+ transform: scaleY(0.5);
+}
+
+.uni-picker-view-indicator:after {
+ bottom: 0;
+ border-bottom: 1px solid #e5e5e5;
+ transform-origin: 0 100%;
+ transform: scaleY(0.5);
+}
+
+.uni-picker-view-indicator:after,
+.uni-picker-view-indicator:before {
+ content: ' ';
+ position: absolute;
+ left: 0;
+ right: 0;
+ height: 1px;
+ color: #e5e5e5;
+}
diff --git a/packages/uni-components/style/picker-view.css b/packages/uni-components/style/picker-view.css
new file mode 100644
index 0000000000000000000000000000000000000000..a1ae18091e16514a5df589d7aa85d3fd4c985a0d
--- /dev/null
+++ b/packages/uni-components/style/picker-view.css
@@ -0,0 +1,14 @@
+uni-picker-view {
+ display: block;
+}
+
+.uni-picker-view-wrapper {
+ display: flex;
+ position: relative;
+ overflow: hidden;
+ height: 100%;
+}
+
+uni-picker-view[hidden] {
+ display: none;
+}
diff --git a/packages/uni-h5/style/progress.css b/packages/uni-components/style/progress.css
similarity index 80%
rename from packages/uni-h5/style/progress.css
rename to packages/uni-components/style/progress.css
index 80e8bc1e0f570d99208a37e7f43f9fd9933c2bb6..d08b5c4f91f44f01c22dadf91855245dafedbbcd 100644
--- a/packages/uni-h5/style/progress.css
+++ b/packages/uni-components/style/progress.css
@@ -1,7 +1,5 @@
uni-progress {
- display: -webkit-flex;
display: flex;
- -webkit-align-items: center;
align-items: center;
}
@@ -10,7 +8,6 @@ uni-progress[hidden] {
}
.uni-progress-bar {
- -webkit-flex: 1;
flex: 1;
}
diff --git a/packages/uni-components/style/radio-group.css b/packages/uni-components/style/radio-group.css
new file mode 100644
index 0000000000000000000000000000000000000000..680d7a68b17214c623ff90c2e57f8c2ae82b67c5
--- /dev/null
+++ b/packages/uni-components/style/radio-group.css
@@ -0,0 +1,6 @@
+uni-radio-group {
+ display: block;
+}
+uni-radio-group[hidden] {
+ display: none;
+}
diff --git a/packages/uni-components/style/radio.css b/packages/uni-components/style/radio.css
new file mode 100644
index 0000000000000000000000000000000000000000..323d5e7675bffff8cb5f9ff37de6d84a3e8f1775
--- /dev/null
+++ b/packages/uni-components/style/radio.css
@@ -0,0 +1,55 @@
+uni-radio {
+ -webkit-tap-highlight-color: transparent;
+ display: inline-block;
+ cursor: pointer;
+}
+
+uni-radio[hidden] {
+ display: none;
+}
+
+uni-radio[disabled] {
+ cursor: not-allowed;
+}
+
+.uni-radio-wrapper {
+ display: inline-flex;
+ align-items: center;
+ vertical-align: middle;
+}
+
+.uni-radio-input {
+ appearance: none;
+ margin-right: 5px;
+ outline: 0;
+ border: 1px solid #d1d1d1;
+ background-color: #ffffff;
+ border-radius: 50%;
+ width: 22px;
+ height: 22px;
+ position: relative;
+}
+
+uni-radio:not([disabled]) .uni-radio-input:hover {
+ border-color: #007aff;
+}
+
+.uni-radio-input.uni-radio-input-checked:before {
+ font: normal normal normal 14px/1 'uni';
+ content: '\EA08';
+ color: #ffffff;
+ font-size: 18px;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -48%) scale(0.73);
+}
+
+.uni-radio-input.uni-radio-input-disabled {
+ background-color: #e1e1e1;
+ border-color: #d1d1d1;
+}
+
+.uni-radio-input.uni-radio-input-disabled:before {
+ color: #adadad;
+}
\ No newline at end of file
diff --git a/packages/uni-components/style/resize-sensor.css b/packages/uni-components/style/resize-sensor.css
new file mode 100644
index 0000000000000000000000000000000000000000..9fcd2dce80c1e43b973f94d0580b24ab55d743b7
--- /dev/null
+++ b/packages/uni-components/style/resize-sensor.css
@@ -0,0 +1,33 @@
+@keyframes once-show {
+ from {
+ top: 0;
+ }
+}
+uni-resize-sensor,
+uni-resize-sensor > div {
+ position: absolute;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ overflow: hidden;
+}
+uni-resize-sensor {
+ display: block;
+ z-index: -1;
+ visibility: hidden;
+ animation: once-show 1ms;
+}
+uni-resize-sensor > div > div {
+ position: absolute;
+ left: 0;
+ top: 0;
+}
+uni-resize-sensor > div:first-child > div {
+ width: 100000px;
+ height: 100000px;
+}
+uni-resize-sensor > div:last-child > div {
+ width: 200%;
+ height: 200%;
+}
diff --git a/packages/uni-components/style/rich-text.css b/packages/uni-components/style/rich-text.css
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/packages/uni-h5/style/scroll-view.css b/packages/uni-components/style/scroll-view.css
similarity index 100%
rename from packages/uni-h5/style/scroll-view.css
rename to packages/uni-components/style/scroll-view.css
diff --git a/packages/uni-h5/style/slider.css b/packages/uni-components/style/slider.css
similarity index 94%
rename from packages/uni-h5/style/slider.css
rename to packages/uni-components/style/slider.css
index a4c7cb7ca66dc17ea39edb301e747b61f16a482e..4620f48ce3d87c6e61545acf6fe2d9b08d0413d1 100644
--- a/packages/uni-h5/style/slider.css
+++ b/packages/uni-components/style/slider.css
@@ -9,15 +9,12 @@ uni-slider[hidden] {
}
.uni-slider-wrapper {
- display: -webkit-flex;
display: flex;
- -webkit-align-items: center;
align-items: center;
min-height: 16px;
}
.uni-slider-tap-area {
- -webkit-flex: 1;
flex: 1;
padding: 8px 0;
}
@@ -73,6 +70,7 @@ uni-slider[hidden] {
}
.uni-slider-value {
+ width: 3ch;
color: #888;
font-size: 14px;
margin-left: 1em;
diff --git a/packages/uni-components/style/swiper-item.css b/packages/uni-components/style/swiper-item.css
new file mode 100644
index 0000000000000000000000000000000000000000..0bc315eed2c9b7f8cc02a1caf5d1eb683f58b599
--- /dev/null
+++ b/packages/uni-components/style/swiper-item.css
@@ -0,0 +1,13 @@
+uni-swiper-item {
+ display: block;
+ overflow: hidden;
+ will-change: transform;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ cursor: grab;
+}
+
+uni-swiper-item[hidden] {
+ display: none;
+}
diff --git a/packages/uni-components/style/swiper.css b/packages/uni-components/style/swiper.css
new file mode 100644
index 0000000000000000000000000000000000000000..ce98a1a0003c6ef51f882effb52de9429503bc41
--- /dev/null
+++ b/packages/uni-components/style/swiper.css
@@ -0,0 +1,85 @@
+uni-swiper {
+ display: block;
+ height: 150px;
+}
+
+uni-swiper[hidden] {
+ display: none;
+}
+
+.uni-swiper-wrapper {
+ overflow: hidden;
+ position: relative;
+ width: 100%;
+ height: 100%;
+ transform: translateZ(0);
+}
+
+.uni-swiper-slides {
+ position: absolute;
+ left: 0;
+ top: 0;
+ right: 0;
+ bottom: 0;
+}
+
+.uni-swiper-slide-frame {
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ will-change: transform;
+}
+
+.uni-swiper-dots {
+ position: absolute;
+ font-size: 0;
+}
+
+.uni-swiper-dots-horizontal {
+ left: 50%;
+ bottom: 10px;
+ text-align: center;
+ white-space: nowrap;
+ transform: translate(-50%, 0);
+}
+
+.uni-swiper-dots-horizontal .uni-swiper-dot {
+ margin-right: 8px;
+}
+
+.uni-swiper-dots-horizontal .uni-swiper-dot:last-child {
+ margin-right: 0;
+}
+
+.uni-swiper-dots-vertical {
+ right: 10px;
+ top: 50%;
+ text-align: right;
+ transform: translate(0, -50%);
+}
+
+.uni-swiper-dots-vertical .uni-swiper-dot {
+ display: block;
+ margin-bottom: 9px;
+}
+
+.uni-swiper-dots-vertical .uni-swiper-dot:last-child {
+ margin-bottom: 0;
+}
+
+.uni-swiper-dot {
+ display: inline-block;
+ width: 8px;
+ height: 8px;
+ cursor: pointer;
+ transition-property: background-color;
+ transition-timing-function: ease;
+ background: rgba(0, 0, 0, 0.3);
+ border-radius: 50%;
+}
+
+.uni-swiper-dot-active {
+ background-color: #000000;
+}
diff --git a/packages/uni-components/style/switch.css b/packages/uni-components/style/switch.css
new file mode 100644
index 0000000000000000000000000000000000000000..9bf4c435379562931badaf33703bdb537b6cd53f
--- /dev/null
+++ b/packages/uni-components/style/switch.css
@@ -0,0 +1,111 @@
+uni-switch {
+ -webkit-tap-highlight-color: transparent;
+ display: inline-block;
+ cursor: pointer;
+}
+
+uni-switch[hidden] {
+ display: none;
+}
+
+uni-switch[disabled] {
+ cursor: not-allowed;
+}
+
+.uni-switch-wrapper {
+ display: inline-flex;
+ align-items: center;
+ vertical-align: middle;
+}
+
+.uni-switch-input {
+ appearance: none;
+ position: relative;
+ width: 52px;
+ height: 32px;
+ margin-right: 5px;
+ border: 1px solid #dfdfdf;
+ outline: 0;
+ border-radius: 16px;
+ box-sizing: border-box;
+ background-color: #dfdfdf;
+ transition: background-color 0.1s, border 0.1s;
+}
+
+uni-switch[disabled] .uni-switch-input {
+ opacity: 0.7;
+}
+
+.uni-switch-input:before {
+ content: ' ';
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 50px;
+ height: 30px;
+ border-radius: 15px;
+ background-color: #fdfdfd;
+ transition: transform 0.3s;
+}
+
+.uni-switch-input:after {
+ content: ' ';
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 30px;
+ height: 30px;
+ border-radius: 15px;
+ background-color: #ffffff;
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);
+ transition: transform 0.3s;
+}
+
+.uni-switch-input.uni-switch-input-checked {
+ border-color: #007aff;
+ background-color: #007aff;
+}
+
+.uni-switch-input.uni-switch-input-checked:before {
+ transform: scale(0);
+}
+
+.uni-switch-input.uni-switch-input-checked:after {
+ transform: translateX(20px);
+}
+
+uni-switch .uni-checkbox-input {
+ margin-right: 5px;
+ appearance: none;
+ outline: 0;
+ border: 1px solid #d1d1d1;
+ background-color: #ffffff;
+ border-radius: 3px;
+ width: 22px;
+ height: 22px;
+ position: relative;
+ color: #007aff;
+}
+
+uni-switch:not([disabled]) .uni-checkbox-input:hover {
+ border-color: #007aff;
+}
+
+uni-switch .uni-checkbox-input.uni-checkbox-input-checked:before {
+ font: normal normal normal 14px/1 'uni';
+ content: '\EA08';
+ color: inherit;
+ font-size: 22px;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -48%) scale(0.73);
+}
+
+uni-switch .uni-checkbox-input.uni-checkbox-input-disabled {
+ background-color: #e1e1e1;
+}
+
+uni-switch .uni-checkbox-input.uni-checkbox-input-disabled:before {
+ color: #adadad;
+}
diff --git a/packages/uni-h5/style/text.css b/packages/uni-components/style/text.css
similarity index 100%
rename from packages/uni-h5/style/text.css
rename to packages/uni-components/style/text.css
diff --git a/packages/uni-components/style/textarea.css b/packages/uni-components/style/textarea.css
new file mode 100644
index 0000000000000000000000000000000000000000..a0bd829990aecf362f671036561a7463431ebede
--- /dev/null
+++ b/packages/uni-components/style/textarea.css
@@ -0,0 +1,78 @@
+uni-textarea {
+ width: 300px;
+ height: 150px;
+ display: block;
+ position: relative;
+ font-size: 16px;
+ line-height: normal;
+ white-space: pre-wrap;
+ word-break: break-all;
+ box-sizing: content-box !important;
+}
+uni-textarea[hidden] {
+ display: none;
+}
+.uni-textarea-wrapper,
+.uni-textarea-placeholder,
+.uni-textarea-line,
+.uni-textarea-compute,
+.uni-textarea-textarea {
+ outline: none;
+ border: none;
+ padding: 0;
+ margin: 0;
+ text-decoration: inherit;
+}
+.uni-textarea-wrapper {
+ display: block;
+ position: relative;
+ width: 100%;
+ height: 100%;
+}
+.uni-textarea-placeholder,
+.uni-textarea-line,
+.uni-textarea-compute,
+.uni-textarea-textarea {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ left: 0;
+ top: 0;
+ white-space: inherit;
+ word-break: inherit;
+}
+.uni-textarea-placeholder {
+ color: grey;
+ overflow: hidden;
+}
+.uni-textarea-line,
+.uni-textarea-compute {
+ visibility: hidden;
+ height: auto;
+}
+.uni-textarea-line {
+ width: 1em;
+}
+.uni-textarea-textarea {
+ resize: none;
+ background: none;
+ color: inherit;
+ opacity: 1;
+ font: inherit;
+ line-height: inherit;
+ letter-spacing: inherit;
+ text-align: inherit;
+ text-indent: inherit;
+ text-transform: inherit;
+ text-shadow: inherit;
+}
+/* 用于解决 iOS textarea 内部默认边距 */
+.uni-textarea-textarea-fix-margin {
+ width: auto;
+ right: 0;
+ margin: 0 -3px;
+}
+.uni-textarea-textarea:disabled {
+ /* 用于重置iOS14以下禁用状态文字颜色 */
+ -webkit-text-fill-color: currentcolor;
+}
diff --git a/packages/uni-h5/style/view.css b/packages/uni-components/style/view.css
similarity index 100%
rename from packages/uni-h5/style/view.css
rename to packages/uni-components/style/view.css
diff --git a/packages/uni-h5/dist/assets/index-868b4e9a.css b/packages/uni-h5/dist/assets/index-868b4e9a.css
new file mode 100644
index 0000000000000000000000000000000000000000..f597f0fb9a9975636ec4e6b7e21e88b60c1e0b8e
--- /dev/null
+++ b/packages/uni-h5/dist/assets/index-868b4e9a.css
@@ -0,0 +1,22 @@
+
+.uni-async-error {
+ position: absolute;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ color: #999;
+ padding: 100px 10px;
+ text-align: center;
+}
+
+.uni-async-loading {
+ box-sizing: border-box;
+ width: 100%;
+ padding: 50px;
+ text-align: center;
+}
+.uni-async-loading .uni-loading {
+ width: 30px;
+ height: 30px;
+}
diff --git a/packages/uni-h5/dist/uni-h5.esm.js b/packages/uni-h5/dist/uni-h5.esm.js
index 2a4ec9041249d0a48e4ffef8b039494a18cd41e7..61e24cdc5176f151ebb77beb4126aba3baa887a6 100644
--- a/packages/uni-h5/dist/uni-h5.esm.js
+++ b/packages/uni-h5/dist/uni-h5.esm.js
@@ -2332,7 +2332,6 @@ function wrapper(canvas) {
canvas.height = canvas.offsetHeight * pixelRatio;
canvas.getContext("2d").__hidpi__ = true;
}
-var index_vue_vue_type_style_index_0_lang$b = "\nuni-canvas {\r\n width: 300px;\r\n height: 150px;\r\n display: block;\r\n position: relative;\n}\nuni-canvas > canvas {\r\n position: absolute;\r\n top: 0;\r\n left: 0;\r\n width: 100%;\r\n height: 100%;\n}\r\n";
function resolveColor(color) {
color = color.slice(0);
color[3] = color[3] / 255;
@@ -2967,7 +2966,6 @@ function _sfc_render$k(_ctx, _cache, $props, $setup, $data, $options) {
], 16, ["disabled"]);
}
_sfc_main$l.render = _sfc_render$k;
-var index_vue_vue_type_style_index_0_lang$a = "\nuni-checkbox-group[hidden] {\r\n display: none;\n}\r\n";
const _sfc_main$k = {
name: "CheckboxGroup",
mixins: [emitter, listeners],
@@ -3422,8 +3420,6 @@ function register(Quill) {
Object.values(formats).forEach((value) => Object.assign(options, value(Quill)));
Quill.register(options, true);
}
-var editor_css_vue_type_style_index_0_src_lang = ".ql-container {\n display: block;\n position: relative;\n box-sizing: border-box;\n -webkit-user-select: text;\n user-select: text;\n outline: none;\n overflow: hidden;\n width: 100%;\n height: 200px;\n min-height: 200px;\n}\n.ql-container[hidden] {\n display: none;\n}\n.ql-container .ql-editor {\n position: relative;\n font-size: inherit;\n line-height: inherit;\n font-family: inherit;\n min-height: inherit;\n width: 100%;\n height: 100%;\n padding: 0;\n overflow-x: hidden;\n overflow-y: auto;\n -webkit-tap-highlight-color: transparent;\n -webkit-touch-callout: none;\n -webkit-overflow-scrolling: touch;\n}\n.ql-container .ql-editor::-webkit-scrollbar {\n width: 0 !important;\n}\n.ql-container .ql-editor.scroll-disabled {\n overflow: hidden;\n}\n.ql-container .ql-image-overlay {\n display: flex;\n position: absolute;\n box-sizing: border-box;\n border: 1px dashed #ccc;\n justify-content: center;\n align-items: center;\n -webkit-user-select: none;\n user-select: none;\n}\n.ql-container .ql-image-overlay .ql-image-size {\n position: absolute;\n padding: 4px 8px;\n text-align: center;\n background-color: #fff;\n color: #888;\n border: 1px solid #ccc;\n box-sizing: border-box;\n opacity: 0.8;\n right: 4px;\n top: 4px;\n font-size: 12px;\n display: inline-block;\n width: auto;\n}\n.ql-container .ql-image-overlay .ql-image-toolbar {\n position: relative;\n text-align: center;\n box-sizing: border-box;\n background: #000;\n border-radius: 5px;\n color: #fff;\n font-size: 0;\n min-height: 24px;\n z-index: 100;\n}\n.ql-container .ql-image-overlay .ql-image-toolbar span {\n display: inline-block;\n cursor: pointer;\n padding: 5px;\n font-size: 12px;\n border-right: 1px solid #fff;\n}\n.ql-container .ql-image-overlay .ql-image-toolbar span:last-child {\n border-right: 0;\n}\n.ql-container .ql-image-overlay .ql-image-toolbar span.triangle-up {\n padding: 0;\n position: absolute;\n top: -12px;\n left: 50%;\n transform: translatex(-50%);\n width: 0;\n height: 0;\n border-width: 6px;\n border-style: solid;\n border-color: transparent transparent black transparent;\n}\n.ql-container .ql-image-overlay .ql-image-handle {\n position: absolute;\n height: 12px;\n width: 12px;\n border-radius: 50%;\n border: 1px solid #ccc;\n box-sizing: border-box;\n background: #fff;\n}\n.ql-container img {\n display: inline-block;\n max-width: 100%;\n}\n.ql-clipboard p {\n margin: 0;\n padding: 0;\n}\n.ql-editor {\n box-sizing: border-box;\n height: 100%;\n outline: none;\n overflow-y: auto;\n tab-size: 4;\n -moz-tab-size: 4;\n text-align: left;\n white-space: pre-wrap;\n word-wrap: break-word;\n}\n.ql-editor > * {\n cursor: text;\n}\n.ql-editor p,\n.ql-editor ol,\n.ql-editor ul,\n.ql-editor pre,\n.ql-editor blockquote,\n.ql-editor h1,\n.ql-editor h2,\n.ql-editor h3,\n.ql-editor h4,\n.ql-editor h5,\n.ql-editor h6 {\n margin: 0;\n padding: 0;\n counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;\n}\n.ql-editor ol > li,\n.ql-editor ul > li {\n list-style-type: none;\n}\n.ql-editor ul > li::before {\n content: '\\2022';\n}\n.ql-editor ul[data-checked=true],\n.ql-editor ul[data-checked=false] {\n pointer-events: none;\n}\n.ql-editor ul[data-checked=true] > li *,\n.ql-editor ul[data-checked=false] > li * {\n pointer-events: all;\n}\n.ql-editor ul[data-checked=true] > li::before,\n.ql-editor ul[data-checked=false] > li::before {\n color: #777;\n cursor: pointer;\n pointer-events: all;\n}\n.ql-editor ul[data-checked=true] > li::before {\n content: '\\2611';\n}\n.ql-editor ul[data-checked=false] > li::before {\n content: '\\2610';\n}\n.ql-editor li::before {\n display: inline-block;\n white-space: nowrap;\n width: 2em;\n}\n.ql-editor ol li {\n counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;\n counter-increment: list-0;\n}\n.ql-editor ol li:before {\n content: counter(list-0, decimal) '. ';\n}\n.ql-editor ol li.ql-indent-1 {\n counter-increment: list-1;\n}\n.ql-editor ol li.ql-indent-1:before {\n content: counter(list-1, lower-alpha) '. ';\n}\n.ql-editor ol li.ql-indent-1 {\n counter-reset: list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;\n}\n.ql-editor ol li.ql-indent-2 {\n counter-increment: list-2;\n}\n.ql-editor ol li.ql-indent-2:before {\n content: counter(list-2, lower-roman) '. ';\n}\n.ql-editor ol li.ql-indent-2 {\n counter-reset: list-3 list-4 list-5 list-6 list-7 list-8 list-9;\n}\n.ql-editor ol li.ql-indent-3 {\n counter-increment: list-3;\n}\n.ql-editor ol li.ql-indent-3:before {\n content: counter(list-3, decimal) '. ';\n}\n.ql-editor ol li.ql-indent-3 {\n counter-reset: list-4 list-5 list-6 list-7 list-8 list-9;\n}\n.ql-editor ol li.ql-indent-4 {\n counter-increment: list-4;\n}\n.ql-editor ol li.ql-indent-4:before {\n content: counter(list-4, lower-alpha) '. ';\n}\n.ql-editor ol li.ql-indent-4 {\n counter-reset: list-5 list-6 list-7 list-8 list-9;\n}\n.ql-editor ol li.ql-indent-5 {\n counter-increment: list-5;\n}\n.ql-editor ol li.ql-indent-5:before {\n content: counter(list-5, lower-roman) '. ';\n}\n.ql-editor ol li.ql-indent-5 {\n counter-reset: list-6 list-7 list-8 list-9;\n}\n.ql-editor ol li.ql-indent-6 {\n counter-increment: list-6;\n}\n.ql-editor ol li.ql-indent-6:before {\n content: counter(list-6, decimal) '. ';\n}\n.ql-editor ol li.ql-indent-6 {\n counter-reset: list-7 list-8 list-9;\n}\n.ql-editor ol li.ql-indent-7 {\n counter-increment: list-7;\n}\n.ql-editor ol li.ql-indent-7:before {\n content: counter(list-7, lower-alpha) '. ';\n}\n.ql-editor ol li.ql-indent-7 {\n counter-reset: list-8 list-9;\n}\n.ql-editor ol li.ql-indent-8 {\n counter-increment: list-8;\n}\n.ql-editor ol li.ql-indent-8:before {\n content: counter(list-8, lower-roman) '. ';\n}\n.ql-editor ol li.ql-indent-8 {\n counter-reset: list-9;\n}\n.ql-editor ol li.ql-indent-9 {\n counter-increment: list-9;\n}\n.ql-editor ol li.ql-indent-9:before {\n content: counter(list-9, decimal) '. ';\n}\n.ql-editor .ql-indent-1:not(.ql-direction-rtl) {\n padding-left: 2em;\n}\n.ql-editor li.ql-indent-1:not(.ql-direction-rtl) {\n padding-left: 2em;\n}\n.ql-editor .ql-indent-1.ql-direction-rtl.ql-align-right {\n padding-right: 2em;\n}\n.ql-editor li.ql-indent-1.ql-direction-rtl.ql-align-right {\n padding-right: 2em;\n}\n.ql-editor .ql-indent-2:not(.ql-direction-rtl) {\n padding-left: 4em;\n}\n.ql-editor li.ql-indent-2:not(.ql-direction-rtl) {\n padding-left: 4em;\n}\n.ql-editor .ql-indent-2.ql-direction-rtl.ql-align-right {\n padding-right: 4em;\n}\n.ql-editor li.ql-indent-2.ql-direction-rtl.ql-align-right {\n padding-right: 4em;\n}\n.ql-editor .ql-indent-3:not(.ql-direction-rtl) {\n padding-left: 6em;\n}\n.ql-editor li.ql-indent-3:not(.ql-direction-rtl) {\n padding-left: 6em;\n}\n.ql-editor .ql-indent-3.ql-direction-rtl.ql-align-right {\n padding-right: 6em;\n}\n.ql-editor li.ql-indent-3.ql-direction-rtl.ql-align-right {\n padding-right: 6em;\n}\n.ql-editor .ql-indent-4:not(.ql-direction-rtl) {\n padding-left: 8em;\n}\n.ql-editor li.ql-indent-4:not(.ql-direction-rtl) {\n padding-left: 8em;\n}\n.ql-editor .ql-indent-4.ql-direction-rtl.ql-align-right {\n padding-right: 8em;\n}\n.ql-editor li.ql-indent-4.ql-direction-rtl.ql-align-right {\n padding-right: 8em;\n}\n.ql-editor .ql-indent-5:not(.ql-direction-rtl) {\n padding-left: 10em;\n}\n.ql-editor li.ql-indent-5:not(.ql-direction-rtl) {\n padding-left: 10em;\n}\n.ql-editor .ql-indent-5.ql-direction-rtl.ql-align-right {\n padding-right: 10em;\n}\n.ql-editor li.ql-indent-5.ql-direction-rtl.ql-align-right {\n padding-right: 10em;\n}\n.ql-editor .ql-indent-6:not(.ql-direction-rtl) {\n padding-left: 12em;\n}\n.ql-editor li.ql-indent-6:not(.ql-direction-rtl) {\n padding-left: 12em;\n}\n.ql-editor .ql-indent-6.ql-direction-rtl.ql-align-right {\n padding-right: 12em;\n}\n.ql-editor li.ql-indent-6.ql-direction-rtl.ql-align-right {\n padding-right: 12em;\n}\n.ql-editor .ql-indent-7:not(.ql-direction-rtl) {\n padding-left: 14em;\n}\n.ql-editor li.ql-indent-7:not(.ql-direction-rtl) {\n padding-left: 14em;\n}\n.ql-editor .ql-indent-7.ql-direction-rtl.ql-align-right {\n padding-right: 14em;\n}\n.ql-editor li.ql-indent-7.ql-direction-rtl.ql-align-right {\n padding-right: 14em;\n}\n.ql-editor .ql-indent-8:not(.ql-direction-rtl) {\n padding-left: 16em;\n}\n.ql-editor li.ql-indent-8:not(.ql-direction-rtl) {\n padding-left: 16em;\n}\n.ql-editor .ql-indent-8.ql-direction-rtl.ql-align-right {\n padding-right: 16em;\n}\n.ql-editor li.ql-indent-8.ql-direction-rtl.ql-align-right {\n padding-right: 16em;\n}\n.ql-editor .ql-indent-9:not(.ql-direction-rtl) {\n padding-left: 18em;\n}\n.ql-editor li.ql-indent-9:not(.ql-direction-rtl) {\n padding-left: 18em;\n}\n.ql-editor .ql-indent-9.ql-direction-rtl.ql-align-right {\n padding-right: 18em;\n}\n.ql-editor li.ql-indent-9.ql-direction-rtl.ql-align-right {\n padding-right: 18em;\n}\n.ql-editor .ql-direction-rtl {\n direction: rtl;\n text-align: inherit;\n}\n.ql-editor .ql-align-center {\n text-align: center;\n}\n.ql-editor .ql-align-justify {\n text-align: justify;\n}\n.ql-editor .ql-align-right {\n text-align: right;\n}\n.ql-editor.ql-blank::before {\n color: rgba(0, 0, 0, 0.6);\n content: attr(data-placeholder);\n font-style: italic;\n pointer-events: none;\n position: absolute;\n}\n.ql-container.ql-disabled .ql-editor ul[data-checked] > li::before {\n pointer-events: none;\n}\n.ql-clipboard {\n left: -100000px;\n height: 1px;\n overflow-y: hidden;\n position: absolute;\n top: 50%;\n}\n";
-var index_vue_vue_type_style_index_1_lang = "\n";
const _sfc_main$j = {
name: "Editor",
mixins: [subscriber, emitter, keyboard],
@@ -3817,7 +3813,6 @@ var index$4 = defineComponent({
return () => createVNode("uni-icon", null, [path.value.d && createSvgIconVNode(path.value.d, props.color || path.value.c, rpx2px(props.size))]);
}
});
-var index_vue_vue_type_style_index_0_lang$9 = "\n@keyframes once-show {\nfrom {\n top: 0;\n}\n}\nuni-resize-sensor,\nuni-resize-sensor > div {\n position: absolute;\n left: 0;\n top: 0;\n right: 0;\n bottom: 0;\n overflow: hidden;\n}\nuni-resize-sensor {\n display: block;\n z-index: -1;\n visibility: hidden;\n animation: once-show 1ms;\n}\nuni-resize-sensor > div > div {\n position: absolute;\n left: 0;\n top: 0;\n}\nuni-resize-sensor > div:first-child > div {\n width: 100000px;\n height: 100000px;\n}\nuni-resize-sensor > div:last-child > div {\n width: 200%;\n height: 200%;\n}\n";
const _sfc_main$i = {
name: "ResizeSensor",
props: {
@@ -6008,7 +6003,6 @@ function _sfc_render$g(_ctx, _cache, $props, $setup, $data, $options) {
], 16);
}
_sfc_main$g.render = _sfc_render$g;
-var index_vue_vue_type_style_index_0_lang$8 = "\n.uni-label-pointer {\r\n cursor: pointer;\n}\r\n";
const _sfc_main$f = {
name: "Label",
mixins: [emitter],
@@ -6455,7 +6449,6 @@ STD.prototype.reconfigure = function(e2, t2, n) {
this._springY.reconfigure(e2, t2, n);
this._springScale.reconfigure(e2, t2, n);
};
-var index_vue_vue_type_style_index_0_lang$7 = "\nuni-movable-view {\n display: inline-block;\n width: 10px;\n height: 10px;\n top: 0px;\n left: 0px;\n position: absolute;\n cursor: grab;\n}\nuni-movable-view[hidden] {\n display: none;\n}\n";
var requesting = false;
function _requestAnimationFrame(e2) {
if (!requesting) {
@@ -7295,7 +7288,6 @@ function _sfc_render$c(_ctx, _cache, $props, $setup, $data, $options) {
], 16);
}
_sfc_main$c.render = _sfc_render$c;
-var index_vue_vue_type_style_index_0_lang$6 = '\nuni-radio {\r\n -webkit-tap-highlight-color: transparent;\r\n display: inline-block;\r\n cursor: pointer;\n}\nuni-radio[hidden] {\r\n display: none;\n}\nuni-radio[disabled] {\r\n cursor: not-allowed;\n}\nuni-radio .uni-radio-wrapper {\r\n display: -webkit-inline-flex;\r\n display: inline-flex;\r\n -webkit-align-items: center;\r\n align-items: center;\r\n vertical-align: middle;\n}\nuni-radio .uni-radio-input {\r\n -webkit-appearance: none;\r\n appearance: none;\r\n margin-right: 5px;\r\n outline: 0;\r\n border: 1px solid #D1D1D1;\r\n background-color: #ffffff;\r\n border-radius: 50%;\r\n width: 22px;\r\n height: 22px;\r\n position: relative;\n}\nuni-radio:not([disabled]) .uni-radio-input:hover {\r\n border-color: #007aff;\n}\nuni-radio .uni-radio-input.uni-radio-input-checked:before {\r\n font: normal normal normal 14px/1 "uni";\r\n content: "\\EA08";\r\n color: #ffffff;\r\n font-size: 18px;\r\n position: absolute;\r\n top: 50%;\r\n left: 50%;\r\n transform: translate(-50%, -48%) scale(0.73);\r\n -webkit-transform: translate(-50%, -48%) scale(0.73);\n}\nuni-radio .uni-radio-input.uni-radio-input-disabled {\r\n background-color: #E1E1E1;\r\n border-color: #D1D1D1;\n}\nuni-radio .uni-radio-input.uni-radio-input-disabled:before {\r\n color: #ADADAD;\n}\nuni-radio-group {\r\n display: block;\n}\r\n';
const _sfc_main$b = {
name: "Radio",
mixins: [emitter, listeners],
@@ -7392,7 +7384,6 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
], 16, ["disabled"]);
}
_sfc_main$b.render = _sfc_render$b;
-var index_vue_vue_type_style_index_0_lang$5 = "\nuni-radio-group[hidden] {\r\n display: none;\n}\r\n";
const _sfc_main$a = {
name: "RadioGroup",
mixins: [emitter, listeners],
@@ -9086,7 +9077,6 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
], 16);
}
_sfc_main$7.render = _sfc_render$7;
-var index_vue_vue_type_style_index_0_lang$4 = "\nuni-swiper-item {\n display: block;\n overflow: hidden;\n will-change: transform;\n position: absolute;\n width: 100%;\n height: 100%;\n cursor: grab;\n}\nuni-swiper-item[hidden] {\n display: none;\n}\n";
const _sfc_main$6 = {
name: "SwiperItem",
props: {
@@ -9114,7 +9104,6 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
], 16);
}
_sfc_main$6.render = _sfc_render$6;
-var index_vue_vue_type_style_index_0_lang$3 = '\nuni-switch {\r\n -webkit-tap-highlight-color: transparent;\r\n display: inline-block;\r\n cursor: pointer;\n}\nuni-switch[hidden] {\r\n display: none;\n}\nuni-switch[disabled] {\r\n cursor: not-allowed;\n}\nuni-switch .uni-switch-wrapper {\r\n display: -webkit-inline-flex;\r\n display: inline-flex;\r\n -webkit-align-items: center;\r\n align-items: center;\r\n vertical-align: middle;\n}\nuni-switch .uni-switch-input {\r\n -webkit-appearance: none;\r\n appearance: none;\r\n position: relative;\r\n width: 52px;\r\n height: 32px;\r\n margin-right: 5px;\r\n border: 1px solid #DFDFDF;\r\n outline: 0;\r\n border-radius: 16px;\r\n box-sizing: border-box;\r\n background-color: #DFDFDF;\r\n transition: background-color 0.1s, border 0.1s;\n}\nuni-switch[disabled] .uni-switch-input {\r\n opacity: .7;\n}\nuni-switch .uni-switch-input:before {\r\n content: " ";\r\n position: absolute;\r\n top: 0;\r\n left: 0;\r\n width: 50px;\r\n height: 30px;\r\n border-radius: 15px;\r\n background-color: #FDFDFD;\r\n transition: -webkit-transform 0.3s;\r\n transition: transform 0.3s;\r\n transition: transform 0.3s, -webkit-transform 0.3s;\n}\nuni-switch .uni-switch-input:after {\r\n content: " ";\r\n position: absolute;\r\n top: 0;\r\n left: 0;\r\n width: 30px;\r\n height: 30px;\r\n border-radius: 15px;\r\n background-color: #FFFFFF;\r\n box-shadow: 0 1px 3px rgba(0, 0, 0, 0.4);\r\n transition: -webkit-transform 0.3s;\r\n transition: transform 0.3s;\r\n transition: transform 0.3s, -webkit-transform 0.3s;\n}\nuni-switch .uni-switch-input.uni-switch-input-checked {\r\n border-color: #007aff;\r\n background-color: #007aff;\n}\nuni-switch .uni-switch-input.uni-switch-input-checked:before {\r\n -webkit-transform: scale(0);\r\n transform: scale(0);\n}\nuni-switch .uni-switch-input.uni-switch-input-checked:after {\r\n -webkit-transform: translateX(20px);\r\n transform: translateX(20px);\n}\nuni-switch .uni-checkbox-input {\r\n margin-right: 5px;\r\n -webkit-appearance: none;\r\n appearance: none;\r\n outline: 0;\r\n border: 1px solid #D1D1D1;\r\n background-color: #FFFFFF;\r\n border-radius: 3px;\r\n width: 22px;\r\n height: 22px;\r\n position: relative;\r\n color: #007aff;\n}\nuni-switch:not([disabled]) .uni-checkbox-input:hover {\r\n border-color: #007aff;\n}\nuni-switch .uni-checkbox-input.uni-checkbox-input-checked:before {\r\n font: normal normal normal 14px/1 "uni";\r\n content: "\\EA08";\r\n color: inherit;\r\n font-size: 22px;\r\n position: absolute;\r\n top: 50%;\r\n left: 50%;\r\n transform: translate(-50%, -48%) scale(0.73);\r\n -webkit-transform: translate(-50%, -48%) scale(0.73);\n}\nuni-switch .uni-checkbox-input.uni-checkbox-input-disabled {\r\n background-color: #E1E1E1;\n}\nuni-switch .uni-checkbox-input.uni-checkbox-input-disabled:before {\r\n color: #ADADAD;\n}\r\n';
const _sfc_main$5 = {
name: "Switch",
mixins: [emitter, listeners],
@@ -9281,7 +9270,6 @@ var index$3 = defineComponent({
};
}
});
-var index_vue_vue_type_style_index_0_lang$2 = "\nuni-textarea {\n width: 300px;\n height: 150px;\n display: block;\n position: relative;\n font-size: 16px;\n line-height: normal;\n white-space: pre-wrap;\n word-break: break-all;\n}\nuni-textarea[hidden] {\n display: none;\n}\n.uni-textarea-wrapper,\n.uni-textarea-placeholder,\n.uni-textarea-line,\n.uni-textarea-compute,\n.uni-textarea-textarea {\n outline: none;\n border: none;\n padding: 0;\n margin: 0;\n text-decoration: inherit;\n}\n.uni-textarea-wrapper {\n display: block;\n position: relative;\n width: 100%;\n height: 100%;\n}\n.uni-textarea-placeholder,\n.uni-textarea-line,\n.uni-textarea-compute,\n.uni-textarea-textarea {\n position: absolute;\n width: 100%;\n height: 100%;\n left: 0;\n top: 0;\n white-space: inherit;\n word-break: inherit;\n}\n.uni-textarea-placeholder {\n color: grey;\n overflow: hidden;\n}\n.uni-textarea-line,\n.uni-textarea-compute {\n visibility: hidden;\n height: auto;\n}\n.uni-textarea-line {\n width: 1em;\n}\n.uni-textarea-textarea {\n resize: none;\n background: none;\n color: inherit;\n opacity: 1;\n -webkit-text-fill-color: currentcolor;\n font: inherit;\n line-height: inherit;\n letter-spacing: inherit;\n text-align: inherit;\n text-indent: inherit;\n text-transform: inherit;\n text-shadow: inherit;\n}\n/* \u7528\u4E8E\u89E3\u51B3 iOS textarea \u5185\u90E8\u9ED8\u8BA4\u8FB9\u8DDD */\n.uni-textarea-textarea-fix-margin {\n width: auto;\n right: 0;\n margin: 0 -3px;\n}\n";
const DARK_TEST_STRING = "(prefers-color-scheme: dark)";
const _sfc_main$4 = {
name: "Textarea",
diff --git a/packages/uni-h5/src/framework/components/layout/index.tsx b/packages/uni-h5/src/framework/components/layout/index.tsx
index 67186c18ba9a53ad1e441adf18b61bbba68c1fb7..15be967f2a07e7a0b12199d4b9ce928cef467749 100644
--- a/packages/uni-h5/src/framework/components/layout/index.tsx
+++ b/packages/uni-h5/src/framework/components/layout/index.tsx
@@ -1,19 +1,18 @@
import {
- watch,
+ ref,
+ withCtx,
computed,
+ onMounted,
ComputedRef,
- withCtx,
KeepAlive,
openBlock,
createBlock,
createVNode,
+ SetupContext,
defineComponent,
resolveComponent,
ConcreteComponent,
resolveDynamicComponent,
- SetupContext,
- onMounted,
- ref,
} from 'vue'
import { RouterView, useRoute } from 'vue-router'
diff --git a/packages/uni-h5/src/service/api/network/request.ts b/packages/uni-h5/src/service/api/network/request.ts
index d30bef9b040de6f2bcb5b01d79f517417fe9dfe8..949dab931ab893d6b25828c71ddf447b359defe3 100644
--- a/packages/uni-h5/src/service/api/network/request.ts
+++ b/packages/uni-h5/src/service/api/network/request.ts
@@ -1,3 +1,4 @@
+import { hasOwn } from '@vue/shared'
import {
API_REQUEST,
API_TYPE_REQUEST,
@@ -5,7 +6,6 @@ import {
RequestOptions,
RequestProtocol,
} from '@dcloudio/uni-api'
-import { hasOwn } from '@vue/shared'
export const request = defineTaskApi(
API_REQUEST,
diff --git a/packages/uni-h5/style/base.css b/packages/uni-h5/style/framework/base.css
similarity index 100%
rename from packages/uni-h5/style/base.css
rename to packages/uni-h5/style/framework/base.css
diff --git a/packages/uni-h5/style/layout.css b/packages/uni-h5/style/framework/layout.css
similarity index 100%
rename from packages/uni-h5/style/layout.css
rename to packages/uni-h5/style/framework/layout.css
diff --git a/packages/uni-h5/style/nvue.css b/packages/uni-h5/style/framework/nvue.css
similarity index 100%
rename from packages/uni-h5/style/nvue.css
rename to packages/uni-h5/style/framework/nvue.css
diff --git a/packages/uni-h5/style/pageHead.css b/packages/uni-h5/style/framework/pageHead.css
similarity index 100%
rename from packages/uni-h5/style/pageHead.css
rename to packages/uni-h5/style/framework/pageHead.css
diff --git a/packages/uni-h5/style/pageRefresh.css b/packages/uni-h5/style/framework/pageRefresh.css
similarity index 100%
rename from packages/uni-h5/style/pageRefresh.css
rename to packages/uni-h5/style/framework/pageRefresh.css
diff --git a/packages/uni-h5/style/tabBar.css b/packages/uni-h5/style/framework/tabBar.css
similarity index 100%
rename from packages/uni-h5/style/tabBar.css
rename to packages/uni-h5/style/framework/tabBar.css
diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/easycom.ts b/packages/vite-plugin-uni/src/configResolved/plugins/easycom.ts
index 368a05efe0a5acac1a1503d292a0a5d83a0a6235..06fd9d118a4a985990221297e12f60173cc72ba2 100644
--- a/packages/vite-plugin-uni/src/configResolved/plugins/easycom.ts
+++ b/packages/vite-plugin-uni/src/configResolved/plugins/easycom.ts
@@ -9,8 +9,41 @@ import { EXTNAME_VUE, parseVueRequest } from '@dcloudio/uni-cli-shared'
import { UniPluginFilterOptions } from '.'
import { debugEasycom, matchEasycom } from '../../utils'
-const COMPONENTS_PATH = '@dcloudio/uni-h5/dist/uni-h5.esm.js'
-const COMPONENTS_STYLE_PATH = '@dcloudio/uni-h5/style/'
+const BASE_COMPONENTS_STYLE_PATH = '@dcloudio/uni-components/style/'
+const H5_COMPONENTS_PATH = '@dcloudio/uni-h5/dist/uni-h5.esm.js'
+const H5_COMPONENTS_STYLE_PATH = '@dcloudio/uni-h5/style/'
+
+const baseComponents = [
+ 'audio',
+ 'button',
+ 'canvas',
+ 'checkbox',
+ 'checkbox-group',
+ 'editor',
+ 'form',
+ 'icon',
+ 'image',
+ 'input',
+ 'label',
+ 'movable-area',
+ 'movable-view',
+ 'navigator',
+ 'picker-view',
+ 'picker-view-column',
+ 'progress',
+ 'radio',
+ 'radio-group',
+ 'resize-sensor',
+ 'rich-text',
+ 'scroll-view',
+ 'slider',
+ 'swiper',
+ 'swiper-item',
+ 'switch',
+ 'text',
+ 'textarea',
+ 'view',
+]
export function uniEasycomPlugin(options: UniPluginFilterOptions): Plugin {
const filter = createFilter(options.include, options.exclude)
@@ -60,11 +93,19 @@ function addBuiltInImportDeclaration(
local: string,
name: string
) {
- importDeclarations.push(`import '${COMPONENTS_STYLE_PATH + name + '.css'}';`)
+ if (baseComponents.includes(name)) {
+ importDeclarations.push(
+ `import '${BASE_COMPONENTS_STYLE_PATH + name + '.css'}';`
+ )
+ } else {
+ importDeclarations.push(
+ `import '${H5_COMPONENTS_STYLE_PATH + name + '.css'}';`
+ )
+ }
return addImportDeclaration(
importDeclarations,
local,
- COMPONENTS_PATH,
+ H5_COMPONENTS_PATH,
capitalize(camelize(name))
)
}
diff --git a/packages/vite-plugin-uni/src/configResolved/plugins/pagesJson.ts b/packages/vite-plugin-uni/src/configResolved/plugins/pagesJson.ts
index 0188288363ee479ec7c25feaa8e7f7fe65550f36..42054249cad27319caef598f7a9afee40b177494 100644
--- a/packages/vite-plugin-uni/src/configResolved/plugins/pagesJson.ts
+++ b/packages/vite-plugin-uni/src/configResolved/plugins/pagesJson.ts
@@ -98,24 +98,24 @@ function normalizePageIdentifier(path: string) {
function generateCssCode(config: ResolvedConfig) {
const define = config.define! as FEATURE_DEFINES
- const cssFiles = ['@dcloudio/uni-h5/style/base.css']
+ const cssFiles = ['@dcloudio/uni-h5/style/framework/base.css']
if (define.__UNI_FEATURE_PAGES__) {
- cssFiles.push('@dcloudio/uni-h5/style/layout.css')
+ cssFiles.push('@dcloudio/uni-h5/style/framework/layout.css')
}
if (define.__UNI_FEATURE_NAVIGATIONBAR__) {
- cssFiles.push('@dcloudio/uni-h5/style/pageHead.css')
+ cssFiles.push('@dcloudio/uni-h5/style/framework/pageHead.css')
}
if (define.__UNI_FEATURE_TABBAR__) {
- cssFiles.push('@dcloudio/uni-h5/style/tabBar.css')
+ cssFiles.push('@dcloudio/uni-h5/style/framework/tabBar.css')
}
if (define.__UNI_FEATURE_NVUE__) {
- cssFiles.push('@dcloudio/uni-h5/style/nvue.css')
+ cssFiles.push('@dcloudio/uni-h5/style/framework/nvue.css')
}
if (define.__UNI_FEATURE_PULL_DOWN_REFRESH__) {
- cssFiles.push('@dcloudio/uni-h5/style/pageRefresh.css')
+ cssFiles.push('@dcloudio/uni-h5/style/framework/pageRefresh.css')
}
if (define.__UNI_FEATURE_NAVIGATIONBAR_SEARCHINPUT__) {
- cssFiles.push('@dcloudio/uni-h5/style/input.css')
+ cssFiles.push('@dcloudio/uni-components/style/input.css')
}
return cssFiles.map((file) => `import '${file}'`).join('\n')
}