1015 #30 為什麼後面有卷軸？

pulipulichen · Oct 16, 2019 · 929c484 · 929c484
1 parent 6c507a2
commit 929c484
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 21 deletions.
diff --git a/app/Controllers/Http/Admin/Domain.js b/app/Controllers/Http/Admin/Domain.js
@@ -27,7 +27,9 @@ class Domain {
     //await domains.loadMany(['admins'])
     domains = domains.toJSON()
     domains.forEach(domain => {
-      domain.admins = domain.admins.map(admin => admin.username).join(' ')
+      let admins = domain.admins.map(admin => admin.username)
+      domain.admins = admins.join(' ')
+      domain.adminsCount = admins.length
     })
 
     let count = await DomainModel.getCount()

diff --git a/public/spa/admin-components/domain.js b/public/spa/admin-components/domain.js
diff --git a/public/spa/admin-components/domain.js.map b/public/spa/admin-components/domain.js.map
diff --git a/public/spa/admin.js b/public/spa/admin.js
diff --git a/public/spa/admin.js.map b/public/spa/admin.js.map
diff --git a/webpack-app/admin/components/DomainList/DomainList.html b/webpack-app/admin/components/DomainList/DomainList.html
@@ -66,10 +66,10 @@ <h2>{{ $t('Domain Management') }}</h2>
         </td>
         <td class="center aligned">
           <span class="ui fluid right labeled icon button"
-                v-if="typeof(domain.adminNames) === 'string'"
+                v-if="typeof(domain.admins) === 'string'"
                 v-on:click="editAdminsOpen(domain)">
-            {{ domain.adminNames.split(' ').length }}
-            {{ $t('Admins', domain.admins.split(' ').length) }}
+            {{ domain.adminsCount }}
+            {{ $t('Admins', domain.adminsCount) }}
             <i class="edit icon"></i>
           </span>
         </td>
@@ -103,7 +103,7 @@ <h2>{{ $t('Domain Management') }}</h2>
       <template v-slot:header v-if="editingAdmins" inline-template>
         # {{ editingAdmins.id }}
         {{ editingAdmins.domain }}
-        <template v-if="editingAdmins.title !== ''">
+        <template v-if="editingAdmins.title !== '' && editingAdmins.title !== null">
           ({{ editingAdmins.title }})
         </template>
       </template>

diff --git a/webpack-app/admin/components/DomainList/DomainList.js b/webpack-app/admin/components/DomainList/DomainList.js
@@ -92,11 +92,20 @@ let DomainList = {
     },
      */
     /*
+    countAdmins: function (admins) {
+      if (admins === '') {
+        return 0
+      }
+      else {
+        return admins.split(' ').length
+      }
+    },
+    */
     editAdminsOpen: function (domain) {
+      console.log(domain)
       this.editingAdmins = domain
       this.$refs.ModelEditAdmins.show()
     },
-    */
     editAdmins: async function () {
       console.log('a')
       return

diff --git a/webpack-app/components/Modal/Modal.js b/webpack-app/components/Modal/Modal.js
@@ -13,9 +13,9 @@ let Template = {
   watch: {
   },
   mounted() {
-    setTimeout(() => {
-      this.show()
-    }, 1000)
+    //setTimeout(() => {
+    //  this.show()
+    //}, 1000)
   },
   methods: {
     getModal: function () {