diff --git a/package.json b/package.json index e1b4b64..d4a0eaa 100644 --- a/package.json +++ b/package.json @@ -15,28 +15,28 @@ "url": "https://gitee.com/y_project/RuoYi-Vue.git" }, "dependencies": { - "@element-plus/icons-vue": "0.2.6", - "axios": "0.24.0", - "echarts": "5.2.2", - "element-plus": "2.0.1", + "@element-plus/icons-vue": "1.1.4", + "axios": "0.26.1", + "echarts": "5.3.2", + "element-plus": "2.1.8", "file-saver": "2.0.5", - "fuse.js": "6.4.6", + "fuse.js": "6.5.3", "js-cookie": "3.0.1", "jsencrypt": "3.2.1", "nprogress": "0.2.0", - "vue": "3.2.26", - "vue-cropper": "1.0.2", - "vue-router": "4.0.12", + "vue": "3.2.31", + "vue-cropper": "1.0.3", + "vue-router": "4.0.14", "vuex": "4.0.2" }, "devDependencies": { - "@vitejs/plugin-vue": "1.9.4", - "@vue/compiler-sfc": "3.2.22", - "sass": "1.45.0", - "unplugin-auto-import": "0.5.3", + "@vitejs/plugin-vue": "2.3.1", + "@vue/compiler-sfc": "3.2.31", + "sass": "1.50.0", + "unplugin-auto-import": "0.6.9", "vite": "2.6.14", - "vite-plugin-compression": "0.3.6", + "vite-plugin-compression": "0.5.1", "vite-plugin-svg-icons": "1.0.5", - "vite-plugin-vue-setup-extend": "0.1.0" + "vite-plugin-vue-setup-extend": "0.4.0" } } diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 78ce084..e5616f0 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -588,7 +588,7 @@ function handleAdd() { roleOptions.value = response.roles; open.value = true; title.value = "添加用户"; - form.password.value = initPassword.value; + form.value.password = initPassword.value; }); }; /** 修改按钮操作 */ diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue index 74304df..bc2d63e 100644 --- a/src/views/tool/gen/editTable.vue +++ b/src/views/tool/gen/editTable.vue @@ -149,13 +149,13 @@ function submitForm() { Promise.all([basicForm, genForm].map(getFormPromise)).then(res => { const validateResult = res.every(item => !!item); if (validateResult) { - const genTable = Object.assign({}, basicForm.model, genForm.model); + const genTable = Object.assign({}, info.value); genTable.columns = columns.value; genTable.params = { - treeCode: genTable.treeCode, - treeName: genTable.treeName, - treeParentCode: genTable.treeParentCode, - parentMenuId: genTable.parentMenuId + treeCode: info.value.treeCode, + treeName: info.value.treeName, + treeParentCode: info.value.treeParentCode, + parentMenuId: info.value.parentMenuId }; updateGenTable(genTable).then(res => { proxy.$modal.msgSuccess(res.msg);