Jeecg-Boot 2.2.0 版本发布 | 重磅升级

ant-design-vue-jeecg/src/mixins/JEditableTableMixin.js

@@ -83,7 +83,16 @@ export const JEditableTableMixin = {
     requestSubTableData(url, params, tab, success) {
       tab.loading = true
       getAction(url, params).then(res => {
-        tab.dataSource = res.result || []
+        let { result } = res
+        let dataSource = []
+        if (result) {
+          if (Array.isArray(result)) {
+            dataSource = result
+          } else if (Array.isArray(result.records)) {
+            dataSource = result.records
+          }
+        }
+        tab.dataSource = dataSource
         typeof success === 'function' ? success(res) : ''
       }).finally(() => {
         tab.loading = false

ant-design-vue-jeecg/src/mixins/JeecgListMixin.js

@@ -4,7 +4,7 @@
  * data中url定义 list为查询列表  delete为删除单条记录  deleteBatch为批量删除
  */
 import { filterObj } from '@/utils/util';
-import { deleteAction, getAction,downFile } from '@/api/manage'
+import { deleteAction, getAction,downFile,getFileAccessHttpUrl } from '@/api/manage'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from "@/store/mutation-types"
 
@@ -47,16 +47,18 @@ export const JeecgListMixin = {
       /* 高级查询条件生效状态 */
       superQueryFlag:false,
       /* 高级查询条件 */
-      superQueryParams:""
+      superQueryParams: '',
+      /** 高级查询拼接方式 */
+      superQueryMatchType: 'and',
     }
   },
   created() {
-    if(!this.disableMixinCreated){
-      console.log(' -- mixin created -- ')
-      this.loadData();
-      //初始化字典配置 在自己页面定义
-      this.initDictConfig();
-    }
+      if(!this.disableMixinCreated){
+        console.log(' -- mixin created -- ')
+        this.loadData();
+        //初始化字典配置 在自己页面定义
+        this.initDictConfig();
+      }
   },
   methods:{
     loadData(arg) {
@@ -84,22 +86,24 @@ export const JeecgListMixin = {
     initDictConfig(){
       console.log("--这是一个假的方法!")
     },
-    handleSuperQuery(arg) {
+    handleSuperQuery(params, matchType) {
       //高级查询方法
-      if(!arg){
+      if(!params){
         this.superQueryParams=''
         this.superQueryFlag = false
       }else{
         this.superQueryFlag = true
-        this.superQueryParams=JSON.stringify(arg)
+        this.superQueryParams=JSON.stringify(params)
+        this.superQueryMatchType = matchType
       }
-      this.loadData()
+      this.loadData(1)
     },
     getQueryParams() {
       //获取查询条件
       let sqp = {}
       if(this.superQueryParams){
         sqp['superQueryParams']=encodeURI(this.superQueryParams)
+        sqp['superQueryMatchType'] = this.superQueryMatchType
       }
       var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
       param.field = this.getQueryField();
@@ -206,6 +210,10 @@ export const JeecgListMixin = {
     handleToggleSearch(){
       this.toggleSearchStatus = !this.toggleSearchStatus;
     },
+    // 给popup查询使用(查询区域不支持回填多个字段，限制只返回一个字段)
+    getPopupField(fields){
+      return fields.split(',')[0]
+    },
     modalFormOk() {
       // 新增/修改 成功时，重载列表
       this.loadData();
@@ -286,7 +294,7 @@ export const JeecgListMixin = {
       if(text && text.indexOf(",")>0){
         text = text.substring(0,text.indexOf(","))
       }
-      return window._CONFIG['staticDomainURL']+"/"+text
+      return getFileAccessHttpUrl(text)
     },
     /* 文件下载 */
     uploadFile(text){
@@ -297,7 +305,8 @@ export const JeecgListMixin = {
       if(text.indexOf(",")>0){
         text = text.substring(0,text.indexOf(","))
       }
-      window.open(window._CONFIG['staticDomainURL']+ "/"+text);
+      let url = getFileAccessHttpUrl(text)
+      window.open(url);
     },
   }
 

ant-design-vue-jeecg/src/mixins/OnlAutoListMixin.js

@@ -1,78 +0,0 @@
-export const HrefJump = {
-  data() {
-    return {
-      fieldHrefSlots: [],
-      hrefComponent: {
-        model: {
-          title: '',
-          width: '100%',
-          visible: false,
-          destroyOnClose: true,
-          style: {
-            top: 0,
-            left: 0,
-            height: '100%',
-            margin: 0,
-            padding: 0
-          },
-          bodyStyle: { padding: '8px', height: 'calc(100vh - 108px)', overflow: 'auto', overflowX: 'hidden' },
-          // 隐藏掉取消按钮
-          cancelButtonProps: { style: { display: 'none' } },
-          afterClose: () => {
-            // 恢复body的滚动
-            document.body.style.overflow = null
-          }
-        },
-        on: {
-          ok: () => this.hrefComponent.model.visible = false,
-          cancel: () => this.hrefComponent.model.visible = false
-        },
-        is: null,
-        params: {},
-      }
-    }
-  },
-  methods: {
-    //支持链接href跳转
-    handleClickFieldHref(field, record) {
-      let href = field.href
-      let urlPattern = /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_]*)?/
-      let compPattern = /\.vue(\?.*)?$/
-      if (typeof href === 'string') {
-        href = href.trim().replace(/\${([^}]+)?}/g, (s1, s2) => record[s2])
-        if (urlPattern.test(href)) {
-          window.open(href, '_blank')
-        } else if (compPattern.test(href)) {
-          this.openHrefCompModal(href)
-        } else {
-          this.$router.push(href)
-        }
-      }
-    },
-    openHrefCompModal(href) {
-      // 解析 href 参数
-      let index = href.indexOf('?')
-      let path = href
-      if (index !== -1) {
-        path = href.substring(0, index)
-        let paramString = href.substring(index + 1, href.length)
-        let paramArray = paramString.split('&')
-        let params = {}
-        paramArray.forEach(paramObject => {
-          let paramItem = paramObject.split('=')
-          params[paramItem[0]] = paramItem[1]
-        })
-        this.hrefComponent.params = params
-      } else {
-        this.hrefComponent.params = {}
-      }
-      this.hrefComponent.model.visible = true
-      this.hrefComponent.model.title = '@/views/' + path
-      this.hrefComponent.is = () => import('@/views/' + (path.startsWith('/')?path.slice(1):path))
-      // 禁止body滚动，防止滚动穿透
-      setTimeout(() => {
-        document.body.style.overflow = 'hidden'
-      }, 300)
-    },
-  }
-}

ant-design-vue-jeecg/src/mixins/OnlineCommonUtil.js

@@ -0,0 +1,26 @@
+import { formatDate } from '@/utils/util'
+import Area from '@/components/_util/Area'
+
+const onlUtil = {
+  data(){
+    return {
+      mixin_pca:''
+    }
+  },
+  created(){
+    this.mixin_pca = new Area()
+  },
+  methods:{
+    simpleDateFormat(millisecond, format){
+      return formatDate(millisecond, format)
+    },
+    getPcaText(code){
+      return this.mixin_pca.getText(code);
+    },
+    getPcaCode(text){
+      return this.mixin_pca.getCode(text)
+    }
+  }
+}
+
+export  { onlUtil }