From 90a0dc8d725166878cb649425c117c409a9c8f65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B0=B4=E8=90=BD=28YangLei=29?= <lzi.love@icloud.com>
Date: Wed, 30 Jun 2021 17:50:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/index.js                       |  3 +-
 src/components/table/my_item.vue              |  5 +--
 src/pages/system/view/log/login_log/index.vue | 42 ++++++++++++-------
 .../view/organization/usermanagement/User.vue | 14 +++----
 src/pages/user/components/info.vue            |  1 -
 src/plugins/index.js                          |  3 +-
 6 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/src/components/index.js b/src/components/index.js
index 56558a0..3f08fbf 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,5 +1,6 @@
 import Table from './table/index.vue';
 import WhiteCard from './white_card/index.vue';
 import Upload from './upload/index.vue';
+import MyFormItem from './table/my_item.vue';
 
-export { Table, WhiteCard, Upload };
+export { Table, WhiteCard, Upload, MyFormItem };
diff --git a/src/components/table/my_item.vue b/src/components/table/my_item.vue
index 398a178..640d360 100644
--- a/src/components/table/my_item.vue
+++ b/src/components/table/my_item.vue
@@ -1,7 +1,7 @@
 <template>
     <a-col v-bind="span">
         <a-form-model-item v-bind="layout">
-            <slot />
+            <slot class="tw-w-full" />
         </a-form-model-item>
     </a-col>
 </template>
@@ -16,6 +16,3 @@ export default {
     },
 };
 </script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/pages/system/view/log/login_log/index.vue b/src/pages/system/view/log/login_log/index.vue
index 74a7dc4..02a2f44 100644
--- a/src/pages/system/view/log/login_log/index.vue
+++ b/src/pages/system/view/log/login_log/index.vue
@@ -1,30 +1,40 @@
 <template>
     <my-table url="/api/v1/logger/login" rowKey="logId" ref="table">
         <template #search="{query}">
-            <a-form-model-item label="开始时间">
-                <a-date-picker show-time v-model="query.startTime" valueFormat="YYYY-MM-DD HH:mm:ss" />
-            </a-form-model-item>
-            <a-form-model-item label="结束时间">
-                <a-date-picker show-time v-model="query.endTime" valueFormat="YYYY-MM-DD HH:mm:ss" />
-            </a-form-model-item>
-            <a-form-model-item label="登录用户">
+            <my-form-item label="开始时间">
+                <a-date-picker
+                    class="tw-w-full"
+                    show-time
+                    v-model="query.startTime"
+                    valueFormat="YYYY-MM-DD HH:mm:ss"
+                />
+            </my-form-item>
+            <my-form-item label="结束时间">
+                <a-date-picker
+                    class="tw-w-full"
+                    show-time
+                    v-model="query.endTime"
+                    valueFormat="YYYY-MM-DD HH:mm:ss"
+                />
+            </my-form-item>
+            <my-form-item label="登录用户">
                 <a-input v-model="query.userId" />
-            </a-form-model-item>
-            <a-form-model-item label="登录IP">
+            </my-form-item>
+            <my-form-item label="登录IP">
                 <a-input v-model="query.loginIp" />
-            </a-form-model-item>
-            <a-form-model-item label="事件类型">
-                <a-select v-model="query.loginType" style="width: 170px" allowClear>
+            </my-form-item>
+            <my-form-item label="事件类型">
+                <a-select v-model="query.loginType" allowClear>
                     <a-select-option value="LOGIN">登录系统</a-select-option>
                     <a-select-option value="LOGOUT">退出系统</a-select-option>
                 </a-select>
-            </a-form-model-item>
-            <a-form-model-item label="事件状态">
-                <a-select v-model="query.isSuccess" style="width: 170px" allowClear>
+            </my-form-item>
+            <my-form-item label="事件状态">
+                <a-select v-model="query.isSuccess" allowClear>
                     <a-select-option value="0">失败</a-select-option>
                     <a-select-option value="1">成功</a-select-option>
                 </a-select>
-            </a-form-model-item>
+            </my-form-item>
         </template>
         <a-table-column title="用户Id" data-index="userId" />
         <a-table-column title="登录用户" data-index="userName" />
diff --git a/src/pages/system/view/organization/usermanagement/User.vue b/src/pages/system/view/organization/usermanagement/User.vue
index 2c2a29a..a33cf21 100644
--- a/src/pages/system/view/organization/usermanagement/User.vue
+++ b/src/pages/system/view/organization/usermanagement/User.vue
@@ -4,12 +4,12 @@
             <Form ref="form" />
         </template>
         <template #search="{ query }">
-            <MyFormModelItem label="归属部门">
+            <my-form-item label="归属部门">
                 <OrganizationTree v-model="query.orgId" />
-            </MyFormModelItem>
-            <MyFormModelItem label="账号">
+            </my-form-item>
+            <my-form-item label="账号">
                 <a-input placeholder="Basic usage" v-model="query.loginId" />
-            </MyFormModelItem>
+            </my-form-item>
         </template>
 
         <a-table-column title="账号" data-index="loginId" />
@@ -31,10 +31,10 @@
 <script>
 import Form from './form.vue';
 import PopconfirmDelete from '@/components/popconfirm_delete/index.vue';
-import MyFormModelItem from '@/components/table/my_item.vue';
 import OrganizationTree from '../components/OrganizationTree.vue';
+
 export default {
-    components: { Form, PopconfirmDelete, OrganizationTree, MyFormModelItem },
+    components: { Form, PopconfirmDelete, OrganizationTree },
     data() {
         return {
             addBtn: { width: 600, onOk: () => this.$refs['form']?.submit() },
@@ -53,4 +53,4 @@ export default {
         },
     },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/pages/user/components/info.vue b/src/pages/user/components/info.vue
index 001d4bb..b1d6157 100644
--- a/src/pages/user/components/info.vue
+++ b/src/pages/user/components/info.vue
@@ -53,7 +53,6 @@ export default {
     },
     watch: {
         '$store.state.userInfo'(userInfo) {
-            console.log('userInfo');
             this.form.userName = userInfo.userName;
             this.form.fixedPhone = userInfo.fixedPhone;
             this.form.mobilePhone = userInfo.mobilePhone;
diff --git a/src/plugins/index.js b/src/plugins/index.js
index e901994..7353a29 100644
--- a/src/plugins/index.js
+++ b/src/plugins/index.js
@@ -1,7 +1,7 @@
 import VueI18nPlugin from './vueI18nPlugin';
 import AuthorityPlugin from './authorityPlugin';
 import TabsPagePlugin from './tabsPagePlugin';
-import { Table, WhiteCard, Upload } from '@/components';
+import { Table, WhiteCard, Upload, MyFormItem } from '@/components';
 
 const Plugins = {
     install: function(Vue) {
@@ -11,6 +11,7 @@ const Plugins = {
         Vue.component('my-table', Table);
         Vue.component('my-card', WhiteCard);
         Vue.component('my-upload', Upload);
+        Vue.component('my-form-item', MyFormItem);
     },
 };
 export default Plugins;
-- 
GitLab