Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit dab54ed

Browse files
buqiyuanbuqiyuan
committed
fix: layout slot bug
1 parent b415198 commit dab54ed

File tree

4 files changed

+41
-104
lines changed

4 files changed

+41
-104
lines changed

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"nprogress": "^1.0.0-1",
3434
"qrcode": "^1.4.4",
3535
"vant": "^3.0.17",
36-
"vue": "3.1.0-beta.6",
36+
"vue": "3.0.11",
3737
"vue-router": "^4.0.8",
3838
"vuedraggable": "^4.0.1",
3939
"vuex": "^4.0.1"
@@ -47,7 +47,7 @@
4747
"@vitejs/plugin-legacy": "^1.4.0",
4848
"@vitejs/plugin-vue": "^1.2.2",
4949
"@vitejs/plugin-vue-jsx": "^1.1.4",
50-
"@vue/compiler-sfc": "3.1.0-beta.6",
50+
"@vue/compiler-sfc": "3.0.11",
5151
"commitizen": "^4.2.4",
5252
"cz-conventional-changelog": "^3.3.0",
5353
"cz-customizable": "^6.3.0",
@@ -67,7 +67,7 @@
6767
"stylelint-config-standard": "^22.0.0",
6868
"stylelint-order": "^4.1.0",
6969
"typescript": "^4.3.2",
70-
"vite": "2.3.4",
70+
"vite": "2.3.5",
7171
"vite-plugin-components": "^0.10.4",
7272
"vite-plugin-style-import": "^0.10.1",
7373
"vite-plugin-windicss": "^0.16.7",

‎src/packages/container-component/layout/index.tsx

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export default {
5050
})
5151
}
5252

53-
const Layout = () => (
53+
return (
5454
<Row
5555
ref={(el) => registerRef(el, block._vid)}
5656
{...custom}
@@ -66,15 +66,13 @@ export default {
6666
.map((spanItem: SlotItem, spanIndex) => {
6767
slotsTemp[block._vid][`slot${spanIndex}`] = spanItem
6868
return (
69-
<Col key={`slot${spanIndex}`} span={spanItem.span}>
70-
{renderSlot(slots, `slot${spanIndex}`, {}, () => [`slot${spanIndex}`])}
71-
</Col>
69+
<>
70+
<Col span={spanItem.span}>{renderSlot(slots, `slot${spanIndex}`)}</Col>
71+
</>
7272
)
7373
})}
7474
</Row>
7575
)
76-
77-
return <Layout />
7876
},
7977
resize: {
8078
height: true,

‎src/visual-editor/components/common/simulator.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@ export default defineComponent({
1515
</script>
1616
<style lang="scss" scoped>
1717
.simulator-container {
18+
display: flex;
1819
width: 100%;
1920
height: 100%;
2021
padding-right: 240px;
21-
display: flex;
2222
align-items: center;
2323
justify-content: center;
2424
2525
@media (max-width: 1314px) {
2626
padding-right: 0;
2727
}
2828
}
29+
2930
.simulator-editor {
30-
box-sizing: border-box;
3131
width: 360px;
3232
height: 640px;
3333
min-width: 360px;
3434
background: #fafafa;
3535
border-radius: 5px;
36-
box-shadow: 0 8px 12px #ebedf0;
3736
transform: translate(0);
38-
overflow: auto;
37+
box-shadow: 0 8px 12px #ebedf0;
38+
box-sizing: border-box;
3939
4040
&::-webkit-scrollbar {
4141
width: 0;

‎yarn.lock

Lines changed: 30 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -884,17 +884,6 @@
884884
estree-walker "^2.0.1"
885885
source-map "^0.6.1"
886886

887-
"@vue/[email protected]":
888-
version "3.1.0-beta.6"
889-
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.1.0-beta.6.tgz#19238d596dfb70bd03c62aaefab2022a22264593"
890-
integrity sha512-8HgII0+tgOvSLtw8DFgI0Maobk8bsPygtzfgH/erb5NLUX73YI1xx91pGtUxLIZvJsVjnF3X4viW+aJqMcFhyg==
891-
dependencies:
892-
"@babel/parser" "^7.12.0"
893-
"@babel/types" "^7.12.0"
894-
"@vue/shared" "3.1.0-beta.6"
895-
estree-walker "^2.0.1"
896-
source-map "^0.6.1"
897-
898887
"@vue/[email protected]", "@vue/compiler-dom@^3.0.11":
899888
version "3.0.11"
900889
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.11.tgz#b15fc1c909371fd671746020ba55b5dab4a730ee"
@@ -903,37 +892,7 @@
903892
"@vue/compiler-core" "3.0.11"
904893
"@vue/shared" "3.0.11"
905894

906-
"@vue/[email protected]":
907-
version "3.1.0-beta.6"
908-
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.1.0-beta.6.tgz#ccdc415d4b9078cd9553797fca216e8730d5cd5a"
909-
integrity sha512-IKLVm8ysBXeAQlxCzaiDrcaXHPf5n56Poy/IO+RRCgOuimMwA/6bbZBocAY1GxBc4zes+GwectRCPMmr/JU0pA==
910-
dependencies:
911-
"@vue/compiler-core" "3.1.0-beta.6"
912-
"@vue/shared" "3.1.0-beta.6"
913-
914-
"@vue/[email protected]":
915-
version "3.1.0-beta.6"
916-
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.1.0-beta.6.tgz#22375518c69c1bff8ca6a4e541cf211c7b8f5c77"
917-
integrity sha512-kpXB28+XKGfyIQ4q2yPBefS+Cnxph/rtGMbo7xeym45B/P88VxEcuCEtSGZg5SnlX5O39jYzSju7aZY+aziv8Q==
918-
dependencies:
919-
"@babel/parser" "^7.13.9"
920-
"@babel/types" "^7.13.0"
921-
"@vue/compiler-core" "3.1.0-beta.6"
922-
"@vue/compiler-dom" "3.1.0-beta.6"
923-
"@vue/compiler-ssr" "3.1.0-beta.6"
924-
"@vue/shared" "3.1.0-beta.6"
925-
consolidate "^0.16.0"
926-
estree-walker "^2.0.1"
927-
hash-sum "^2.0.0"
928-
lru-cache "^5.1.1"
929-
magic-string "^0.25.7"
930-
merge-source-map "^1.1.0"
931-
postcss "^8.1.10"
932-
postcss-modules "^4.0.0"
933-
postcss-selector-parser "^6.0.4"
934-
source-map "^0.6.1"
935-
936-
"@vue/compiler-sfc@^3.0.11":
895+
"@vue/[email protected]", "@vue/compiler-sfc@^3.0.11":
937896
version "3.0.11"
938897
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.0.11.tgz#cd8ca2154b88967b521f5ad3b10f5f8b6b665679"
939898
integrity sha512-7fNiZuCecRleiyVGUWNa6pn8fB2fnuJU+3AGjbjl7r1P5wBivfl02H4pG+2aJP5gh2u+0wXov1W38tfWOphsXw==
@@ -963,60 +922,40 @@
963922
"@vue/compiler-dom" "3.0.11"
964923
"@vue/shared" "3.0.11"
965924

966-
"@vue/[email protected]":
967-
version "3.1.0-beta.6"
968-
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.1.0-beta.6.tgz#9ecd0f8e2decfa00e8fda9a8dce85e1f5230c687"
969-
integrity sha512-nFwAeOdmrVEEhSnZVfA8QOGnqKePVm36xZYs6IxAO7xOLAV7KyO9D6hb+d3SHHh8TSE9frSa2Vg0CvuulPBCWQ==
970-
dependencies:
971-
"@vue/compiler-dom" "3.1.0-beta.6"
972-
"@vue/shared" "3.1.0-beta.6"
973-
974925
"@vue/devtools-api@^6.0.0-beta.10", "@vue/devtools-api@^6.0.0-beta.11":
975926
version "6.0.0-beta.11"
976927
resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.0.0-beta.11.tgz#4fb4161ee41ba75f3f5198d4bfd80e4ffb7f2462"
977928
integrity sha512-vpw61AkW9U8c2upjJCljHq9eh1KkD4FJ7DYbRzIETpj9WAw2VESudJZosAk4M+7npBo1Zu1jNQY03HUMVO/czQ==
978929

979-
"@vue/[email protected]":
980-
version "3.1.0-beta.6"
981-
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.1.0-beta.6.tgz#3636311abe7ae28014d069438890bd48484ed1d2"
982-
integrity sha512-QpEOaK03YvZvgwWpwTLabNJ4vZVilhPQpf//ZGVZqcbY2yM6fChSkoWpicjR1uobV8aS2Rgt9OWIkU32jsIg6g==
983-
dependencies:
984-
"@vue/shared" "3.1.0-beta.6"
985-
986-
"@vue/reactivity@^3.0.11":
930+
"@vue/[email protected]", "@vue/reactivity@^3.0.11":
987931
version "3.0.11"
988932
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.11.tgz#07b588349fd05626b17f3500cbef7d4bdb4dbd0b"
989933
integrity sha512-SKM3YKxtXHBPMf7yufXeBhCZ4XZDKP9/iXeQSC8bBO3ivBuzAi4aZi0bNoeE2IF2iGfP/AHEt1OU4ARj4ao/Xw==
990934
dependencies:
991935
"@vue/shared" "3.0.11"
992936

993-
"@vue/runtime-core@3.1.0-beta.6":
994-
version "3.1.0-beta.6"
995-
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.1.0-beta.6.tgz#b5e0c1f1a2689149f4b6546569b29ef6bba02b19"
996-
integrity sha512-WdtOShb+0NFCOCNdi8XcWzI0uaPEwwE4c9oJAVo8sCZ2SRiUrKFccisN6M2YdbvYC7z56JzD1IYK0vfaX9vciQ==
937+
"@vue/runtime-core@3.0.11":
938+
version "3.0.11"
939+
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.11.tgz#c52dfc6acf3215493623552c1c2919080c562e44"
940+
integrity sha512-87XPNwHfz9JkmOlayBeCCfMh9PT2NBnv795DSbi//C/RaAnc/bGZgECjmkD7oXJ526BZbgk9QZBPdFT8KMxkAg==
997941
dependencies:
998-
"@vue/reactivity" "3.1.0-beta.6"
999-
"@vue/shared" "3.1.0-beta.6"
942+
"@vue/reactivity" "3.0.11"
943+
"@vue/shared" "3.0.11"
1000944

1001-
"@vue/runtime-dom@3.1.0-beta.6":
1002-
version "3.1.0-beta.6"
1003-
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.1.0-beta.6.tgz#b0cfecd30f1a5f952b2da1e9cede023d0def03ab"
1004-
integrity sha512-Aqjm+1FbW3UsOoLlghOt3O8ytJ+uEY+SWRvqcDitglK/lYVneqJxPY1eN8VSn+0N7VVpYF3QmnLJEs4dBAvIRQ==
945+
"@vue/runtime-dom@3.0.11":
946+
version "3.0.11"
947+
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.11.tgz#7a552df21907942721feb6961c418e222a699337"
948+
integrity sha512-jm3FVQESY3y2hKZ2wlkcmFDDyqaPyU3p1IdAX92zTNeCH7I8zZ37PtlE1b9NlCtzV53WjB4TZAYh9yDCMIEumA==
1005949
dependencies:
1006-
"@vue/runtime-core" "3.1.0-beta.6"
1007-
"@vue/shared" "3.1.0-beta.6"
950+
"@vue/runtime-core" "3.0.11"
951+
"@vue/shared" "3.0.11"
1008952
csstype "^2.6.8"
1009953

1010954
"@vue/[email protected]", "@vue/shared@^3.0.11":
1011955
version "3.0.11"
1012956
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77"
1013957
integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA==
1014958

1015-
"@vue/[email protected]":
1016-
version "3.1.0-beta.6"
1017-
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.1.0-beta.6.tgz#c106fd343b801d63fabdc97ab741b25a6b6c47ea"
1018-
integrity sha512-Camy6ETEk42N5YXZDH+bEW7WKJOE8ORyB+wu+GR8wc5J2ucVebToZqVqGHt9q6UiEhoYCTQNcgEAiwus/DWcFA==
1019-
1020959
"@vueuse/core@^4.11.2":
1021960
version "4.11.2"
1022961
resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-4.11.2.tgz#d4f54bd38e7c289c6f6357992c02423774cb26d9"
@@ -2277,10 +2216,10 @@ es-to-primitive@^1.2.1:
22772216
is-date-object "^1.0.1"
22782217
is-symbol "^1.0.2"
22792218

2280-
esbuild@^0.11.23:
2281-
version "0.11.23"
2282-
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.11.23.tgz#c42534f632e165120671d64db67883634333b4b8"
2283-
integrity sha512-iaiZZ9vUF5wJV8ob1tl+5aJTrwDczlvGP0JoMmnpC2B0ppiMCu8n8gmy5ZTGl5bcG081XBVn+U+jP+mPFm5T5Q==
2219+
esbuild@^0.12.5:
2220+
version "0.12.5"
2221+
resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.5.tgz#36076a6bc1966ba2741981d30512e95e8aaff495"
2222+
integrity sha512-vcuP53pA5XiwUU4FnlXM+2PnVjTfHGthM7uP1gtp+9yfheGvFFbq/KyuESThmtoHPUrfZH5JpxGVJIFDVD1Egw==
22842223

22852224
escalade@^3.1.1:
22862225
version "3.1.1"
@@ -6370,12 +6309,12 @@ vite-plugin-windicss@^0.16.7:
63706309
debug "^4.3.2"
63716310
windicss "^3.0.12"
63726311

6373-
[email protected].4:
6374-
version "2.3.4"
6375-
resolved "https://registry.yarnpkg.com/vite/-/vite-2.3.4.tgz#370118e0334725b898ff754ea43d5db4c5e120e3"
6376-
integrity sha512-7orxrF65+Q5n/sMCnO91S8OS0gkPJ7g+y3bLlc7CPCXVswK8to1T8YycCk9SZh+AcIc0TuN6YajWTBFS5atMNA==
6312+
[email protected].5:
6313+
version "2.3.5"
6314+
resolved "https://registry.yarnpkg.com/vite/-/vite-2.3.5.tgz#0f5e750317e6f00e5343dd8272f64c2261f026b3"
6315+
integrity sha512-Jh3uySLlofx+t+uqznnzJFTNgeqYQLhR6xMx61VYN5KTlVirJXBPkFW2+aigHN6d1mOo6rM7DWnU6gjnudVozw==
63776316
dependencies:
6378-
esbuild "^0.11.23"
6317+
esbuild "^0.12.5"
63796318
postcss "^8.2.10"
63806319
resolve "^1.19.0"
63816320
rollup "^2.38.5"
@@ -6564,14 +6503,14 @@ vue-tsc@^0.1.6:
65646503
dependencies:
65656504
vscode-vue-languageservice "0.25.12"
65666505

6567-
vue@3.1.0-beta.6:
6568-
version "3.1.0-beta.6"
6569-
resolved "https://registry.yarnpkg.com/vue/-/vue-3.1.0-beta.6.tgz#bd1307916c58a07712ea6281078e36e1cb4fd1bf"
6570-
integrity sha512-p5r+T0Dcrzd77K1cp1v/T3R+uMSrvr8B3SDSa6KZOqkEOwZl48IpnX0nMegnIHSX8/WXi3x6nqa+CE/aVP2EfA==
6506+
vue@3.0.11:
6507+
version "3.0.11"
6508+
resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.11.tgz#c82f9594cbf4dcc869241d4c8dd3e08d9a8f4b5f"
6509+
integrity sha512-3/eUi4InQz8MPzruHYSTQPxtM3LdZ1/S/BvaU021zBnZi0laRUyH6pfuE4wtUeLvI8wmUNwj5wrZFvbHUXL9dw==
65716510
dependencies:
6572-
"@vue/compiler-dom" "3.1.0-beta.6"
6573-
"@vue/runtime-dom" "3.1.0-beta.6"
6574-
"@vue/shared" "3.1.0-beta.6"
6511+
"@vue/compiler-dom" "3.0.11"
6512+
"@vue/runtime-dom" "3.0.11"
6513+
"@vue/shared" "3.0.11"
65756514

65766515
vuedraggable@^4.0.1:
65776516
version "4.0.1"

0 commit comments

Comments
 (0)