Merge remote-tracking branch 'origin/master'

ant-design-vue-jeecg/src/views/fieldx/FieldxList.vue

@@ -244,6 +244,10 @@
         superFieldList: [],
         //参数
         loadRouteType: false,
+        isorterx: {
+          column: 'createTime',
+          order: 'asc',
+        },
 
       }
     },
@@ -420,7 +424,7 @@
           sqp['superQueryParams'] = encodeURI(this.superQueryParams)
           sqp['superQueryMatchType'] = this.superQueryMatchType
         }
-        var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters);
+        var param = Object.assign(sqp, this.queryParam, this.isorterx, this.filters);
         param.field = this.getQueryField();
         param.pageNo = this.ipagination.current;
         param.pageSize = this.ipagination.pageSize;

ant-design-vue-jeecg/src/views/projectx/ProjectxList.vue

@@ -116,14 +116,17 @@ import '@/assets/less/TableExpand.less'
 import {mixinDevice} from '@/utils/mixin'
 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 import ProjectxModal from './modules/ProjectxModal'
+import JEllipsis from '@/components/jeecg/JEllipsis'
 
 export default {
   name: 'ProjectxList', //添加用户
   mixins: [JeecgListMixin, mixinDevice],
   components: {
-    ProjectxModal
+    ProjectxModal,
+    JEllipsis,
   },
   data() {
+    let ellipsis = (v, l = 20) => (<j-ellipsis value={v} length={l}/>)
     return {
       description: '项目管理 管理项目基本信息管理页面',
       // 表头
@@ -141,12 +144,14 @@ export default {
         {
           title: '项目中文名称',
           align: "center",
-          dataIndex: 'projectName'
+          dataIndex: 'projectName',
+          customRender: (t)=>ellipsis(t)
         },
         {
           title: '项目英文名称',
           align: "center",
           dataIndex: 'projectEnName',
+          customRender: (t)=>ellipsis(t)
         },
         {
           title: '项目编码',