升级依赖到最新版本

master
RuoYi 3 years ago
parent 1baa04f459
commit 299e69968e
  1. 28
      package.json
  2. 2
      src/views/system/user/index.vue
  3. 10
      src/views/tool/gen/editTable.vue

@ -15,28 +15,28 @@
"url": "https://gitee.com/y_project/RuoYi-Vue.git" "url": "https://gitee.com/y_project/RuoYi-Vue.git"
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "0.2.6", "@element-plus/icons-vue": "1.1.4",
"axios": "0.24.0", "axios": "0.26.1",
"echarts": "5.2.2", "echarts": "5.3.2",
"element-plus": "2.0.1", "element-plus": "2.1.8",
"file-saver": "2.0.5", "file-saver": "2.0.5",
"fuse.js": "6.4.6", "fuse.js": "6.5.3",
"js-cookie": "3.0.1", "js-cookie": "3.0.1",
"jsencrypt": "3.2.1", "jsencrypt": "3.2.1",
"nprogress": "0.2.0", "nprogress": "0.2.0",
"vue": "3.2.26", "vue": "3.2.31",
"vue-cropper": "1.0.2", "vue-cropper": "1.0.3",
"vue-router": "4.0.12", "vue-router": "4.0.14",
"vuex": "4.0.2" "vuex": "4.0.2"
}, },
"devDependencies": { "devDependencies": {
"@vitejs/plugin-vue": "1.9.4", "@vitejs/plugin-vue": "2.3.1",
"@vue/compiler-sfc": "3.2.22", "@vue/compiler-sfc": "3.2.31",
"sass": "1.45.0", "sass": "1.50.0",
"unplugin-auto-import": "0.5.3", "unplugin-auto-import": "0.6.9",
"vite": "2.6.14", "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-svg-icons": "1.0.5",
"vite-plugin-vue-setup-extend": "0.1.0" "vite-plugin-vue-setup-extend": "0.4.0"
} }
} }

@ -588,7 +588,7 @@ function handleAdd() {
roleOptions.value = response.roles; roleOptions.value = response.roles;
open.value = true; open.value = true;
title.value = "添加用户"; title.value = "添加用户";
form.password.value = initPassword.value; form.value.password = initPassword.value;
}); });
}; };
/** 修改按钮操作 */ /** 修改按钮操作 */

@ -149,13 +149,13 @@ function submitForm() {
Promise.all([basicForm, genForm].map(getFormPromise)).then(res => { Promise.all([basicForm, genForm].map(getFormPromise)).then(res => {
const validateResult = res.every(item => !!item); const validateResult = res.every(item => !!item);
if (validateResult) { if (validateResult) {
const genTable = Object.assign({}, basicForm.model, genForm.model); const genTable = Object.assign({}, info.value);
genTable.columns = columns.value; genTable.columns = columns.value;
genTable.params = { genTable.params = {
treeCode: genTable.treeCode, treeCode: info.value.treeCode,
treeName: genTable.treeName, treeName: info.value.treeName,
treeParentCode: genTable.treeParentCode, treeParentCode: info.value.treeParentCode,
parentMenuId: genTable.parentMenuId parentMenuId: info.value.parentMenuId
}; };
updateGenTable(genTable).then(res => { updateGenTable(genTable).then(res => {
proxy.$modal.msgSuccess(res.msg); proxy.$modal.msgSuccess(res.msg);

Loading…
Cancel
Save