From 6473d4d8be63f2d18db9a8f7c4b0096ee4dd6d55 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 13 八月 2021 17:36:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/utils/request.js | 2 +-
ruoyi-ui/src/views/system/role/selectUser.vue | 2 +-
ruoyi-ui/src/views/index.vue | 2 +-
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 19 +++++++++----------
ruoyi-ui/src/router/index.js | 4 ++--
ruoyi-ui/bin/run-web.bat | 4 ++--
6 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
index 9cde389..b4349c1 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -108,7 +108,7 @@
plain
icon="el-icon-download"
size="mini"
- :loading="exportLoading"
+ :loading="exportLoading"
@click="handleExport"
v-hasPermi="['${moduleName}:${businessName}:export']"
>瀵煎嚭</el-button>
@@ -585,19 +585,18 @@
/** ${subTable.functionName}鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete${subClassName}() {
if (this.checked${subClassName}.length == 0) {
- this.$alert("璇峰厛閫夋嫨瑕佸垹闄ょ殑${subTable.functionName}鏁版嵁", "鎻愮ず", { confirmButtonText: "纭畾", });
+ this.msgError("璇峰厛閫夋嫨瑕佸垹闄ょ殑${subTable.functionName}鏁版嵁");
} else {
- this.${subclassName}List.splice(this.checked${subClassName}[0].index - 1, 1);
+ const ${subclassName}List = this.${subclassName}List;
+ const checked${subClassName} = this.checked${subClassName};
+ this.${subclassName}List = ${subclassName}List.filter(function(item) {
+ return checked${subClassName}.indexOf(item.index) == -1
+ });
}
},
- /** 鍗曢�夋閫変腑鏁版嵁 */
+ /** 澶嶉�夋閫変腑鏁版嵁 */
handle${subClassName}SelectionChange(selection) {
- if (selection.length > 1) {
- this.$refs.${subclassName}.clearSelection();
- this.$refs.${subclassName}.toggleRowSelection(selection.pop());
- } else {
- this.checked${subClassName} = selection;
- }
+ this.checked${subClassName} = selection.map(item => item.index)
},
#end
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
diff --git a/ruoyi-ui/bin/run-web.bat b/ruoyi-ui/bin/run-web.bat
index a938e89..3e209d7 100644
--- a/ruoyi-ui/bin/run-web.bat
+++ b/ruoyi-ui/bin/run-web.bat
@@ -1,6 +1,6 @@
@echo off
echo.
-echo [信息] 使用 Vue 运行 Web 工程。
+echo [锟斤拷息] 使锟斤拷 Vue CLI 锟斤拷锟斤拷锟斤拷锟斤拷 Web 锟斤拷锟教★拷
echo.
%~d0
@@ -9,4 +9,4 @@
cd ..
npm run dev
-pause
\ No newline at end of file
+pause
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 6530ad4..381264e 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -66,8 +66,8 @@
{
path: 'index',
component: (resolve) => require(['@/views/index'], resolve),
- name: '棣栭〉',
- meta: { title: '棣栭〉', icon: 'dashboard', noCache: true, affix: true }
+ name: 'Index',
+ meta: { title: '棣栭〉', icon: 'dashboard', affix: true }
}
]
},
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index b9b5ad8..7a058e8 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -64,7 +64,7 @@
location.href = '/index';
})
}).catch(() => {});
- return Promise.reject()
+ return Promise.reject('浠ょ墝楠岃瘉澶辫触')
} else if (code === 500) {
Message({
message: msg,
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 31f3379..6339cf4 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -336,7 +336,7 @@
import config from '../../package.json'
export default {
- name: "index",
+ name: "Index",
data() {
return {
// 鐗堟湰鍙�
diff --git a/ruoyi-ui/src/views/system/role/selectUser.vue b/ruoyi-ui/src/views/system/role/selectUser.vue
index 14ae0bb..5a97095 100644
--- a/ruoyi-ui/src/views/system/role/selectUser.vue
+++ b/ruoyi-ui/src/views/system/role/selectUser.vue
@@ -64,7 +64,7 @@
props: {
// 瑙掕壊缂栧彿
roleId: {
- type: Number
+ type: [Number, String]
}
},
data() {
--
Gitblit v1.9.3