From a41311327c661661f32d2e34ab8460ca09c7a625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Fri, 30 Apr 2021 17:26:03 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9F=A5=E8=AF=A2=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E5=86=99=E5=85=A5=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/public/doc-code/seed/query.vue           | 25 ++++----
 Web/public/doc-code/seed/treeLayout.vue      | 63 +++++++++-----------
 Web/src/components/yoTable/index.js          | 30 +++++++++-
 Web/src/pages/system/_seed/index.vue         | 25 ++++----
 Web/src/pages/system/_seed/treeLayout.vue    | 63 +++++++++-----------
 Web/src/pages/system/dict/dictdata/index.vue | 36 +++++------
 Web/src/pages/system/dict/index.vue          | 36 +++++------
 Web/src/pages/system/doc/seed/query.vue      |  2 +-
 Web/src/pages/system/doc/seed/treeLayout.vue |  2 +-
 9 files changed, 138 insertions(+), 144 deletions(-)

diff --git a/Web/public/doc-code/seed/query.vue b/Web/public/doc-code/seed/query.vue
index 72123fe..a98cd27 100644
--- a/Web/public/doc-code/seed/query.vue
+++ b/Web/public/doc-code/seed/query.vue
@@ -2,21 +2,16 @@
   <container>
     <br />
     <a-card :bordered="false">
-      <Auth auth="authCode:page">
-        <div class="yo-query-bar">
-          <a-form-model :model="query" layout="inline">
-            <!-- 此处添加查询表单控件 -->
-            <a-form-model-item>
-              <a-button-group>
-                <a-button @click="onQuery" type="primary">查询</a-button>
-                <a-button @click="onResetQuery">重置</a-button>
-              </a-button-group>
-            </a-form-model-item>
-          </a-form-model>
-        </div>
-      </Auth>
-
-      <yo-table :columns="columns" :load-data="loadData" ref="table">
+      <yo-table
+        :columns="columns"
+        :load-data="loadData"
+        @query="onQuery"
+        @resetQuery="onResetQuery"
+        ref="table"
+      >
+        <Auth auth="authCode:page" slot="query">
+          <!-- 此处添加查询表单控件 -->
+        </Auth>
         <Auth auth="authCode:add" slot="operator">
           <a-button @click="onOpen('add-form')" icon="plus">新增XX</a-button>
         </Auth>
diff --git a/Web/public/doc-code/seed/treeLayout.vue b/Web/public/doc-code/seed/treeLayout.vue
index 53f84bb..6a25b33 100644
--- a/Web/public/doc-code/seed/treeLayout.vue
+++ b/Web/public/doc-code/seed/treeLayout.vue
@@ -7,40 +7,35 @@
   >
     <container>
       <a-card :bordered="false">
-        <Auth auth="authCode:page">
-          <div class="yo-query-bar">
-            <a-form-model :model="query" layout="inline">
-              <!-- 此处添加查询表单控件 -->
-              <a-form-model-item>
-                <a-button-group>
-                  <a-button @click="onQuery" type="primary">查询</a-button>
-                  <a-button @click="onReset">重置</a-button>
-                </a-button-group>
-              </a-form-model-item>
-            </a-form-model>
-          </div>
-
-          <yo-table :columns="columns" :load-data="loadData" ref="table">
-            <Auth auth="authCode:add" slot="operator">
-              <a-button @click="onOpen('add-form')" icon="plus">新增机构</a-button>
-            </Auth>
-            <!-- 格式化字段内容 -->
-            <!-- 添加操作控件 -->
-            <span slot="action" slot-scope="text, record">
-              <yo-table-actions>
-                <Auth auth="authCode:edit">
-                  <a @click="onOpen('edit-form', record)">编辑</a>
-                </Auth>
-                <Auth auth="authCode:delete">
-                  <a-popconfirm @confirm="onDelete(record)" placement="topRight" title="是否确认删除">
-                    <a>删除</a>
-                  </a-popconfirm>
-                </Auth>
-                <!-- 可在此处添加其他操作控件 -->
-              </yo-table-actions>
-            </span>
-          </yo-table>
-        </Auth>
+        <yo-table
+          :columns="columns"
+          :load-data="loadData"
+          @query="onQuery"
+          @resetQuery="onResetQuery"
+          ref="table"
+        >
+          <Auth auth="authCode:page" slot="query">
+            <!-- 此处添加查询表单控件 -->
+          </Auth>
+          <Auth auth="authCode:add" slot="operator">
+            <a-button @click="onOpen('add-form')" icon="plus">新增机构</a-button>
+          </Auth>
+          <!-- 格式化字段内容 -->
+          <!-- 添加操作控件 -->
+          <span slot="action" slot-scope="text, record">
+            <yo-table-actions>
+              <Auth auth="authCode:edit">
+                <a @click="onOpen('edit-form', record)">编辑</a>
+              </Auth>
+              <Auth auth="authCode:delete">
+                <a-popconfirm @confirm="onDelete(record)" placement="topRight" title="是否确认删除">
+                  <a>删除</a>
+                </a-popconfirm>
+              </Auth>
+              <!-- 可在此处添加其他操作控件 -->
+            </yo-table-actions>
+          </span>
+        </yo-table>
       </a-card>
     </container>
     <add-form @ok="onReloadData" ref="add-form" />
diff --git a/Web/src/components/yoTable/index.js b/Web/src/components/yoTable/index.js
index 9b80819..b806b40 100644
--- a/Web/src/components/yoTable/index.js
+++ b/Web/src/components/yoTable/index.js
@@ -151,6 +151,15 @@ export default {
       })
       return data
     },
+
+    onQuery() {
+      this.$emit('query')
+    },
+
+    onResetQuery() {
+      this.$emit('resetQuery')
+      this.$emit('reset-query')
+    }
   },
 
   render() {
@@ -169,16 +178,33 @@ export default {
       change: this.onTableChange,
       ...this.$listeners
     }
+
+    const queryOn = {
+      'submit.native.prevent': () => { }
+    }
+
     return (
       <section>
         <a-alert type="warning" closable>
           <template slot="message">
-            后端没有排序参数
-             <br />
             字段固定应该遵循左侧固定到最左,右侧固定到最右(此逻辑难以实现)
             </template>
         </a-alert>
         <br />
+        {
+          this.$scopedSlots.query &&
+          <div class="yo-query-bar">
+            <a-form-model layout="inline" {...{ on: queryOn }}>
+              {this.$scopedSlots.query()}
+              <a-form-model-item>
+                <a-button-group>
+                  <a-button onClick={this.onQuery} html-type="submit" type="primary">查询</a-button>
+                  <a-button onClick={this.onResetQuery}>重置</a-button>
+                </a-button-group>
+              </a-form-model-item>
+            </a-form-model>
+          </div>
+        }
         <div class="yo-action-bar">
           <div class="yo-action-bar--actions">
             {this.$scopedSlots.operator && this.$scopedSlots.operator()}
diff --git a/Web/src/pages/system/_seed/index.vue b/Web/src/pages/system/_seed/index.vue
index b189e3e..07a3d7e 100644
--- a/Web/src/pages/system/_seed/index.vue
+++ b/Web/src/pages/system/_seed/index.vue
@@ -2,21 +2,16 @@
   <container>
     <br />
     <a-card :bordered="false">
-      <Auth auth="authCode:page">
-        <div class="yo-query-bar">
-          <a-form-model :model="query" layout="inline">
-            <!-- 此处添加查询表单控件 -->
-            <a-form-model-item>
-              <a-button-group>
-                <a-button @click="onQuery" type="primary">查询</a-button>
-                <a-button @click="onResetQuery">重置</a-button>
-              </a-button-group>
-            </a-form-model-item>
-          </a-form-model>
-        </div>
-      </Auth>
-
-      <yo-table :columns="columns" :load-data="loadData" ref="table">
+      <yo-table
+        :columns="columns"
+        :load-data="loadData"
+        @query="onQuery"
+        @resetQuery="onResetQuery"
+        ref="table"
+      >
+        <Auth auth="authCode:page" slot="query">
+          <!-- 此处添加查询表单控件 -->
+        </Auth>
         <Auth auth="authCode:add" slot="operator">
           <a-button @click="onOpen('add-form')" icon="plus">新增XX</a-button>
         </Auth>
diff --git a/Web/src/pages/system/_seed/treeLayout.vue b/Web/src/pages/system/_seed/treeLayout.vue
index 53f84bb..6a25b33 100644
--- a/Web/src/pages/system/_seed/treeLayout.vue
+++ b/Web/src/pages/system/_seed/treeLayout.vue
@@ -7,40 +7,35 @@
   >
     <container>
       <a-card :bordered="false">
-        <Auth auth="authCode:page">
-          <div class="yo-query-bar">
-            <a-form-model :model="query" layout="inline">
-              <!-- 此处添加查询表单控件 -->
-              <a-form-model-item>
-                <a-button-group>
-                  <a-button @click="onQuery" type="primary">查询</a-button>
-                  <a-button @click="onReset">重置</a-button>
-                </a-button-group>
-              </a-form-model-item>
-            </a-form-model>
-          </div>
-
-          <yo-table :columns="columns" :load-data="loadData" ref="table">
-            <Auth auth="authCode:add" slot="operator">
-              <a-button @click="onOpen('add-form')" icon="plus">新增机构</a-button>
-            </Auth>
-            <!-- 格式化字段内容 -->
-            <!-- 添加操作控件 -->
-            <span slot="action" slot-scope="text, record">
-              <yo-table-actions>
-                <Auth auth="authCode:edit">
-                  <a @click="onOpen('edit-form', record)">编辑</a>
-                </Auth>
-                <Auth auth="authCode:delete">
-                  <a-popconfirm @confirm="onDelete(record)" placement="topRight" title="是否确认删除">
-                    <a>删除</a>
-                  </a-popconfirm>
-                </Auth>
-                <!-- 可在此处添加其他操作控件 -->
-              </yo-table-actions>
-            </span>
-          </yo-table>
-        </Auth>
+        <yo-table
+          :columns="columns"
+          :load-data="loadData"
+          @query="onQuery"
+          @resetQuery="onResetQuery"
+          ref="table"
+        >
+          <Auth auth="authCode:page" slot="query">
+            <!-- 此处添加查询表单控件 -->
+          </Auth>
+          <Auth auth="authCode:add" slot="operator">
+            <a-button @click="onOpen('add-form')" icon="plus">新增机构</a-button>
+          </Auth>
+          <!-- 格式化字段内容 -->
+          <!-- 添加操作控件 -->
+          <span slot="action" slot-scope="text, record">
+            <yo-table-actions>
+              <Auth auth="authCode:edit">
+                <a @click="onOpen('edit-form', record)">编辑</a>
+              </Auth>
+              <Auth auth="authCode:delete">
+                <a-popconfirm @confirm="onDelete(record)" placement="topRight" title="是否确认删除">
+                  <a>删除</a>
+                </a-popconfirm>
+              </Auth>
+              <!-- 可在此处添加其他操作控件 -->
+            </yo-table-actions>
+          </span>
+        </yo-table>
       </a-card>
     </container>
     <add-form @ok="onReloadData" ref="add-form" />
diff --git a/Web/src/pages/system/dict/dictdata/index.vue b/Web/src/pages/system/dict/dictdata/index.vue
index 42f8efd..320a474 100644
--- a/Web/src/pages/system/dict/dictdata/index.vue
+++ b/Web/src/pages/system/dict/dictdata/index.vue
@@ -1,26 +1,20 @@
 <template>
   <a-card>
-    <Auth auth="sysDictData:page">
-      <div class="yo-query-bar">
-        <a-form-model :model="query" layout="inline">
-          <!-- 此处添加查询表单控件 -->
-          <a-form-model-item label="文本">
-            <a-input placeholder="请输入文本" v-model="query.value" />
-          </a-form-model-item>
-          <a-form-model-item label="字典值">
-            <a-input placeholder="请输入字典值" v-model="query.code" />
-          </a-form-model-item>
-          <a-form-model-item>
-            <a-button-group>
-              <a-button @click="onQuery" type="primary">查询</a-button>
-              <a-button @click="onResetQuery">重置</a-button>
-            </a-button-group>
-          </a-form-model-item>
-        </a-form-model>
-      </div>
-    </Auth>
-
-    <yo-table :columns="columns" :load-data="loadData" ref="table">
+    <yo-table
+      :columns="columns"
+      :load-data="loadData"
+      @query="onQuery"
+      @resetQuery="onResetQuery"
+      ref="table"
+    >
+      <Auth auth="sysDictData:page" slot="query">
+        <a-form-model-item label="文本">
+          <a-input placeholder="请输入文本" v-model="query.value" />
+        </a-form-model-item>
+        <a-form-model-item label="字典值">
+          <a-input placeholder="请输入字典值" v-model="query.code" />
+        </a-form-model-item>
+      </Auth>
       <Auth auth="sysDictData:add" slot="operator">
         <a-button @click="onOpen('add-form')" icon="plus">新增字典数据</a-button>
       </Auth>
diff --git a/Web/src/pages/system/dict/index.vue b/Web/src/pages/system/dict/index.vue
index cc17943..fb4f814 100644
--- a/Web/src/pages/system/dict/index.vue
+++ b/Web/src/pages/system/dict/index.vue
@@ -2,27 +2,21 @@
   <container>
     <br />
     <a-card :bordered="false">
-      <Auth auth="sysDictType:page">
-        <div class="yo-query-bar">
-          <a-form-model :model="query" layout="inline">
-            <!-- 此处添加查询表单控件 -->
-            <a-form-model-item label="类型名称">
-              <a-input placeholder="请输入类型名称" v-model="query.name" />
-            </a-form-model-item>
-            <a-form-model-item label="唯一编码">
-              <a-input placeholder="请输入唯一编码" v-model="query.code" />
-            </a-form-model-item>
-            <a-form-model-item>
-              <a-button-group>
-                <a-button @click="onQuery" type="primary">查询</a-button>
-                <a-button @click="onResetQuery">重置</a-button>
-              </a-button-group>
-            </a-form-model-item>
-          </a-form-model>
-        </div>
-      </Auth>
-
-      <yo-table :columns="columns" :load-data="loadData" ref="table">
+      <yo-table
+        :columns="columns"
+        :load-data="loadData"
+        @query="onQuery"
+        @resetQuery="onResetQuery"
+        ref="table"
+      >
+        <Auth auth="sysDictType:page" slot="query">
+          <a-form-model-item label="类型名称">
+            <a-input placeholder="请输入类型名称" v-model="query.name" />
+          </a-form-model-item>
+          <a-form-model-item label="唯一编码">
+            <a-input placeholder="请输入唯一编码" v-model="query.code" />
+          </a-form-model-item>
+        </Auth>
         <Auth auth="sysDictType:add" slot="operator">
           <a-button @click="onOpen('add-form')" icon="plus">新增字典类型</a-button>
         </Auth>
diff --git a/Web/src/pages/system/doc/seed/query.vue b/Web/src/pages/system/doc/seed/query.vue
index f772251..f3be95c 100644
--- a/Web/src/pages/system/doc/seed/query.vue
+++ b/Web/src/pages/system/doc/seed/query.vue
@@ -2,7 +2,7 @@
   <section>
     <p>
       当前版本
-      <a-tag>1.1</a-tag>
+      <a-tag>1.2</a-tag>
     </p>
     <Highlight :code="codes['/seed/query.vue']" language="html" />
   </section>
diff --git a/Web/src/pages/system/doc/seed/treeLayout.vue b/Web/src/pages/system/doc/seed/treeLayout.vue
index 37a6fe7..4300a72 100644
--- a/Web/src/pages/system/doc/seed/treeLayout.vue
+++ b/Web/src/pages/system/doc/seed/treeLayout.vue
@@ -2,7 +2,7 @@
   <section>
     <p>
       当前版本
-      <a-tag>1.0</a-tag>
+      <a-tag>1.1</a-tag>
     </p>
     <Highlight :code="codes['/seed/treeLayout.vue']" language="html" />
   </section>