Merge branch 'master' of http://118.178.224.202:3000/ewide/ewide_core

Api/Ewide.Core/SeedData/SysDictDataSeedData.cs

@@ -94,6 +94,8 @@ namespace Ewide.Core
                 new SysDictData{Id="375362c8-d694-40d9-8c55-07669e472460", TypeId="a2068ed1-62a6-463c-b720-06111d994079", Value="本部门数据", Code="3", Sort=100, Remark="本部门数据", Status=0 },
                 new SysDictData{Id="70afe4c1-3495-483a-bdd0-3d4ea45136b3", TypeId="a2068ed1-62a6-463c-b720-06111d994079", Value="仅本人数据", Code="4", Sort=100, Remark="仅本人数据", Status=0 },
                 new SysDictData{Id="6f395e69-8add-40ae-a378-0881d64a4413", TypeId="a2068ed1-62a6-463c-b720-06111d994079", Value="自定义数据", Code="5", Sort=100, Remark="自定义数据", Status=0 },
+                new SysDictData{Id="2285a101-70b3-4492-a5d7-2605448d99b3", TypeId="a2068ed1-62a6-463c-b720-06111d994079", Value="本部门所在区域及以下区域", Code="6", Sort=100, Remark="本部门所在区域及以下区域", Status=0 },
+                new SysDictData{Id="0b471624-f9a2-4f0a-9ff5-9cb12414fec0", TypeId="a2068ed1-62a6-463c-b720-06111d994079", Value="仅本部门所在区域数据", Code="7", Sort=100, Remark="仅本部门所在区域数据", Status=0 },
                 new SysDictData{Id="a819d549-6107-43a2-99d2-377cf0a5681a", TypeId="688f9a69-ec95-46f4-87bb-e19e3cc5c7fc", Value="app", Code="1", Sort=100, Remark="app", Status=0 },
                 new SysDictData{Id="b1e821b3-4e7b-4e60-a67f-a40d327ab6d6", TypeId="688f9a69-ec95-46f4-87bb-e19e3cc5c7fc", Value="pc", Code="2", Sort=100, Remark="pc", Status=0 },
                 new SysDictData{Id="2bce5da0-b386-4412-935d-d081b7cf4391", TypeId="688f9a69-ec95-46f4-87bb-e19e3cc5c7fc", Value="其他", Code="3", Sort=100, Remark="其他", Status=0 },

Api/Ewide.Core/Service/Dict/SysDictDataService.cs

@@ -145,7 +145,8 @@ namespace Ewide.Core.Service
                                                          .Select(u => new
                                                          {
                                                              u.Code,
-                                                             u.Value
+                                                             u.Value,
+                                                             u.Remark
                                                          }).ToListAsync();
         }
 

Web/src/App.vue

@@ -1,6 +1,12 @@
 <template>
   <div id="app">
     <a-config-provider :locale="zh_CN">
+      <template #renderEmpty>
+        <div class="text-center pt-md">
+          <a-icon class="h3 mb-md" type="smile" />
+          <p>暂无数据</p>
+        </div>
+      </template>
       <router-view />
     </a-config-provider>
   </div>

Web/src/assets/style/frame/dark.less

@@ -1,4 +1,5 @@
 @import (reference) '~@/assets/style/main.less';
+@layout-header-background: #1c2127;
 .dark {
   .main(@nav-background: @layout-header-background;
   @nav-box-shadow-color: fade(@black, 25%);

Web/src/assets/style/lib/cascader.less

@@ -1,4 +1,6 @@
 @import (reference) '~@/assets/style/extend.less';
 .ant-cascader-picker-arrow {
-  transform: scaleY(.75);
+  svg {
+    transform: scaleY(.75);
+  }
 }

Web/src/assets/style/lib/form.less

@@ -40,6 +40,7 @@
     background-color: @white;
 
     @box-shadow-focused: 0 0 0 2px fade(@primary-color, 50%);
+    @control-background: lighten(@black, 95%) !important;
     &::before,
     &::after {
       content: none;
@@ -60,7 +61,7 @@
 
       color: lighten(@black, 10%);
       border: 0;
-      background-color: lighten(@black, 95%) !important;
+      background-color: @control-background;
     }
     .ant-mentions {
       textarea {
@@ -103,6 +104,9 @@
         z-index: 0;
       }
     }
+    .ant-cascader-picker-clear {
+      background-color: @control-background;
+    }
   }
   .ant-form-item-label {
     overflow: hidden;

Web/src/components/yoTable/index.js

@@ -114,6 +114,7 @@ export default {
           this.data = this.onClearChildren(res)
           this.pagination = false
         }
+      }).finally(() => {
         this.onLoaded()
       })
     },

Web/src/components/yoTreeLayout/index.js

@@ -1,4 +1,5 @@
 import Swiper from 'swiper'
+import { Empty } from 'ant-design-vue'
 
 let timer, swiper
 
@@ -107,7 +108,7 @@ export default {
         this.$nextTick(() => {
           this.onUpdateSwiper()
         })
-
+      }).finally(() => {
         this.loading = false
       })
     },
@@ -256,7 +257,17 @@ export default {
               <div class="swiper-slide">
                 <a-spin style={{ height: '100%' }} spinning={this.loading}>
                   <a-icon slot="indicator" type="loading" spin />
-                  <a-tree {...{ props, on, scopedSlots }} />
+                  {
+                    !this.loading && !this.list.length ?
+                      <a-empty description={false} class="ant-list-empty-text">
+                        <template slot="image">
+                          <a-icon class="h3 mt-xl mb-md" type="smile" />
+                          <p>暂无数据</p>
+                        </template>
+                      </a-empty>
+                      :
+                      <a-tree {...{ props, on, scopedSlots }} />
+                  }
                 </a-spin>
               </div>
             </div>

Web/src/pages/system/dict/dictdata/form.vue

@@ -4,11 +4,11 @@
       <a-icon slot="indicator" spin type="loading" />
       <div class="yo-form-group">
         <!-- 表单控件 -->
-        <a-form-model-item label="字典值" prop="value">
+        <a-form-model-item label="文本" prop="value">
-          <a-input placeholder="请输入字典值" v-model="form.value" />
+          <a-input placeholder="请输入文本" v-model="form.value" />
         </a-form-model-item>
-        <a-form-model-item label="唯一编码" prop="code">
+        <a-form-model-item label="字典值" prop="code">
-          <a-input placeholder="请输入唯一编码" v-model="form.code" />
+          <a-input placeholder="请输入字典值" v-model="form.code" />
         </a-form-model-item>
         <a-form-model-item label="排序" prop="sort">
           <a-input-number class="w-100-p" placeholder="请输入排序" v-model="form.sort" />

Web/src/pages/system/dict/dictdata/index.vue

@@ -4,11 +4,11 @@
       <div class="yo-query-bar">
         <a-form-model :model="query" layout="inline">
           <!-- 此处添加查询表单控件 -->
-          <a-form-model-item label="字典值">
+          <a-form-model-item label="文本">
-            <a-input placeholder="请输入字典值" v-model="query.value" />
+            <a-input placeholder="请输入文本" v-model="query.value" />
           </a-form-model-item>
-          <a-form-model-item label="唯一编码">
+          <a-form-model-item label="字典值">
-            <a-input placeholder="请输入唯一编码" v-model="query.code" />
+            <a-input placeholder="请输入字典值" v-model="query.code" />
           </a-form-model-item>
           <a-form-model-item>
             <a-button-group>
@@ -71,12 +71,12 @@ export default {
       },
       columns: [
         {
-          title: '字典值',
+          title: '文本',
           dataIndex: 'value',
           sorter: true,
         },
         {
-          title: '唯一编码',
+          title: '字典值',
           dataIndex: 'code',
           sorter: true,
         },

Web/src/pages/system/role/dataForm.vue

@@ -5,13 +5,14 @@
     :width="600"
     @cancel="onCancel"
     @ok="onOk"
+    class="yo-modal-form"
     title="授权数据"
   >
     <a-spin :spinning="loading">
       <a-icon slot="indicator" spin type="loading" />
       <a-form-model :model="form" :rules="rules" class="yo-form" ref="form">
         <div class="yo-form-group">
-          <a-form-model-item has-feedback label="授权范围" prop="dataScopeType">
+          <a-form-model-item label="授权范围" prop="dataScopeType">
             <a-select placeholder="请选择授权范围" v-model="form.dataScopeType">
               <a-select-option
                 :key="item.code"
@@ -21,13 +22,23 @@
               >{{ item.value }}</a-select-option>
             </a-select>
           </a-form-model-item>
-          <a-form-model-item label="选择机构" v-show="orgTreeShow">
+          <a-form-model-item label="选择机构" v-show="isDefine">
             <a-tree-select
               :show-checked-strategy="SHOW_PARENT"
               :tree-data="orgTreeData"
               placeholder="请选择机构"
               tree-checkable
-              v-model="checkedKeys"
+              v-model="orgCheckedKeys"
+            />
+          </a-form-model-item>
+          <a-form-model-item label="选择区域" v-show="isDefine">
+            <a-tree-select
+              :replace-fields="{ title: 'name', value: 'code', children: 'children' }"
+              :show-checked-strategy="SHOW_PARENT"
+              :tree-data="areaTreeData"
+              placeholder="请选择所属区域"
+              tree-checkable
+              v-model="areaCheckedKeys"
             />
           </a-form-model-item>
         </div>
@@ -58,10 +69,13 @@ export default {
 
       SHOW_PARENT,
       orgTreeData: [],
+      orgCheckedKeys: [],
+
+      areaTreeData: [],
+      areaCheckedKeys: [],
 
-      checkedKeys: [],
       dataScopeTypeData: [],
-      orgTreeShow: false,
+      isDefine: false,
       replaceFields: {
         key: 'id',
       },
@@ -97,29 +111,48 @@ export default {
     async onChange(value) {
       if (value == '5') {
         this.loading = true;
-        this.orgTreeShow = true;
+        this.isDefine = true;
         // 获取机构树
-        this.orgTreeData = await this.onLoadTreeData();
+        this.orgTreeData = await this.onLoadOrgTreeData();
+        // 获取区域
+        this.areaTreeData = await this.onLoadAreaTreeData();
         // 已关联数据
-        this.checkedKeys = await this.onLoadRoleOwn();
+        this.orgCheckedKeys = await this.onLoadRoleOwn();
 
         this.loading = false;
       } else {
-        this.orgTreeShow = false;
+        this.isDefine = false;
         // 清理已选中机构
-        this.checkedKeys = [];
+        this.orgCheckedKeys = [];
       }
     },
 
     /**
      * 获取机构树
      */
-    onLoadTreeData() {
+    onLoadOrgTreeData() {
       return this.$api.getOrgTree().then(({ data }) => {
         return data;
       });
     },
 
+    onLoadAreaTreeData() {
+      return this.$api.getAreaTree().then(({ data }) => {
+        // 为了防止出现空的层级选择,删除所有空children节点
+        const clearChiildren = (data) => {
+          data.forEach((item) => {
+            if (item.children && item.children.length) {
+              clearChiildren(item.children);
+            } else {
+              delete item.children;
+            }
+          });
+        };
+        clearChiildren(data);
+        return data;
+      });
+    },
+
     /**
      * 此角色已有数据列表
      */
@@ -136,7 +169,8 @@ export default {
           this.$api
             .sysRoleGrantData({
               id: this.record.id,
-              grantOrgIdList: this.checkedKeys,
+              grantOrgIdList: this.orgCheckedKeys,
+              grantAreaCodeList: this.areaCheckedKeys,
               dataScopeType: this.form.dataScopeType,
             })
             .then(({ success }) => {
@@ -157,9 +191,10 @@ export default {
 
       setTimeout(() => {
         this.record = {};
-        this.checkedKeys = [];
+        this.orgCheckedKeys = [];
+        this.areaCheckedKeys = [];
         this.dataScopeTypeData = [];
-        this.orgTreeShow = false;
+        this.isDefine = false;
         this.form = {};
 
         this.$refs.form.resetFields();

Web/src/pages/system/role/index.vue

@@ -50,7 +50,7 @@
                   </Auth>
                   <Auth auth="sysRole:grantData">
                     <a-menu-item>
-                      <a @click="onOpen('org-form', record)">授权数据</a>
+                      <a @click="onOpen('data-form', record)">授权数据</a>
                     </a-menu-item>
                   </Auth>
                 </a-menu>
@@ -64,20 +64,20 @@
     <add-form @ok="onReloadData" ref="add-form" />
     <edit-form @ok="onReloadData" ref="edit-form" />
     <menu-form @ok="onReloadData" ref="menu-form" />
-    <org-form @ok="onReloadData" ref="org-form" />
+    <data-form @ok="onReloadData" ref="data-form" />
   </container>
 </template>
 <script>
 import AddForm from './addForm';
-import editForm from './editForm';
+import EditForm from './editForm';
-import menuForm from './menuForm';
+import MenuForm from './menuForm';
-import orgForm from './orgForm';
+import DataForm from './dataForm';
 export default {
   components: {
     AddForm,
-    editForm,
+    EditForm,
-    menuForm,
+    MenuForm,
-    orgForm,
+    DataForm,
   },
   data() {
     return {