From f6258537c2613813efb26d9df5682c3e6b27798c Mon Sep 17 00:00:00 2001
From: 188633308 <188633308@qq.com>
Date: Sun, 25 Apr 2021 22:14:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=8A=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?,=E5=AE=9E=E7=8E=B0=E7=94=A8=E6=88=B7=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Service/User/Dto/UserInput.cs |   2 +-
 Web/src/assets/style/lib/form.less           |   7 ++
 Web/src/assets/style/lib/table.less          |   3 -
 Web/src/assets/style/theme/primary.less      |   1 +
 Web/src/common/api/index.js                  |   1 +
 Web/src/pages/system/user/index.vue          |  26 ++++-
 Web/src/pages/system/user/orgForm.vue        |   3 +
 Web/src/pages/system/user/roleForm.vue       | 111 +++++++++++++++++++
 Web/src/util/global/index.js                 |  11 +-
 Web/src/views/main/_layout/header/user.js    |   4 +-
 10 files changed, 160 insertions(+), 9 deletions(-)
 create mode 100644 Web/src/pages/system/user/orgForm.vue
 create mode 100644 Web/src/pages/system/user/roleForm.vue

diff --git a/Api/Ewide.Core/Service/User/Dto/UserInput.cs b/Api/Ewide.Core/Service/User/Dto/UserInput.cs
index 7b7ce54..8789f39 100644
--- a/Api/Ewide.Core/Service/User/Dto/UserInput.cs
+++ b/Api/Ewide.Core/Service/User/Dto/UserInput.cs
@@ -71,7 +71,7 @@ namespace Ewide.Core.Service
         /// <summary>
         /// 搜索状态（字典 0正常 1停用 2删除）
         /// </summary>
-        public CommonStatus SearchStatus { get; set; } = CommonStatus.ENABLE;
+        public CommonStatus? SearchStatus { get; set; }
     }
 
     public class AddUserInput : UserInput
diff --git a/Web/src/assets/style/lib/form.less b/Web/src/assets/style/lib/form.less
index 2324878..70a423c 100644
--- a/Web/src/assets/style/lib/form.less
+++ b/Web/src/assets/style/lib/form.less
@@ -103,6 +103,13 @@
     width: 61.8%;
     min-width: 220px;
   }
+  .yo-form--fluid {
+    .ant-form-item-control-wrapper {
+      flex: 0 0 100%;
+
+      width: 100%;
+    }
+  }
   .ant-form-explain {
     font-size: @font-size-base - 1px;
 
diff --git a/Web/src/assets/style/lib/table.less b/Web/src/assets/style/lib/table.less
index 10ffedb..7a68a1a 100644
--- a/Web/src/assets/style/lib/table.less
+++ b/Web/src/assets/style/lib/table.less
@@ -142,9 +142,6 @@
 
     height: 18px;
 
-    >a {
-      color: darken(@primary-color, 20%);
-    }
   }
 }
 
diff --git a/Web/src/assets/style/theme/primary.less b/Web/src/assets/style/theme/primary.less
index ff6ad49..87163a1 100644
--- a/Web/src/assets/style/theme/primary.less
+++ b/Web/src/assets/style/theme/primary.less
@@ -1,3 +1,4 @@
 @import '~@/assets/style/app.less';
+@primary-color: #007bff;
 @font-size-base: 13px;
 @border-radius-base: 0;
diff --git a/Web/src/common/api/index.js b/Web/src/common/api/index.js
index 602411a..069ad1e 100644
--- a/Web/src/common/api/index.js
+++ b/Web/src/common/api/index.js
@@ -160,6 +160,7 @@ api.$queue = function (queue) {
 
 export {
     axios,
+    urls,
     api,
     STATUS
 }
diff --git a/Web/src/pages/system/user/index.vue b/Web/src/pages/system/user/index.vue
index 01b1175..8adc43a 100644
--- a/Web/src/pages/system/user/index.vue
+++ b/Web/src/pages/system/user/index.vue
@@ -71,7 +71,7 @@
                   </Auth>
                   <Auth auth="sysUser:grantData">
                     <a-menu-item>
-                      <a @click="onOpen('org-form', record)">授权数据</a>
+                      <a @click="onOpen('org-form', record)">授权额外数据</a>
                     </a-menu-item>
                   </Auth>
                 </a-menu>
@@ -80,7 +80,13 @@
             <a-list-item-meta>
               <div slot="title">{{ record.nickName || record.name }}</div>
               <div slot="description">{{ record.account }}</div>
-              <a-avatar :size="48" :src="record.avatar" icon="user" shape="square" slot="avatar" />
+              <a-avatar
+                :size="48"
+                :src="`${previewUrl}?id=${record.avatar}`"
+                icon="user"
+                shape="square"
+                slot="avatar"
+              />
             </a-list-item-meta>
             <div class="yo-list-content--h">
               <div class="yo-list-content--h--item">
@@ -109,14 +115,20 @@
     </container>
     <add-form @ok="onReloadData" ref="add-form" />
     <edit-form @ok="onReloadData" ref="edit-form" />
+    <role-form @ok="onReloadData" ref="role-form" />
+    <org-form @ok="onReloadData" ref="org-form" />
   </yo-tree-layout>
 </template>
 <script>
+import { PERVIEW_URL } from '@/util/global';
+
 import YoTreeLayout from '@/components/yoTreeLayout';
 import YoList from '@/components/yoList';
 
 import AddForm from './addForm';
 import EditForm from './editForm';
+import RoleForm from './roleForm';
+import OrgForm from './orgForm';
 
 export default {
   components: {
@@ -124,6 +136,8 @@ export default {
     YoList,
     AddForm,
     EditForm,
+    RoleForm,
+    OrgForm,
   },
 
   data() {
@@ -139,6 +153,8 @@ export default {
           values: [],
         },
       ],
+
+      previewUrl: PERVIEW_URL,
     };
   },
 
@@ -231,7 +247,11 @@ export default {
      * 从列表页调用窗口的打开方法
      */
     onOpen(formName, record) {
-      this.$refs[formName].onOpen(record, this.query['sysEmpParam.orgId']);
+      try {
+        this.$refs[formName].onOpen(record, this.query['sysEmpParam.orgId']);
+      } catch {
+        console.warn('component open method not found');
+      }
     },
 
     onSetUserStatus(record, checked) {
diff --git a/Web/src/pages/system/user/orgForm.vue b/Web/src/pages/system/user/orgForm.vue
new file mode 100644
index 0000000..e5e6a79
--- /dev/null
+++ b/Web/src/pages/system/user/orgForm.vue
@@ -0,0 +1,3 @@
+<template>
+  <div></div>
+</template>
\ No newline at end of file
diff --git a/Web/src/pages/system/user/roleForm.vue b/Web/src/pages/system/user/roleForm.vue
new file mode 100644
index 0000000..90f975b
--- /dev/null
+++ b/Web/src/pages/system/user/roleForm.vue
@@ -0,0 +1,111 @@
+<template>
+  <a-modal
+    :confirmLoading="confirmLoading"
+    :visible="visible"
+    @cancel="onCancel"
+    @ok="onOk"
+    class="yo-modal-form"
+    title="授权角色"
+  >
+    <a-form-model class="yo-form" ref="form">
+      <a-spin :spinning="loading">
+        <a-icon slot="indicator" spin type="loading" />
+        <div class="yo-form-group">
+          <a-form-model-item class="yo-form--fluid">
+            <a-select mode="multiple" placeholder="请选择角色" v-model="roles">
+              <a-select-option
+                :key="role.id"
+                :value="role.id"
+                v-for="role in roleList"
+              >{{ role.name }}</a-select-option>
+            </a-select>
+          </a-form-model-item>
+        </div>
+      </a-spin>
+    </a-form-model>
+  </a-modal>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      visible: false,
+      confirmLoading: false,
+
+      loading: false,
+
+      id: '',
+      roles: [],
+      roleList: [],
+    };
+  },
+
+  methods: {
+    /**
+     * 必要的方法
+     * 从外部调用打开本窗口
+     */
+    async onOpen(record) {
+      this.visible = true;
+      this.id = record.id;
+      this.$nextTick(() => {
+        this.onInit();
+      });
+    },
+
+    /**
+     * 必要的方法
+     * 点击保存时的操作
+     */
+    onOk() {
+      this.confirmLoading = true;
+      this.$api
+        /** !!此处必须修改调用的接口方法 */
+        .sysUserGrantRole({
+          id: this.id,
+          grantRoleIdList: this.roles,
+        })
+        .then(({ success }) => {
+          if (success) {
+            this.$message.success('授权成功');
+            this.onCancel();
+            this.$emit('ok');
+          }
+        })
+        .finally(() => {
+          this.confirmLoading = false;
+        });
+    },
+
+    /**
+     * 必要的方法
+     * 关闭窗口时的操作
+     */
+    onCancel() {
+      this.visible = false;
+      setTimeout(() => {
+        this.roles = [];
+      }, 300);
+    },
+
+    async onInit() {
+      this.loading = true;
+      this.roleList = await this.onLoadRoleList();
+      this.roles = await this.onLoadRole();
+      this.loading = false;
+    },
+
+    onLoadRoleList() {
+      return this.$api.getRolePage().then(({ data }) => {
+        return data.rows;
+      });
+    },
+
+    onLoadRole() {
+      return this.$api.sysUserOwnRole({ id: this.id }).then(({ data }) => {
+        return data;
+      });
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/Web/src/util/global/index.js b/Web/src/util/global/index.js
index 5415709..a9f897d 100644
--- a/Web/src/util/global/index.js
+++ b/Web/src/util/global/index.js
@@ -1 +1,10 @@
-export const EMPTY_ID = '00000000-0000-0000-0000-000000000000'
\ No newline at end of file
+/**
+ * 空GUID
+ */
+export const EMPTY_ID = '00000000-0000-0000-0000-000000000000'
+
+/**
+ * 文件预览地址
+ */
+import { urls } from '@/common/api'
+export const PERVIEW_URL = process.env.VUE_APP_BASE_URL + urls.sysFileInfoPreview[0]
\ No newline at end of file
diff --git a/Web/src/views/main/_layout/header/user.js b/Web/src/views/main/_layout/header/user.js
index 9db46f3..8e3fbff 100644
--- a/Web/src/views/main/_layout/header/user.js
+++ b/Web/src/views/main/_layout/header/user.js
@@ -2,6 +2,8 @@ let userOpenTimer, userCloseTimer
 
 let initDropdownHeight
 
+import { PERVIEW_URL } from '@/util/global';
+
 import { doLogout } from '@/common/login'
 
 export default {
@@ -51,7 +53,7 @@ export default {
                 <div class="user-container-inner">
                     <div class="user--base">
                         <a-avatar
-                            src={this.$root.global.info && this.$root.global.info.avatar}
+                            src={this.$root.global.info && (`${PERVIEW_URL}?id=${this.$root.global.info.avatar}`)}
                             class="user--avatar"
                             icon="user"
                         />