Skip to content

Commit c5c4ea3

Browse files
author
xujianhua
committed
更新项目依赖至最新版本
1 parent 87ad54b commit c5c4ea3

File tree

4 files changed

+78
-67
lines changed

4 files changed

+78
-67
lines changed

package-lock.json

+57-49
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@
1010
"dependencies": {
1111
"@element-plus/icons": "0.0.11",
1212
"axios": "^0.23.0",
13-
"core-js": "^3.18.3",
13+
"core-js": "^3.19.0",
1414
"dayjs": "^1.10.7",
1515
"echarts": "^5.2.1",
16-
"element-plus": "^1.1.0-beta.20",
16+
"element-plus": "^1.1.0-beta.24",
1717
"normalize.css": "^8.0.1",
1818
"nprogress": "^0.2.0",
1919
"qs": "^6.10.1",
2020
"vue": "^3.2.20",
21-
"vue-router": "^4.0.11",
21+
"vue-router": "^4.0.12",
2222
"vuex": "^4.0.2",
2323
"xe-utils": "^3.4.0",
2424
"zdog": "^1.1.2"
2525
},
2626
"devDependencies": {
27-
"@vue/babel-plugin-jsx": "^1.1.0",
27+
"@vue/babel-plugin-jsx": "^1.1.1",
2828
"@vue/cli-plugin-babel": "^4.5.13",
2929
"@vue/cli-plugin-eslint": "^4.5.13",
3030
"@vue/cli-plugin-router": "^4.5.13",
@@ -36,11 +36,11 @@
3636
"compression-webpack-plugin": "^6.1.1",
3737
"eslint": "^7.32.0",
3838
"eslint-plugin-prettier": "^3.4.1",
39-
"eslint-plugin-vue": "^7.19.1",
40-
"lint-staged": "^11.2.3",
39+
"eslint-plugin-vue": "^7.20.0",
40+
"lint-staged": "^11.2.6",
4141
"mockjs": "^1.1.0",
4242
"prettier": "^2.4.1",
43-
"sass": "^1.43.2",
43+
"sass": "^1.43.4",
4444
"sass-loader": "^10.2.0",
4545
"uglifyjs-webpack-plugin": "^2.2.0",
4646
"vue-cli-plugin-axios": "^0.0.4",

src/views/IFrame.vue

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
22
* @Author: your name
33
* @Date: 2021-03-02 09:30:13
4-
* @LastEditTime: 2021-10-15 14:41:36
4+
* @LastEditTime: 2021-10-28 17:14:54
55
* @LastEditors: Please set LastEditors
66
* @Description: In User Settings Edit
77
* @FilePath: \vue3-element-admin\src\views\IFrame.vue
@@ -27,14 +27,13 @@ const load = ref(true);
2727
const iframe = ref(null);
2828

2929
const setLoad = () => {
30+
const $onLoad = () => {
31+
load.value = false;
32+
};
3033
if (iframe.value.attachEvent) {
31-
iframe.value.attachEvent("onload", function () {
32-
load.value = false;
33-
});
34+
iframe.value.attachEvent("onload", $onLoad);
3435
} else {
35-
iframe.value.onload = function () {
36-
load.value = false;
37-
};
36+
iframe.value.onload = $onLoad;
3837
}
3938
};
4039

src/views/layoutpages/system/components/MenuEdit.vue

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
22
* @Author: your name
33
* @Date: 2021-02-09 15:24:23
4-
* @LastEditTime: 2021-10-15 19:15:12
4+
* @LastEditTime: 2021-10-28 17:33:58
55
* @LastEditors: Please set LastEditors
66
* @Description: In User Settings Edit
77
* @FilePath: \vue3-element-admin\src\views\layoutpages\system\components\MenuEdit.vue
@@ -38,6 +38,7 @@
3838
</el-form-item>
3939
<el-form-item label="父级" prop="parentId">
4040
<el-cascader
41+
:key="cascaderKey"
4142
style="width: 100%"
4243
:options="menuList"
4344
v-model="parentId"
@@ -257,7 +258,8 @@ const closeDialog = () => {
257258
};
258259
const ve_icons = ref([]);
259260
const formRef = ref(null);
260-
261+
const cascaderKey = ref(0);
262+
const files = getfiles();
261263
const form = reactive({
262264
name: "",
263265
type: 0,
@@ -375,6 +377,8 @@ rowData.value &&
375377
* @return {*}
376378
*/
377379
const changeType = (val) => {
380+
//! el-cascader有bug 更新el-cascader组件 临时解决
381+
cascaderKey.value = Math.random();
378382
formRef.value.resetFields();
379383
val == 2 && (icon.value = "");
380384
};
@@ -484,8 +488,8 @@ const menuOptions = computed(() => {
484488
menuList.value,
485489
(item) => item.id == parentId.value
486490
);
487-
if (_item && getfiles().find((item) => item.url == _item.item.url)) {
488-
return getfiles().find((item) => item.url == _item.item.url).menus;
491+
if (_item && files.find((item) => item.url == _item.item.url)) {
492+
return files.find((item) => item.url == _item.item.url).menus;
489493
} else {
490494
return false;
491495
}

0 commit comments

Comments
 (0)