From 8964cbe4bdf818d7568ab70c8819e6719ff7d95e Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Mon, 1 Apr 2024 13:58:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=B3=A8=E9=87=8Ainstall?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 164e9c0..f2400d2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,9 +25,9 @@ steps: - npm -v - mkdir -p ./node_modules - export NODE_MODULES_PATH=`pwd`/node_modules - - npm config set registry https://registry.npmmirror.com + # - npm config set registry https://registry.npmmirror.com #- set NODE_OPTIONS=--openssl-legacy-provider - - npm install + # - npm install - npm run build - ls /app/build/$DRONE_REPO_NAME/ - echo $NODE_MODULES_PATH From 1b10b9aa2b86510723071dcd11b35b1923c20dff Mon Sep 17 00:00:00 2001 From: lilinyuan <1084668738@qq.com> Date: Mon, 1 Apr 2024 14:27:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/role/role.js | 8 +++++ src/views/system/role/add.vue | 55 ++++++++++++++++++++++++--------- src/views/system/role/index.vue | 19 ------------ 3 files changed, 48 insertions(+), 34 deletions(-) diff --git a/src/api/role/role.js b/src/api/role/role.js index 6aa7b3d..28a4f7b 100644 --- a/src/api/role/role.js +++ b/src/api/role/role.js @@ -14,6 +14,14 @@ export const getRoleOption = () => { method: "get" }); }; + +export const getTemRoleOption = () => { + return request({ + url: '/admin/role/option/template', + method: "get" + }); +}; + //查询角色信息 export const getRoleDetail = (roleId) => { return request({ diff --git a/src/views/system/role/add.vue b/src/views/system/role/add.vue index 54c750b..7229e15 100644 --- a/src/views/system/role/add.vue +++ b/src/views/system/role/add.vue @@ -2,13 +2,17 @@
- - - - - - - +
+ + +
+
{ @@ -135,6 +141,8 @@ const getInstance = (e) => { const init = async () => { form.value.setValues({state: '1', template: false}) + const res = await getTemRoleOption() + localData.tempRoleOpt = res.data const { data } = await getMenuList() localData.menuData = data } @@ -145,12 +153,25 @@ const getInfo = async () => { data.menuIds.forEach(key=>{ menuTree.value.setChecked(key, true, false) }) - if(route.query.isAdd) { + form.value.setValues(data) +} + +const roleTempChange = async (val) => { + try { + loading.value = true + const { data } = await getRoleDetail(val.value) + data.menuIds.forEach(key=>{ + menuTree.value.setChecked(key, true, false) + }) delete data.roleId delete data.roleName delete data.roleKey + form.value.setValues(data) + loading.value = false + } catch (error) { + loading.value = false } - form.value.setValues(data) + } const filterMenu = (value, data) => { @@ -166,12 +187,8 @@ const checkChange = (data) => { return [...checkedKeys, ...halfCheckedKeys] } -console.log(localData.checkList, 'localData.checkList'); const checkBoxChange = (val) => { - console.log(val, 'val'); - console.log(val.includes('3'), 'val.includes'); localData.checkStrictly = val.includes('3') - console.log(localData.checkStrictly, 'localData.checkStrictly'); let nodes = menuTree.value.store.nodesMap if (val.includes('1')) { for (const node in nodes) { @@ -231,6 +248,14 @@ onMounted( async ()=>{