Merge branch 'master' of http://10.0.3.43:9090/JeroBoot/jero-boot

jero-web/src/views/demo/JVXETableDemo.vue

@@ -15,8 +15,8 @@
 </template>
 
 <script>
-  import JVxeDemo1 from '@views/jero/JVxeDemo/JVxeDemo1'
-  import JVxeDemo2 from '@views/jero/JVxeDemo/JVxeDemo2'
+  import JVxeDemo1 from '@views/demo/JVxeDemo/JVxeDemo1'
+  import JVxeDemo2 from '@views/demo/JVxeDemo/JVxeDemo2'
 
   export default {
     name: 'JVXETableDemo',

jero-web/src/views/demo/TableExpandeSub.vue

@@ -98,7 +98,7 @@
 
 <script>
   import { getAction } from '@/api/manage'
-  import JeroOrderDMainModal from '@views/jero/tablist/form/JeroOrderDMainModal'
+  import JeroOrderDMainModal from '@views/demo/tablist/form/JeroOrderDMainModal'
   import {JeroListMixin} from '@/mixins/JeroListMixin'
 
   export default {

jero-web/src/views/jero/jtable1.vue

@@ -83,7 +83,12 @@
             key: 'name',
             width: 200,
             slots: {
-              title: '姓名'
+              title: '姓名',
+              // 冻结列头的参数
+              // 1为左侧冻结
+              // 2为右侧冻结
+              // 3为不冻结或解冻
+              fixedValue: 3
             }
           },
           {
@@ -92,7 +97,8 @@
             key: 'age',
             width: 200,
             slots: {
-              title: '年龄'
+              title: '年龄',
+              fixedValue: 3
             }
           },
           {
@@ -101,7 +107,8 @@
             key: 'address',
             width: 200,
             slots: {
-              title: '住址'
+              title: '住址',
+              fixedValue: 3
             }
           },
           {
@@ -110,7 +117,8 @@
             key: 'address1',
             width: 200,
             slots: {
-              title: '住址1'
+              title: '住址1',
+              fixedValue: 3
             }
           },
           {
@@ -119,7 +127,8 @@
             key: 'address2',
             width: 200,
             slots: {
-              title: '住址2'
+              title: '住址2',
+              fixedValue: 3
             }
           },
           {
@@ -128,7 +137,8 @@
             key: 'address3',
             width: 200,
             slots: {
-              title: '住址3'
+              title: '住址3',
+              fixedValue: 3
             }
           },
           {
@@ -137,7 +147,8 @@
             key: 'address4',
             width: 200,
             slots: {
-              title: '住址4'
+              title: '住址4',
+              fixedValue: 3
             }
           },
           {
@@ -145,22 +156,11 @@
             dataIndex: 'address5',
             key: 'address5',
             slots: {
-              title: '住址5'
+              title: '住址5',
+              fixedValue: 3
             }
           },
         ],
-        // TODO 此处放分页组件的意义？分页组件不是通过参数去操控table组件来进行显隐吗
-        pagination: {
-          current: 1,
-          pageSize: 5,
-          pageSizeOptions: ['5', '10', '20'],
-          showTotal: (total, range) => {
-            return range[0] + "-" + range[1] + " 共" + total + "条"
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0
-        }
       }
     },
     mounted() {