From 7d324db5ae9236347dc5d3aa503afe5d3e9e4dd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Sun, 24 Oct 2021 18:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF=E5=BC=82?=
 =?UTF-8?q?=E6=AD=A5=E8=AF=B7=E6=B1=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Yi.Framework.Model/DbInit/DataSeed.cs     |   2 +-
 Yi.Vue/src/components/ccTable.vue             | 230 +++++++++---------
 Yi.Vue/src/components/ccTreeview.vue          |   2 +-
 Yi.Vue/src/views/AdmRole.vue                  |   4 -
 4 files changed, 118 insertions(+), 120 deletions(-)

diff --git a/Yi.Framework/Yi.Framework.Model/DbInit/DataSeed.cs b/Yi.Framework/Yi.Framework.Model/DbInit/DataSeed.cs
index 5338be75..80fa1f08 100644
--- a/Yi.Framework/Yi.Framework.Model/DbInit/DataSeed.cs
+++ b/Yi.Framework/Yi.Framework.Model/DbInit/DataSeed.cs
@@ -183,7 +183,7 @@ namespace Yi.Framework.Model.DbInit
                                                     menu_name="add",is_show=0,
                                                     mould=new mould()
                                                     {
-                                                        mould_name="del",url="/Mould/addMould"
+                                                        mould_name="add",url="/Mould/addMould"
                                                     }
                                                 }
                                             }
diff --git a/Yi.Vue/src/components/ccTable.vue b/Yi.Vue/src/components/ccTable.vue
index aa241eb4..aa4ae38b 100644
--- a/Yi.Vue/src/components/ccTable.vue
+++ b/Yi.Vue/src/components/ccTable.vue
@@ -1,122 +1,113 @@
 <template>
-    <v-data-table
-      :headers="headers"
-      :items="desserts"
-      sort-by="calories"
-      class="elevation-1"
-      item-key="id"
-      show-select
-      v-model="selected"
-      :search="search"
-    >
-    <slot/>
-      <template v-slot:top>
-        <!-- 搜索框 -->
-        <v-toolbar flat>
-          <v-spacer></v-spacer>
-          <v-text-field
-            v-model="search"
-            append-icon="mdi-magnify"
-            label="搜索"
-            single-line
-            hide-details
-            class="mx-4"
-          ></v-text-field>
+  <v-data-table
+    :headers="headers"
+    :items="desserts"
+    sort-by="calories"
+    class="elevation-1"
+    item-key="id"
+    show-select
+    v-model="selected"
+    :search="search"
+  >
+    <slot />
+    <template v-slot:top>
+      <!-- 搜索框 -->
+      <v-toolbar flat>
+        <v-spacer></v-spacer>
+        <v-text-field
+          v-model="search"
+          append-icon="mdi-magnify"
+          label="搜索"
+          single-line
+          hide-details
+          class="mx-4"
+        ></v-text-field>
 
-          <v-btn
-            v-if="axiosUrls.add!=''"
-            color="primary"
-            dark
-            class="mb-2 mx-2"
-            @click="dialog = true"
-          >
-            添加新项
-          </v-btn>
+        <v-btn
+          v-if="axiosUrls.add != null"
+          color="primary"
+          dark
+          class="mb-2 mx-2"
+          @click="dialog = true"
+        >
+          添加新项
+        </v-btn>
 
-          <!-- 添加提示框 -->
-          <v-dialog
-            v-if="axiosUrls.add!=''"
-            v-model="dialog"
-            max-width="500px"
-          >
-            <v-card>
-              <v-card-title>
-                <span class="headline">{{ formTitle }}</span>
-              </v-card-title>
+        <!-- 添加提示框 -->
+        <v-dialog
+          v-if="axiosUrls.add != null"
+          v-model="dialog"
+          max-width="500px"
+        >
+          <v-card>
+            <v-card-title>
+              <span class="headline">{{ formTitle }}</span>
+            </v-card-title>
 
-              <v-card-text>
-                <v-container>
-                  <v-row>
-                    <v-col
-                      cols="12"
-                      sm="6"
-                      md="4"
-                      v-for="(value, key, index) in editedItem"
-                      :key="index"
-                    >
-                      <v-text-field
-                        v-model="editedItem[key]"
-                        :label="key"
-                      ></v-text-field>
-                    </v-col>
-                  </v-row>
-                </v-container>
-              </v-card-text>
+            <v-card-text>
+              <v-container>
+                <v-row>
+                  <v-col
+                    cols="12"
+                    sm="6"
+                    md="4"
+                    v-for="(value, key, index) in editedItem"
+                    :key="index"
+                  >
+                    <v-text-field
+                      v-model="editedItem[key]"
+                      :label="key"
+                    ></v-text-field>
+                  </v-col>
+                </v-row>
+              </v-container>
+            </v-card-text>
 
-              <v-card-actions>
-                <v-spacer></v-spacer>
-                <v-btn color="blue darken-1" text @click="close"> 取消 </v-btn>
-                <v-btn color="blue darken-1" text @click="save"> 保存 </v-btn>
-              </v-card-actions>
-            </v-card>
-          </v-dialog>
+            <v-card-actions>
+              <v-spacer></v-spacer>
+              <v-btn color="blue darken-1" text @click="close"> 取消 </v-btn>
+              <v-btn color="blue darken-1" text @click="save"> 保存 </v-btn>
+            </v-card-actions>
+          </v-card>
+        </v-dialog>
 
-          <v-btn
-            v-if="axiosUrls.del!=''"
+        <v-btn
+          v-if="axiosUrls.del != null"
           color="secondary"
-           
-            class="mb-2"
-            @click="deleteItem(null)"
-          >
-            删除所选
-          </v-btn>
-        </v-toolbar>
-      </template>
-
-      <!-- 表格中的删除和修改 -->
-      <template v-slot:item.actions="{ item }">
-
-        <slot name="action" :item="item"></slot>
-
-        <v-icon
-          v-if="axiosUrls.update!=''"
-          small
-          class="mr-2"
-          @click="editItem(item)"
+          class="mb-2"
+          @click="deleteItem(null)"
         >
-          mdi-pencil
-        </v-icon>
-        <v-icon
-          v-if="axiosUrls.del!=''"
-          small
-          @click="deleteItem(item)"
-        >
-          mdi-delete
-        </v-icon>
+          删除所选
+        </v-btn>
+      </v-toolbar>
+    </template>
 
+    <!-- 表格中的删除和修改 -->
+    <template v-slot:item.actions="{ item }">
+      <slot name="action" :item="item"></slot>
 
-      </template>
+      <v-icon
+        v-if="axiosUrls.update != null"
+        small
+        class="mr-2"
+        @click="editItem(item)"
+      >
+        mdi-pencil
+      </v-icon>
+      <v-icon v-if="axiosUrls.del != null" small @click="deleteItem(item)">
+        mdi-delete
+      </v-icon>
+    </template>
 
-      <!-- 初始化 -->
-      <template v-slot:no-data>
-        <v-btn color="primary" @click="initialize"> 刷新 </v-btn>
-      </template>
-    </v-data-table>
+    <!-- 初始化 -->
+    <template v-slot:no-data>
+      <v-btn color="primary" @click="initialize"> 刷新 </v-btn>
+    </template>
+  </v-data-table>
 </template>
 <script>
 import itemApi from "./TableApi.js";
 export default {
-  
   name: "ccTable",
   props: {
     defaultItem: {
@@ -146,15 +137,21 @@ export default {
   },
 
   watch: {
-     selected:{
-         handler(val, oldVal){
-              this.$emit("selected",val);
-         },
-         deep:true
-     },
+    axiosUrls: {
+      handler(val, oldVal) {
+        this.dataInit(val.get);
+      },
+      deep: true,
+    },
+    selected: {
+      handler(val, oldVal) {
+        this.$emit("selected", val);
+      },
+      deep: true,
+    },
     dialog(val) {
       val || this.close();
-    }
+    },
   },
 
   created() {
@@ -162,12 +159,17 @@ export default {
   },
 
   methods: {
-    initialize() {
-      itemApi.getItem(this.axiosUrls.get).then((resp) => {
+    dataInit(getStr) {
+      itemApi.getItem(getStr).then((resp) => {
         const response = resp.data;
         this.desserts = response;
       });
-
+    },
+    initialize() {
+      if(this.axiosUrls.get!=undefined && this.axiosUrls.get!=null )
+      {
+         this.dataInit(this.axiosUrls.get)
+      }
       this.$nextTick(() => {
         this.editedItem = Object.assign({}, this.defaultItem);
         this.editedIndex = -1;
diff --git a/Yi.Vue/src/components/ccTreeview.vue b/Yi.Vue/src/components/ccTreeview.vue
index 7b915d65..d9948aa2 100644
--- a/Yi.Vue/src/components/ccTreeview.vue
+++ b/Yi.Vue/src/components/ccTreeview.vue
@@ -58,7 +58,7 @@
         <v-btn  v-if="item.mould" class="mr-2">接口地址:{{ item.mould.url }}</v-btn>
         <ccCombobox
           headers="设置接口权限"
-          itemText="mould_name"
+          itemText="url"
           :items="mouldList"
           @select="getSelect"
         >
diff --git a/Yi.Vue/src/views/AdmRole.vue b/Yi.Vue/src/views/AdmRole.vue
index 935dd5c9..e48fe455 100644
--- a/Yi.Vue/src/views/AdmRole.vue
+++ b/Yi.Vue/src/views/AdmRole.vue
@@ -28,10 +28,6 @@ export default {
   data: () => ({
     start: true,
     axiosUrls: {
-      // get: "role/getrole",
-      // update: "role/updaterole",
-      // del: "role/delListrole",
-      // add: "role/addrole",
     },
     headers: [
       { text: "编号", align: "start", value: "id" },