From b643076f730a26e0a7382959b64d7c5d867ae2f2 Mon Sep 17 00:00:00 2001
From: duwei <905571995@qq.com>
Date: Fri, 5 Mar 2021 16:50:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=9C=A8=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E9=A1=B5=E7=BC=96=E8=BE=91column=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugin/components/form/dialog.vue       |  2 +-
 src/plugin/components/source-page/index.vue | 20 +++++--
 src/plugin/components/source-page/table.vue |  2 +
 src/plugin/components/table.vue             | 61 ++++++++++++++++++---
 src/plugin/styles/table.scss                |  6 ++
 5 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/src/plugin/components/form/dialog.vue b/src/plugin/components/form/dialog.vue
index 310cb25b..a67ce660 100644
--- a/src/plugin/components/form/dialog.vue
+++ b/src/plugin/components/form/dialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <div @click="handleShowDialog">
+  <div @click.stop="handleShowDialog">
     <slot />
     <el-dialog
       :visible="visible"
diff --git a/src/plugin/components/source-page/index.vue b/src/plugin/components/source-page/index.vue
index 6d175b36..fc845379 100644
--- a/src/plugin/components/source-page/index.vue
+++ b/src/plugin/components/source-page/index.vue
@@ -11,6 +11,7 @@
       :table-events="tablePageEvents"
       :table-props="tableProps"
       :action-column-props="actionColumnProps"
+      :on-table-cell-form-submit="handleTableCellFormSubmit"
       ref="tablePage"
     >
       <template #after-filter>
@@ -49,7 +50,7 @@
       :columns="sourcePageFormColumns"
       :loading="formLoading"
       v-model="state.data"
-      @submit="handleSubmit"
+      @submit="handleFormPageSubmit"
     >
       <template v-slot:action="{ value }">
         <slot name="form-action" :value="value" />
@@ -285,10 +286,19 @@ export default class AdminSourcePage extends Vue {
     }
   }
 
-  async handleSubmit(data) {
+  handleTableCellFormSubmit({ data, scope }) {
+    const originData = scope.row;
+    return this.handleSubmit({ data: { id: originData.id, ...data }, originData });
+  }
+
+  handleFormPageSubmit(data) {
+    return this.handleSubmit({ data });
+  }
+
+  async handleSubmit({ data, originData = this.originData, state = this.state } = {}) {
     try {
       this.formLoading = true;
-      const hookParams = { data, originData: this.originData, state: this.state, type: this.type, resource: this.resource, namespace: this.namespace };
+      const hookParams = { data, originData, state, type: this.type, resource: this.resource, namespace: this.namespace };
       if (_.isFunction(this.onFormSubmit)) {
         await this.onFormSubmit(hookParams);
       } else {
@@ -305,7 +315,9 @@ export default class AdminSourcePage extends Vue {
         if (_.isFunction(this.afterSubmit)) {
           this.afterSubmit(hookParams, newData)
         } else {
-          this.$router.push({ name: `${this.resource}.show`, params: { id: data.id } });
+          if (this.type !== 'index') {
+            this.$router.push({ name: `${this.resource}.show`, params: { id: data.id } });
+          }
         }
       }
     } finally {
diff --git a/src/plugin/components/source-page/table.vue b/src/plugin/components/source-page/table.vue
index 0642b331..5af0a76c 100644
--- a/src/plugin/components/source-page/table.vue
+++ b/src/plugin/components/source-page/table.vue
@@ -22,6 +22,7 @@
           :actions="actions"
           :action-column-props="actionColumnProps"
           :default-sort="defaultSort"
+          :on-table-cell-form-submit="onTableCellFormSubmit"
           @sort-change="handleSortChange"
         />
       </div>
@@ -62,6 +63,7 @@ export default class AdminSourcePageTable extends Vue {
   @Prop({ type: Object, default: () => ({}) }) filterProps;
   @Prop({ type: Object, default: () => ({}) }) paginationProps;
   @Prop({ type: Object, default: () => ({}) }) tableEvents;
+  @Prop({ type: Function, default: _.noop }) onTableCellFormSubmit;
 
   filterForm = {};
   defaultSort = {};
diff --git a/src/plugin/components/table.vue b/src/plugin/components/table.vue
index 04f5d94e..fe29c466 100644
--- a/src/plugin/components/table.vue
+++ b/src/plugin/components/table.vue
@@ -1,6 +1,7 @@
 <script>
 import { Vue, Component, Prop } from 'vue-property-decorator';
 import _ from 'lodash';
+import DialogForm from './form/dialog';
 
 @Component
 export default class AdminTable extends Vue {
@@ -8,6 +9,7 @@ export default class AdminTable extends Vue {
   @Prop({ type: Array, default: () => [] }) value;
   @Prop({ type: [Function, Array] }) actions;
   @Prop({ type: Object, default: () => ({}) }) actionColumnProps;
+  @Prop({ type: Function, default: _.noop }) onTableCellFormSubmit;
 
   get actionColumn() {
     const ColumnRender = require('./column-render').default;
@@ -60,22 +62,65 @@ export default class AdminTable extends Vue {
     ));
   }
 
+  renderCellForm({ column, scope }) {
+    const formColumn = _.isFunction(column.form) ? column.form(scope) : column.form;
+    if (formColumn) {
+      const formColumns = [
+        {
+          prop: column.prop,
+          label: column.label,
+          ...formColumn
+        }
+      ];
+      const submitHandler = async (data) => {
+        if (_.isFunction(formColumn.submitHandler)) {
+          await formColumn.submitHandler({ data, scope })
+        } else {
+          await this.onTableCellFormSubmit({ data, scope });
+        }
+        Object.assign(scope.row, data);
+      }
+      return (
+        <DialogForm
+          columns={formColumns}
+          value={_.pick(scope.row, column.prop)}
+          title={column.label}
+          submitHandler={submitHandler}
+          label-position="top"
+        >
+          <el-button
+            icon="el-icon-edit"
+            size="mini"
+            style="margin-left: 5px; padding: 4px"
+            circle
+          />
+        </DialogForm>
+      )
+    }
+    return null;
+  }
+
   renderCell(column) {
     const ColumnRender = require('./column-render').default;
     return scope => {
-      return <ColumnRender
-        key={column.prop}
-        value={_.get(scope.row, column.prop)}
-        scope={scope}
-        column={column}
-        renderCell={column.renderCell}
-      />
+      return (
+        <div class="table-cell">
+          <ColumnRender
+            key={column.prop}
+            value={_.get(scope.row, column.prop)}
+            scope={scope}
+            column={column}
+            renderCell={column.renderCell || (() => <span>{_.get(scope, `row.${column.prop}`, '/')}</span>)}
+          />
+          {this.renderCellForm({ column, scope })}
+        </div>
+      )
     }
   }
 
   renderTableColumn(column) {
     const scopedSlots = {};
-    if (column.renderCell) {
+    if (column.prop) {
       scopedSlots.default = this.renderCell(column);
     }
     return (
diff --git a/src/plugin/styles/table.scss b/src/plugin/styles/table.scss
index a65d0a93..8d8106a2 100644
--- a/src/plugin/styles/table.scss
+++ b/src/plugin/styles/table.scss
@@ -53,5 +53,11 @@
         margin-bottom: 10px;
       }
     }
+
+    .table-cell {
+      display: inline-flex;
+      align-items: center;
+      flex-wrap: wrap;
+    }
   }
 }