From caad5950f67e8ca158892cdb47c1b3ffe4b5128c Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Wed, 10 Jun 2020 18:28:35 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[Update]=20=E7=94=A8=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=80=E9=80=89=EF=BC=88Dialog=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GenericUpdateFormDialog/index.vue         | 92 +++++++++++++++++++
 src/layout/components/index.js                |  2 +
 src/views/users/User/UserList.vue             | 50 +++++++++-
 3 files changed, 142 insertions(+), 2 deletions(-)
 create mode 100644 src/layout/components/GenericUpdateFormDialog/index.vue

diff --git a/src/layout/components/GenericUpdateFormDialog/index.vue b/src/layout/components/GenericUpdateFormDialog/index.vue
new file mode 100644
index 000000000..69dd7a186
--- /dev/null
+++ b/src/layout/components/GenericUpdateFormDialog/index.vue
@@ -0,0 +1,92 @@
+<template>
+  <Dialog
+    v-if="dialogSetting.dialogVisible"
+    :title="this.$t('common.updateSelected')"
+    :visible.sync="dialogSetting.dialogVisible"
+    width="70%"
+    top="1vh"
+    :show-cancel="false"
+    :show-confirm="false"
+  >
+    <GenericCreateUpdateForm
+      v-bind="iFormSetting"
+    />
+  </Dialog>
+</template>
+
+<script>
+import Dialog from '@/components/Dialog'
+import { GenericCreateUpdateForm } from '@/layout/components'
+
+export default {
+  name: 'GenericUpdateFormDialog',
+  components: {
+    Dialog, GenericCreateUpdateForm
+  },
+  props: {
+    selectedRows: {
+      type: Array,
+      default: () => ([])
+    },
+    dialogSetting: {
+      type: Object,
+      default: () => ({})
+    },
+    formSetting: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data: function() {
+    return {
+      iFormSetting: {}
+    }
+  },
+  mounted() {
+    const defaultFormSetting = this.getDefaultFormSetting()
+    this.iFormSetting = Object.assign({}, this.formSetting, defaultFormSetting)
+  },
+  methods: {
+    getDefaultFormSetting() {
+      const vm = this
+      return {
+        getMethod: () => 'post',
+        cleanFormValue: function(value) {
+          const newValue = []
+          let object = {}
+          for (const row of vm.selectedRows) {
+            object = Object.assign({}, value, { id: row.id })
+            newValue.push(object)
+          }
+          return newValue
+        },
+        onSubmit: function(validValues) {
+          const url = this.url
+          const msg = this.updateSuccessMsg
+          this.$axios.patch(url, validValues).then((res) => {
+            this.$message.success(msg)
+            vm.dialogSetting.dialogVisible = false
+          }).catch(error => {
+            this.$emit('submitError', error)
+            const response = error.response
+            const data = response.data
+            if (response.status === 400) {
+              for (const key of Object.keys(data)) {
+                let value = data[key]
+                if (value instanceof Array) {
+                  value = value.join(';')
+                }
+                this.$refs.form.setFieldError(key, value)
+              }
+            }
+          })
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/layout/components/index.js b/src/layout/components/index.js
index aec0a083a..f1d3e232e 100644
--- a/src/layout/components/index.js
+++ b/src/layout/components/index.js
@@ -8,3 +8,5 @@ export { default as TabPage } from './TabPage'
 export { default as Footer } from './Footer'
 export { default as GenericListPage } from './GenericListPage'
 export { default as GenericCreateUpdatePage } from './GenericCreateUpdatePage'
+export { default as GenericCreateUpdateForm } from './GenericCreateUpdateForm'
+export { default as GenericUpdateFormDialog } from './GenericUpdateFormDialog'
diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue
index 33008f724..b28840171 100644
--- a/src/views/users/User/UserList.vue
+++ b/src/views/users/User/UserList.vue
@@ -1,18 +1,28 @@
 <template>
-  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+  <div>
+    <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+    <GenericUpdateFormDialog
+      :selected-rows="selectedRows"
+      :form-setting="updateSelectedDialogSetting.formSetting"
+      :dialog-setting="updateSelectedDialogSetting.dialogSetting"
+    />
+  </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
 import { GenericListPage } from '@/layout/components'
+import { GenericUpdateFormDialog } from '@/layout/components'
 
 export default {
   components: {
-    GenericListPage
+    GenericListPage,
+    GenericUpdateFormDialog
   },
   data() {
     const vm = this
     return {
+      selectedRows: [],
       tableConfig: {
         url: '/api/v1/users/users/',
         columns: [
@@ -82,8 +92,44 @@ export default {
                 reloadTable()
               })
             }
+          },
+          {
+            name: 'updateSelected',
+            title: this.$t('common.updateSelected'),
+            can: ({ selectedRows }) => selectedRows.length > 0,
+            callback: ({ selectedRows, reloadTable }) => {
+              vm.updateSelectedDialogSetting.dialogSetting.dialogVisible = true
+              vm.selectedRows = selectedRows
+            }
           }
         ]
+      },
+      updateSelectedDialogSetting: {
+        dialogSetting: {
+          dialogVisible: false
+        },
+        formSetting: {
+          initial: {
+            date_expired: '2099-12-31 00:00:00 +0800'
+          },
+          fields: [
+            [this.$t('users.Account'), ['groups']],
+            [this.$t('users.Secure'), ['date_expired']],
+            [this.$t('common.Other'), ['comment']]
+          ],
+          url: '/api/v1/users/users/',
+          fieldsMeta: {
+            groups: {
+              el: {
+                multiple: true,
+                ajax: {
+                  url: '/api/v1/users/groups/'
+                },
+                value: []
+              }
+            }
+          }
+        }
       }
     }
   },

From 52a0ae0c25c23b7d7d151a8a0b5481460eb3c54d Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Wed, 10 Jun 2020 18:50:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[Update]=20=E8=B5=84=E4=BA=A7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=89=80=E9=80=89=EF=BC=88Dialog=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Asset/AssetList.vue | 76 +++++++++++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)

diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue
index 0bef346ed..53d316eeb 100644
--- a/src/views/assets/Asset/AssetList.vue
+++ b/src/views/assets/Asset/AssetList.vue
@@ -53,6 +53,11 @@
         />
       </Dialog>
     </div>
+    <GenericUpdateFormDialog
+      :selected-rows="selectedRows"
+      :form-setting="updateSelectedDialogSetting.formSetting"
+      :dialog-setting="updateSelectedDialogSetting.dialogSetting"
+    />
   </div>
 </template>
 
@@ -62,15 +67,19 @@ import { DetailFormatter, ActionsFormatter, BooleanFormatter } from '@/component
 import $ from '@/utils/jquery-vendor'
 import Dialog from '@/components/Dialog'
 import TreeTable from '@/components/TreeTable'
+import { GenericUpdateFormDialog } from '@/layout/components'
 
 export default {
   components: {
     GenericTreeListPage,
     Dialog,
-    TreeTable
+    TreeTable,
+    GenericUpdateFormDialog
   },
   data() {
+    const vm = this
     return {
+      selectedRows: [],
       treeSetting: {
         showMenu: true,
         showRefresh: true,
@@ -170,6 +179,15 @@ export default {
               })
             }.bind(this)
           },
+          {
+            name: 'updateSelected',
+            title: this.$t('common.updateSelected'),
+            can: ({ selectedRows }) => selectedRows.length > 0,
+            callback: ({ selectedRows, reloadTable }) => {
+              vm.updateSelectedDialogSetting.dialogSetting.dialogVisible = true
+              vm.selectedRows = selectedRows
+            }
+          },
           {
             name: 'RemoveFromCurrentNode',
             title: this.$t('assets.RemoveFromCurrentNode'),
@@ -250,6 +268,62 @@ export default {
           hasLeftActions: false,
           hasRightActions: false
         }
+      },
+      updateSelectedDialogSetting: {
+        dialogSetting: {
+          dialogVisible: false
+        },
+        formSetting: {
+          url: '/api/v1/assets/assets/',
+          initial: {
+            platform: 'Linux'
+          },
+          fields: [
+            [this.$t('assets.Basic'), ['platform', 'domain']],
+            [this.$t('assets.Auth'), ['admin_user']],
+            [this.$t('assets.Label'), ['labels']],
+            [this.$t('assets.Other'), ['comment']]
+          ],
+          fieldsMeta: {
+            platform: {
+              el: {
+                multiple: false,
+                ajax: {
+                  url: '/api/v1/assets/platforms/',
+                  transformOption: (item) => {
+                    return { label: `${item.name}`, value: item.name }
+                  }
+                }
+              }
+            },
+            domain: {
+              el: {
+                multiple: false,
+                ajax: {
+                  url: '/api/v1/assets/domains/'
+                }
+              }
+            },
+            admin_user: {
+              el: {
+                multiple: false,
+                ajax: {
+                  url: '/api/v1/assets/admin-users/',
+                  transformOption: (item) => {
+                    return { label: `${item.name}(${item.username})`, value: item.id }
+                  }
+                }
+              }
+            },
+            labels: {
+              el: {
+                ajax: {
+                  url: '/api/v1/assets/labels/'
+                }
+              }
+            }
+          }
+        }
       }
     }
   },

From fe939f3baa6093f2a77582477eb08b1f5892d1cb Mon Sep 17 00:00:00 2001
From: Bai <bugatti_it@163.com>
Date: Thu, 11 Jun 2020 12:23:59 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assets/Asset/AssetList.vue | 6 +++---
 src/views/users/User/UserList.vue    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/assets/Asset/AssetList.vue b/src/views/assets/Asset/AssetList.vue
index 53d316eeb..f3686e199 100644
--- a/src/views/assets/Asset/AssetList.vue
+++ b/src/views/assets/Asset/AssetList.vue
@@ -54,7 +54,7 @@
       </Dialog>
     </div>
     <GenericUpdateFormDialog
-      :selected-rows="selectedRows"
+      :selected-rows="updateSelectedDialogSetting.selectedRows"
       :form-setting="updateSelectedDialogSetting.formSetting"
       :dialog-setting="updateSelectedDialogSetting.dialogSetting"
     />
@@ -79,7 +79,6 @@ export default {
   data() {
     const vm = this
     return {
-      selectedRows: [],
       treeSetting: {
         showMenu: true,
         showRefresh: true,
@@ -185,7 +184,7 @@ export default {
             can: ({ selectedRows }) => selectedRows.length > 0,
             callback: ({ selectedRows, reloadTable }) => {
               vm.updateSelectedDialogSetting.dialogSetting.dialogVisible = true
-              vm.selectedRows = selectedRows
+              vm.updateSelectedDialogSetting.selectedRows = selectedRows
             }
           },
           {
@@ -270,6 +269,7 @@ export default {
         }
       },
       updateSelectedDialogSetting: {
+        selectedRows: [],
         dialogSetting: {
           dialogVisible: false
         },
diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue
index b28840171..00f2d8357 100644
--- a/src/views/users/User/UserList.vue
+++ b/src/views/users/User/UserList.vue
@@ -2,7 +2,7 @@
   <div>
     <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
     <GenericUpdateFormDialog
-      :selected-rows="selectedRows"
+      :selected-rows="updateSelectedDialogSetting.selectedRows"
       :form-setting="updateSelectedDialogSetting.formSetting"
       :dialog-setting="updateSelectedDialogSetting.dialogSetting"
     />
@@ -22,7 +22,6 @@ export default {
   data() {
     const vm = this
     return {
-      selectedRows: [],
       tableConfig: {
         url: '/api/v1/users/users/',
         columns: [
@@ -99,12 +98,13 @@ export default {
             can: ({ selectedRows }) => selectedRows.length > 0,
             callback: ({ selectedRows, reloadTable }) => {
               vm.updateSelectedDialogSetting.dialogSetting.dialogVisible = true
-              vm.selectedRows = selectedRows
+              vm.updateSelectedDialogSetting.selectedRows = selectedRows
             }
           }
         ]
       },
       updateSelectedDialogSetting: {
+        selectedRows: [],
         dialogSetting: {
           dialogVisible: false
         },