canrd-outside / order-erp-front · Commits

Commit 905e5b714b582548f32feca723012124343686a6

Authored by vben
1 parent 6ef62ba6

fix(layout): fix style compatibility issues

Inline Side-by-side
Showing 3 changed files with 107 additions and 18 deletions
package.json
  View file @905e5b7
... ... @@ -37,7 +37,7 @@
37 37 "@logicflow/extension": "^0.4.8",
38 38 "@vueuse/core": "^4.11.1",
39 39 "@zxcvbn-ts/core": "^0.3.0",
40   - "ant-design-vue": "2.1.2",
  40 + "ant-design-vue": "2.1.6",
41 41 "axios": "^0.21.1",
42 42 "codemirror": "^5.61.1",
43 43 "cropperjs": "^1.5.11",
... ... @@ -53,7 +53,7 @@
53 53 "sortablejs": "^1.13.0",
54 54 "tinymce": "^5.8.1",
55 55 "vditor": "^3.8.5",
56   - "vue": "3.0.11",
  56 + "vue": "3.1.0-beta.4",
57 57 "vue-i18n": "9.1.6",
58 58 "vue-json-pretty": "^2.0.2",
59 59 "vue-router": "^4.0.8",
... ... @@ -80,7 +80,7 @@
80 80 "@vitejs/plugin-legacy": "^1.4.0",
81 81 "@vitejs/plugin-vue": "^1.2.2",
82 82 "@vitejs/plugin-vue-jsx": "^1.1.4",
83   - "@vue/compiler-sfc": "3.0.11",
  83 + "@vue/compiler-sfc": "3.1.0-beta.4",
84 84 "autoprefixer": "^10.2.5",
85 85 "commitizen": "^4.2.4",
86 86 "conventional-changelog-cli": "^2.1.1",
... ...
src/layouts/default/index.vue
  View file @905e5b7
... ... @@ -2,7 +2,7 @@
2 2 <Layout :class="prefixCls" v-bind="lockEvents">
3 3 <LayoutFeatures />
4 4 <LayoutHeader fixed v-if="getShowFullHeaderRef" />
5   - <Layout :class="layoutClass">
  5 + <Layout :class="[layoutClass]">
6 6 <LayoutSideBar v-if="getShowSidebar || getIsMobile" />
7 7 <Layout :class="`${prefixCls}-main`">
8 8 <LayoutMultipleHeader />
... ... @@ -45,12 +45,18 @@
45 45 const { prefixCls } = useDesign('default-layout');
46 46 const { getIsMobile } = useAppInject();
47 47 const { getShowFullHeaderRef } = useHeaderSetting();
48   - const { getShowSidebar, getIsMixSidebar } = useMenuSetting();
  48 + const { getShowSidebar, getIsMixSidebar, getIsSidebarType } = useMenuSetting();
49 49  
50 50 // Create a lock screen monitor
51 51 const lockEvents = useLockPage();
52 52  
53   - const layoutClass = computed(() => ({ 'ant-layout-has-sider': unref(getIsMixSidebar) }));
  53 + const layoutClass = computed(() => {
  54 + let cls: string[] = ['ant-layout'];
  55 + if (unref(getIsMixSidebar) || unref(getIsSidebarType)) {
  56 + cls.push('ant-layout-has-sider');
  57 + }
  58 + return cls;
  59 + });
54 60  
55 61 return {
56 62 getShowFullHeaderRef,
... ... @@ -79,6 +85,7 @@
79 85 }
80 86  
81 87 &-main {
  88 + width: 100%;
82 89 margin-left: 1px;
83 90 }
84 91 }
... ...
yarn.lock
  View file @905e5b7
... ... @@ -1946,6 +1946,17 @@
1946 1946 estree-walker "^2.0.1"
1947 1947 source-map "^0.6.1"
1948 1948  
  1949 +"@vue/compiler-core@3.1.0-beta.4":
  1950 + version "3.1.0-beta.4"
  1951 + resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.1.0-beta.4.tgz#ed8b7dd3d2a42688283875de13c500099fe5d612"
  1952 + integrity sha512-ukGe7aVKkzD3lDAGeiCPJutY0+FH0JEVglVRY9pm3oAYkX3gdOfrfUCZKx2Vm0IGHci7oyfnIigT3yVTEvcBRg==
  1953 + dependencies:
  1954 + "@babel/parser" "^7.12.0"
  1955 + "@babel/types" "^7.12.0"
  1956 + "@vue/shared" "3.1.0-beta.4"
  1957 + estree-walker "^2.0.1"
  1958 + source-map "^0.6.1"
  1959 +
1949 1960 "@vue/compiler-dom@3.0.11", "@vue/compiler-dom@^3.0.11":
1950 1961 version "3.0.11"
1951 1962 resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.11.tgz#b15fc1c909371fd671746020ba55b5dab4a730ee"
... ... @@ -1954,7 +1965,37 @@
1954 1965 "@vue/compiler-core" "3.0.11"
1955 1966 "@vue/shared" "3.0.11"
1956 1967  
1957   -"@vue/compiler-sfc@3.0.11", "@vue/compiler-sfc@^3.0.11":
  1968 +"@vue/compiler-dom@3.1.0-beta.4":
  1969 + version "3.1.0-beta.4"
  1970 + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.1.0-beta.4.tgz#2d56d21bf39bc8e57278ecc3abb4c36f971c94d1"
  1971 + integrity sha512-D6s1WkunFOANb8gu3F9MhTsF0R0PwxrQAgswY9v0yTKur44vyv0mwaEgQCw0FIwnPNmL15wh5ahtItDvmfkbzQ==
  1972 + dependencies:
  1973 + "@vue/compiler-core" "3.1.0-beta.4"
  1974 + "@vue/shared" "3.1.0-beta.4"
  1975 +
  1976 +"@vue/compiler-sfc@3.1.0-beta.4":
  1977 + version "3.1.0-beta.4"
  1978 + resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.1.0-beta.4.tgz#fb4e1b3cee19a34428c9e52c64df3b81ffda6687"
  1979 + integrity sha512-G89oMfxPN33d2g1LXxpLIWi7e3wLCh0/w3dV1HWswq3+5YWCW4ITVc/nArPKKT+B9h0CTJ8WSRkBDsbe4AHDTQ==
  1980 + dependencies:
  1981 + "@babel/parser" "^7.13.9"
  1982 + "@babel/types" "^7.13.0"
  1983 + "@vue/compiler-core" "3.1.0-beta.4"
  1984 + "@vue/compiler-dom" "3.1.0-beta.4"
  1985 + "@vue/compiler-ssr" "3.1.0-beta.4"
  1986 + "@vue/shared" "3.1.0-beta.4"
  1987 + consolidate "^0.16.0"
  1988 + estree-walker "^2.0.1"
  1989 + hash-sum "^2.0.0"
  1990 + lru-cache "^5.1.1"
  1991 + magic-string "^0.25.7"
  1992 + merge-source-map "^1.1.0"
  1993 + postcss "^8.1.10"
  1994 + postcss-modules "^4.0.0"
  1995 + postcss-selector-parser "^6.0.4"
  1996 + source-map "^0.6.1"
  1997 +
  1998 +"@vue/compiler-sfc@^3.0.11":
1958 1999 version "3.0.11"
1959 2000 resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.11.tgz#cd8ca2154b88967b521f5ad3b10f5f8b6b665679"
1960 2001 integrity sha512-7fNiZuCecRleiyVGUWNa6pn8fB2fnuJU+3AGjbjl7r1P5wBivfl02H4pG+2aJP5gh2u+0wXov1W38tfWOphsXw==
... ... @@ -1984,6 +2025,14 @@
1984 2025 "@vue/compiler-dom" "3.0.11"
1985 2026 "@vue/shared" "3.0.11"
1986 2027  
  2028 +"@vue/compiler-ssr@3.1.0-beta.4":
  2029 + version "3.1.0-beta.4"
  2030 + resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.1.0-beta.4.tgz#9d49a8c7bd047ac446db899b80b3345c5f1e154d"
  2031 + integrity sha512-yvE0tee9AjElRKOLS2U4wmYHoxYRfsI+XK/QPEv1gg56M7+CGCK2+Bjwt4nNsCy4Wd0QuD75frCVLIaeOzzn9w==
  2032 + dependencies:
  2033 + "@vue/compiler-dom" "3.1.0-beta.4"
  2034 + "@vue/shared" "3.1.0-beta.4"
  2035 +
1987 2036 "@vue/devtools-api@^6.0.0-beta.10":
1988 2037 version "6.0.0-beta.10"
1989 2038 resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.0.0-beta.10.tgz#f39da7618cee292e39c7274227c34163e30eb3ca"
... ... @@ -2001,6 +2050,13 @@
2001 2050 dependencies:
2002 2051 "@vue/shared" "3.0.11"
2003 2052  
  2053 +"@vue/reactivity@3.1.0-beta.4":
  2054 + version "3.1.0-beta.4"
  2055 + resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.1.0-beta.4.tgz#7ef9eb60a05da9662fbdb004ed47c8aaf657e8d3"
  2056 + integrity sha512-TfvJ897j4KfTX4g0nKntYTPTijD2eJqVbWIQIQCV6xqTAhqTl+4tsu6RRzPA7Ynh8mv9td7OJoaQYZ3zxM4siA==
  2057 + dependencies:
  2058 + "@vue/shared" "3.1.0-beta.4"
  2059 +
2004 2060 "@vue/runtime-core@3.0.11":
2005 2061 version "3.0.11"
2006 2062 resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.11.tgz#c52dfc6acf3215493623552c1c2919080c562e44"
... ... @@ -2009,6 +2065,14 @@
2009 2065 "@vue/reactivity" "3.0.11"
2010 2066 "@vue/shared" "3.0.11"
2011 2067  
  2068 +"@vue/runtime-core@3.1.0-beta.4":
  2069 + version "3.1.0-beta.4"
  2070 + resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.1.0-beta.4.tgz#3c41b38d8518a6778d93541c3760d4264c971fca"
  2071 + integrity sha512-hsB+s5/JyFxYB56MHHq/XowB8jj8n5cYB9wqon2cMylC/HSxgvSMdehNbky6X5s8vAQ8HYCSjqzn94MlOP5USA==
  2072 + dependencies:
  2073 + "@vue/reactivity" "3.1.0-beta.4"
  2074 + "@vue/shared" "3.1.0-beta.4"
  2075 +
2012 2076 "@vue/runtime-dom@3.0.11":
2013 2077 version "3.0.11"
2014 2078 resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.11.tgz#7a552df21907942721feb6961c418e222a699337"
... ... @@ -2018,11 +2082,25 @@
2018 2082 "@vue/shared" "3.0.11"
2019 2083 csstype "^2.6.8"
2020 2084  
  2085 +"@vue/runtime-dom@3.1.0-beta.4":
  2086 + version "3.1.0-beta.4"
  2087 + resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.1.0-beta.4.tgz#72f63309defa7b7b19af5c2118c8e9fdf4b44adb"
  2088 + integrity sha512-jg7Bn6aLoUZ5ACobEQYZovexgXKKhh95vudsyTSIZoq5m/tKRTCQg/UbzkWlE1P9UrRigQsF2sbhoxa0COktSg==
  2089 + dependencies:
  2090 + "@vue/runtime-core" "3.1.0-beta.4"
  2091 + "@vue/shared" "3.1.0-beta.4"
  2092 + csstype "^2.6.8"
  2093 +
2021 2094 "@vue/shared@3.0.11", "@vue/shared@^3.0.11":
2022 2095 version "3.0.11"
2023 2096 resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77"
2024 2097 integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA==
2025 2098  
  2099 +"@vue/shared@3.1.0-beta.4":
  2100 + version "3.1.0-beta.4"
  2101 + resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.1.0-beta.4.tgz#eb7038506cfc0a0a89fa2a46b40186df17adf58c"
  2102 + integrity sha512-W2vWLh8XEK1xOkzBQdqDNng324hbWe3LEebHaHBM2o3vIPp5zCO/P8LCfTGpLaFU2ISy2NhAUk44VZBswFAKEQ==
  2103 +
2026 2104 "@vueuse/core@^4.11.1":
2027 2105 version "4.11.1"
2028 2106 resolved "https://registry.npmjs.com/@vueuse/core/-/core-4.11.1.tgz#1ab79284dffe8934420a1a40491333cd0591ecd2"
... ... @@ -2178,10 +2256,10 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
2178 2256 dependencies:
2179 2257 color-convert "^2.0.1"
2180 2258  
2181   -ant-design-vue@2.1.2:
2182   - version "2.1.2"
2183   - resolved "https://registry.npmjs.com/ant-design-vue/-/ant-design-vue-2.1.2.tgz#2065d7e63199c0c584919458af57b6a0b597f677"
2184   - integrity sha512-gDG0wauGVt4LE63behrJaIcq4BB+dgs+dpj9jz17IgKr2MPYSEeKetU/x9Kk8d58cGonz4Ulncg7fBZJ7EljsQ==
  2259 +ant-design-vue@2.1.6:
  2260 + version "2.1.6"
  2261 + resolved "https://registry.yarnpkg.com/ant-design-vue/-/ant-design-vue-2.1.6.tgz#c51cdc858e1b1b8b569f5435eb487f53a3f1745e"
  2262 + integrity sha512-qICxb6Y4f7QuSuh/jbLhZA9SkUBnP9xYfy/E6yD7+1fg04aAzmRK8oLv8ETuGTrROVdSVeic9v/NS2BXEuuARg==
2185 2263 dependencies:
2186 2264 "@ant-design-vue/use" "^0.0.1-0"
2187 2265 "@ant-design/icons-vue" "^6.0.0"
... ... @@ -2191,7 +2269,7 @@ ant-design-vue@2.1.2:
2191 2269 async-validator "^3.3.0"
2192 2270 dom-align "^1.10.4"
2193 2271 dom-scroll-into-view "^2.0.0"
2194   - is-mobile "^2.2.1"
  2272 + lodash "^4.17.21"
2195 2273 lodash-es "^4.17.15"
2196 2274 moment "^2.27.0"
2197 2275 omit.js "^2.0.0"
... ... @@ -6027,11 +6105,6 @@ is-jpg@^2.0.0:
6027 6105 resolved "https://registry.npmjs.org/is-jpg/-/is-jpg-2.0.0.tgz#2e1997fa6e9166eaac0242daae443403e4ef1d97"
6028 6106 integrity sha1-LhmX+m6RZuqsAkLarkQ0A+TvHZc=
6029 6107  
6030   -is-mobile@^2.2.1:
6031   - version "2.2.2"
6032   - resolved "https://registry.npmjs.com/is-mobile/-/is-mobile-2.2.2.tgz#f6c9c5d50ee01254ce05e739bdd835f1ed4e9954"
6033   - integrity sha512-wW/SXnYJkTjs++tVK5b6kVITZpAZPtUrt9SF80vvxGiF/Oywal+COk1jlRkiVq15RFNEQKQY31TkV24/1T5cVg==
6034   -
6035 6108 is-module@^1.0.0:
6036 6109 version "1.0.0"
6037 6110 resolved "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
... ... @@ -10816,7 +10889,16 @@ vue-types@^3.0.0, vue-types@^3.0.2:
10816 10889 dependencies:
10817 10890 is-plain-object "3.0.1"
10818 10891  
10819   -vue@3.0.11, vue@^3.0.0:
  10892 +vue@3.1.0-beta.4:
  10893 + version "3.1.0-beta.4"
  10894 + resolved "https://registry.yarnpkg.com/vue/-/vue-3.1.0-beta.4.tgz#c17c14f60a9267c5f33d9fa4dbc9bc54605d5ae2"
  10895 + integrity sha512-HzJnk1iaWGcExAaAIO2yVMMhxHX6wSLcKF3/PwF2NZMlMpUf7ZQSFHVfzIyJqaQ96K1KJOlDPbpqKYLpRq947w==
  10896 + dependencies:
  10897 + "@vue/compiler-dom" "3.1.0-beta.4"
  10898 + "@vue/runtime-dom" "3.1.0-beta.4"
  10899 + "@vue/shared" "3.1.0-beta.4"
  10900 +
  10901 +vue@^3.0.0:
10820 10902 version "3.0.11"
10821 10903 resolved "https://registry.npmjs.org/vue/-/vue-3.0.11.tgz#c82f9594cbf4dcc869241d4c8dd3e08d9a8f4b5f"
10822 10904 integrity sha512-3/eUi4InQz8MPzruHYSTQPxtM3LdZ1/S/BvaU021zBnZi0laRUyH6pfuE4wtUeLvI8wmUNwj5wrZFvbHUXL9dw==
... ...