From ab2531369c52c9e573d17cd9b669f91f0c4fe8ad Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Sun, 12 Apr 2020 16:21:40 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E9=87=87=E7=94=A8=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=ACAPI=E8=8E=B7=E5=8F=96column=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/authority/role.vue         |  3 ++-
 src/views/resource/oss.vue           |  3 ++-
 src/views/system/dept.vue            |  3 ++-
 src/views/system/dict.vue            |  3 ++-
 src/views/system/dictbiz.vue         |  3 ++-
 src/views/system/menu.vue            |  3 ++-
 src/views/system/user.vue            | 12 ++++++++----
 src/views/util/demo/dict-classic.vue |  3 ++-
 8 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index 1d4d13e..aa4ee51 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -229,7 +229,8 @@
     },
     mounted() {
       getRoleTree().then(res => {
-        this.option.column[3].dicData = res.data.data;
+        const column = this.findObject(this.option.column, "parentId");
+        column.dicData = res.data.data;
       });
     },
     methods: {
diff --git a/src/views/resource/oss.vue b/src/views/resource/oss.vue
index 8d949ce..b626307 100644
--- a/src/views/resource/oss.vue
+++ b/src/views/resource/oss.vue
@@ -248,7 +248,8 @@
         });
       },
       'debugForm.code'() {
-        this.debugOption.column[1].action = `/api/blade-resource/oss/endpoint/put-file?code=${this.debugForm.code}`;
+        const column = this.findObject(this.debugOption.column, "backgroundUrl");
+        column.action = `/api/blade-resource/oss/endpoint/put-file?code=${this.debugForm.code}`;
       }
     },
     computed: {
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index dff9c1a..d1f60b8 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -210,7 +210,8 @@
     methods: {
       initData() {
         getDeptTree().then(res => {
-          this.option.column[3].dicData = res.data.data;
+          const column = this.findObject(this.option.column, "parentId");
+          column.dicData = res.data.data;
         });
       },
       handleAdd(row) {
diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue
index 43fd0d5..6472666 100644
--- a/src/views/system/dict.vue
+++ b/src/views/system/dict.vue
@@ -158,7 +158,8 @@
     },
     mounted() {
       getDictTree().then(res => {
-        this.optionChild.column[2].dicData = res.data.data;
+        const column = this.findObject(this.optionChild.column, "parentId");
+        column.dicData = res.data.data;
       });
     },
     methods: {
diff --git a/src/views/system/dictbiz.vue b/src/views/system/dictbiz.vue
index 1088e8e..2790f6a 100644
--- a/src/views/system/dictbiz.vue
+++ b/src/views/system/dictbiz.vue
@@ -158,7 +158,8 @@
     },
     mounted() {
       getDictTree().then(res => {
-        this.optionChild.column[2].dicData = res.data.data;
+        const column = this.findObject(this.optionChild.column, "parentId");
+        column.dicData = res.data.data;
       });
     },
     methods: {
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 1e51845..4c38629 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -243,7 +243,8 @@
     methods: {
       initData() {
         getMenuTree().then(res => {
-          this.option.column[2].dicData = res.data.data;
+          const column = this.findObject(this.option.column, "parentId");
+          column.dicData = res.data.data;
         });
       },
       handleAdd(row) {
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 32b8a79..2eb8510 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -494,7 +494,8 @@
       },
       'excelForm.isCovered'() {
         if (this.excelForm.isCovered !== '') {
-          this.excelOption.column[0].action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
+          const column = this.findObject(this.excelOption.column, "excelFile");
+          column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
         }
       }
     },
@@ -524,13 +525,16 @@
       },
       initData(tenantId) {
         getRoleTree(tenantId).then(res => {
-          this.option.group[2].column[1].dicData = res.data.data;
+          const column = this.findObject(this.option.group, "roleId");
+          column.dicData = res.data.data;
         });
         getDeptTree(tenantId).then(res => {
-          this.option.group[2].column[2].dicData = res.data.data;
+          const column = this.findObject(this.option.group, "deptId");
+          column.dicData = res.data.data;
         });
         getPostList(tenantId).then(res => {
-          this.option.group[2].column[3].dicData = res.data.data;
+          const column = this.findObject(this.option.group, "postId");
+          column.dicData = res.data.data;
         });
       },
       submitRole() {
diff --git a/src/views/util/demo/dict-classic.vue b/src/views/util/demo/dict-classic.vue
index fb310b3..390b4d8 100644
--- a/src/views/util/demo/dict-classic.vue
+++ b/src/views/util/demo/dict-classic.vue
@@ -203,7 +203,8 @@
     },
     mounted() {
       getDictTree().then(res => {
-        this.optionChild.column[2].dicData = res.data.data;
+        const column = this.findObject(this.optionChild.column, "parentId");
+        column.dicData = res.data.data;
       });
     },
     methods: {