修改角色授权样式+修复打包运行bug

.babelrc

@@ -9,11 +9,7 @@
     }],
     "stage-2"
   ],
-  "plugins": ["transform-vue-jsx", "transform-runtime", 
-    ["import", {
-    "libraryName": "vxe-table",
-    "style": true
-  }]],
+  "plugins": ["transform-vue-jsx", "transform-runtime"],
   "env": {
     "development":{
       "plugins": ["dynamic-import-node"]

package.json

@@ -7,7 +7,7 @@
     "scripts": {
         "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
         "update:ui": "npm uninstall ui-component-v4&&npm install ui-component-v4",
-        "build": "cross-env NODE_ENV=production env_config=prod node build/build.js",
+        "build": "set NODE_OPTIONS=--openssl-legacy-provider && cross-env NODE_ENV=production env_config=prod node build/build.js",
         "theme": "gulp --gulpfile src/assets/gulpfile.js ",
         "theme:watch": "gulp watching --gulpfile src/assets/gulpfile.js",
         "theme:copyResources": "gulp copyResources --gulpfile src/assets/gulpfile.js",
@@ -54,9 +54,9 @@
         "vue-template-compiler": "2.6.10",
         "vuebar": "^0.0.20",
         "vuex": "^3.0.1",
-        "vxe-table": "3.3.10",
+        "vxe-table": "^3.7.5",
         "webpack-node-externals": "^2.5.2",
-        "xe-utils": "3.3.1"
+        "xe-utils": "^3.5.13"
     },
     "devDependencies": {
         "autoprefixer": "^8.5.0",

src/main.js

@@ -61,12 +61,13 @@ import UiComponentV4 from "ui-component-v4"
 import directives from "@/directive"
 
 import XEUtils from "xe-utils"
-import { VXETable, Table, Column, header, Grid, Icon } from "vxe-table"
+import { VXETable, Table, Column, Grid, Icon } from "vxe-table"
+import "vxe-table/lib/style.css"
+
 Vue.use(VXETable)
 Vue.use(Icon)
 Vue.use(Table)
 Vue.use(Column)
-Vue.use(header)
 Vue.use(Grid)
 
 import zhCN from "vxe-table/lib/locale/lang/zh-CN"

src/pages/appfun-auth-manage/role-auth-manage/roleView.vue

@@ -1,79 +1,69 @@
 <template>
     <dg-row gutter="1rem">
-        <dg-col :span="12">
-            <dg-card shadow="never" header="角色列表">
-                <!-- 角色搜索栏 -->
-                <search-bar
-                    :conditionForm="roleConditionForm"
-                    @submitSearch="receiveRoleSearch"
-                    @submitCurrentApp="getCurrentApp"
-                ></search-bar>
-                <!-- 角色列表 -->
-                <new-table
-                    ref="table"
-                    :tableHeader="roleTableHeader"
-                    :tableUrl="roleTableUrl"
-                    :condition="roleCondition"
-                    @handleRowClick="handleRoleRowClick"
-                >
-                    <template #name="{ row }">
-                        <span style="cursor: pointer;color: #1890ff;" @click="viewRoleMenu(row, $event)">
-                            {{ row.name }}
-                        </span>
-                    </template>
-                </new-table>
-            </dg-card>
-        </dg-col>
-        <dg-col :span="12">
-            <dg-card shadow="never" header="人员列表">
-                <!-- 角色搜索栏 -->
-                <search-bar
-                    :conditionForm="userConditionForm"
-                    @submitSearch="receiveUserSearch"
-                    @submitDefaultSearch="receiveUserDefaultCondition"
-                ></search-bar>
-                <!-- 角色操作栏 -->
-                <operate-bar :pageOptList="userOptList" @submitPageOpt="receviceOpt"></operate-bar>
-                <!-- 角色列表 -->
-                <dg-table
-                    ref="userTable"
-                    :condition="userCondition"
-                    :url="userTableUrl"
-                    row-key="id"
-                    border
-                    @selection-change="handleSelectChange"
-                    :before-quest="handleBeforeQuest"
-                    lazyLoad
-                >
-                    <dg-table-column type="selection" reserve-selection width="50"></dg-table-column>
-                    <!-- <dg-table-column type="index" label="序号" width="70"></dg-table-column> -->
-                    <dg-table-column prop="name" align="center" width="120" label="姓名"></dg-table-column>
-                    <dg-table-column prop="idcard" align="center" label="身份证号码" width="200"></dg-table-column>
-                    <!-- <dg-table-column prop="orgName" align="center" label="单位名称"></dg-table-column> -->
-                    <dg-table-column
-                        prop="userType"
-                        align="center"
-                        label="用户类型"
-                        enum="UserTypeEnum"
-                    ></dg-table-column>
+        <scroll-card header="角色列表" contentHeight="calc(100vh - 19rem)" :colSpan="12">
+            <!-- 角色搜索栏 -->
+            <search-bar
+                :conditionForm="roleConditionForm"
+                @submitSearch="receiveRoleSearch"
+                @submitCurrentApp="getCurrentApp"
+            ></search-bar>
+            <!-- 角色列表 -->
+            <new-table
+                ref="table"
+                :tableHeader="roleTableHeader"
+                :tableUrl="roleTableUrl"
+                :condition="roleCondition"
+                @handleRowClick="handleRoleRowClick"
+            >
+                <template #name="{ row }">
+                    <span style="cursor: pointer;color: #1890ff;" @click="viewRoleMenu(row, $event)">
+                        {{ row.name }}
+                    </span>
+                </template>
+            </new-table>
+        </scroll-card>
+
+        <scroll-card header="人员列表" contentHeight="calc(100vh - 19rem)" :colSpan="12">
+            <!-- 角色搜索栏 -->
+            <search-bar
+                :conditionForm="userConditionForm"
+                @submitSearch="receiveUserSearch"
+                @submitDefaultSearch="receiveUserDefaultCondition"
+            ></search-bar>
+            <!-- 角色操作栏 -->
+            <operate-bar :pageOptList="userOptList" @submitPageOpt="receviceOpt"></operate-bar>
+            <!-- 角色列表 -->
+            <dg-table
+                ref="userTable"
+                :condition="userCondition"
+                :url="userTableUrl"
+                row-key="id"
+                border
+                @selection-change="handleSelectChange"
+                :before-quest="handleBeforeQuest"
+                lazyLoad
+            >
+                <dg-table-column type="selection" reserve-selection width="50"></dg-table-column>
+                <!-- <dg-table-column type="index" label="序号" width="70"></dg-table-column> -->
+                <dg-table-column prop="name" align="center" width="120" label="姓名"></dg-table-column>
+                <dg-table-column prop="idcard" align="center" label="身份证号码" width="200"></dg-table-column>
+                <!-- <dg-table-column prop="orgName" align="center" label="单位名称"></dg-table-column> -->
+                <dg-table-column prop="userType" align="center" label="用户类型" enum="UserTypeEnum"></dg-table-column>
 
-                    <dg-table-column
-                        prop="policeCategory"
-                        align="center"
-                        code="T_MD_POLICE_TYPE"
-                        label="警种"
-                    ></dg-table-column>
-                    <dg-table-column prop="policeBusiness" align="center" label="业务域"></dg-table-column>
-                    <dg-table-column label="权限有效期" width="120" align="center">
-                        <template slot-scope="scope">
-                            <a href="javascript:;" @click="handleValidateChoose(scope.row)">{{
-                                scope.row.activeTime
-                            }}</a>
-                        </template>
-                    </dg-table-column>
-                </dg-table>
-            </dg-card>
-        </dg-col>
+                <dg-table-column
+                    prop="policeCategory"
+                    align="center"
+                    code="T_MD_POLICE_TYPE"
+                    label="警种"
+                ></dg-table-column>
+                <dg-table-column prop="policeBusiness" align="center" label="业务域"></dg-table-column>
+                <dg-table-column label="权限有效期" width="120" align="center">
+                    <template slot-scope="scope">
+                        <a href="javascript:;" @click="handleValidateChoose(scope.row)">{{ scope.row.activeTime }}</a>
+                    </template>
+                </dg-table-column>
+            </dg-table>
+        </scroll-card>
     </dg-row>
 </template>
 
@@ -85,12 +75,15 @@ import searchBar from "@/components/search-bar"
 import operateBar from "@/components/operate-bar"
 import { searchOpt } from "@/mixins/page-opt"
 import roleMenuTree from "./role-menu-tree.vue"
+import scrollCard from "@/components/scroll-card"
+
 export default {
     name: "role-list",
     components: {
         newTable,
         searchBar,
-        operateBar
+        operateBar,
+        scrollCard
     },
     mixins: [searchOpt],
     // 接收父页面传过来的属性
@@ -138,7 +131,8 @@ export default {
                     type: "APP",
                     component: "SelectOrgTree",
                     placeholder: "请选择单位名称",
-                    defaultSelectRoot: true
+                    defaultSelectRoot: true,
+                    defaultSearch: false
                 },
                 {
                     label: "姓名",

yarn.lock

@@ -3200,6 +3200,11 @@ dom-serializer@^1.0.1:
     domhandler "^4.2.0"
     entities "^2.0.0"
 
+dom-zindex@^1.0.1:
+  version "1.0.1"
+  resolved "http://192.168.6.13:8082/repository/npm_all/dom-zindex/-/dom-zindex-1.0.1.tgz#98df1d916f390f009bb0ec03b96df820e7c7073a"
+  integrity sha512-M/MERVDZ8hguvjl6MAlLWSLYLS7PzEyXaTb5gEeJ+SF+e9iUC0sdvlzqe91MMDHBoy+nqw7wKcUOrDSyvMCrRg==
+
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "http://192.168.6.13:8082/repository/npm_all/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
@@ -10544,10 +10549,13 @@ vuex@^3.0.1:
   resolved "http://192.168.6.13:8082/repository/npm_all/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71"
   integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==
 
-vxe-table@3.3.10:
-  version "3.3.10"
-  resolved "http://192.168.6.13:8082/repository/npm_all/vxe-table/-/vxe-table-3.3.10.tgz#83e4e2b91fcc5657119c070e0f2763671d1018b5"
-  integrity sha512-ImCE1+KmXHxYX50UThBfza1IkiJvuuUBS759da6VnbNe9x5d04tmYYk4AvV0+qbeo5h3TXkNJzz3cRezs9+A7g==
+vxe-table@^3.7.5:
+  version "3.7.5"
+  resolved "http://192.168.6.13:8082/repository/npm_all/vxe-table/-/vxe-table-3.7.5.tgz#f2a37cf13fb349aaa0372ab74bdfc1a53ea46a68"
+  integrity sha512-/52qKkgYQs91MPSL0W6s2EioJqwuemb7lUtNqq0py6B64LZtw0OhA+HsjR9oqSjqujex8GTpzaewwLpvIqX49A==
+  dependencies:
+    dom-zindex "^1.0.1"
+    xe-utils "^3.5.13"
 
 watchpack-chokidar2@^2.0.1:
   version "2.0.1"
@@ -10815,16 +10823,16 @@ ws@^4.0.0:
     async-limiter "~1.0.0"
     safe-buffer "~5.1.0"
 
-xe-utils@3.3.1:
-  version "3.3.1"
-  resolved "http://192.168.6.13:8082/repository/npm_all/xe-utils/-/xe-utils-3.3.1.tgz#77af254b12d5ae2d4d3f32c3df7e3a5ccde1fad8"
-  integrity sha512-OdQgl9WPV9dK3/djneFPrGX8z1M4neX+VOkzra5oONjoNsCKQhwdiut99WlxceNMQ5vXDv4EQ/wKA2fux3Gdug==
-
 xe-utils@^1.9.4:
   version "1.9.8"
   resolved "http://192.168.6.13:8082/repository/npm_all/xe-utils/-/xe-utils-1.9.8.tgz#3602d693259750698abe51d80b529d75d9685afb"
   integrity sha512-xNFTF2inuFCQjXEcxGU3YhlYcGJBZCwA7yADzLVTBDX9OdJdfvb80j7aQwsyhY5GJwtahlXLHEjwJ/5WbSPQMw==
 
+xe-utils@^3.5.13:
+  version "3.5.13"
+  resolved "http://192.168.6.13:8082/repository/npm_all/xe-utils/-/xe-utils-3.5.13.tgz#200b49d2e3f1ab8798bccc8e34aa32502b180164"
+  integrity sha512-ORT6ghCRk0mUVavMBxetcPzUPskS6NGfntzpWazJ86e+XU0uK4HwHfDhN/jKATiyInrOH5RwQo9SO/+DB8XeBw==
+
 xregexp@4.0.0:
   version "4.0.0"
   resolved "http://192.168.6.13:8082/repository/npm_all/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"