JeecgBoot2.4.3版本发布——企业级低代码平台

ant-design-vue-jeecg/src/components/jeecg/JEditor.vue

@@ -128,6 +128,9 @@
               this.reload()
             }
           })
+          //update--begin--autor:liusq-----date:20210316------for：富文本编辑器tab父组件可能导致的赋值问题------
+          this.reload()
+          //update--end--autor:liusq-----date:20210316------for：富文本编辑器tab父组件可能导致的赋值问题------
         }else{
           //update--begin--autor:wangshuai-----date:20200724------for：富文本编辑器切换tab无法修改------
           let tabLayout = getVmParentByName(this, 'TabLayout')

ant-design-vue-jeecg/src/components/jeecg/JModal/index.vue

@@ -8,10 +8,11 @@
     v-on="$listeners"
     @ok="handleOk"
     @cancel="handleCancel"
+    destroyOnClose
   >
 
     <slot></slot>
-
+    <!--有设置标题-->
     <template v-if="!isNoTitle" slot="title">
       <a-row class="j-modal-title-row" type="flex">
         <a-col class="left">
@@ -22,6 +23,14 @@
         </a-col>
       </a-row>
     </template>
+    <!--没有设置标题-->
+    <template v-else slot="title">
+      <a-row class="j-modal-title-row" type="flex">
+        <a-col v-if="switchFullscreen" class="right" @click="toggleFullscreen">
+          <a-button class="ant-modal-close ant-modal-close-x" ghost type="link" :icon="fullscreenButtonIcon"/>
+        </a-col>
+      </a-row>
+    </template>
 
     <!-- 处理 scopedSlots -->
     <template v-for="slotName of scopedSlotsKeys" :slot="slotName">
@@ -161,7 +170,6 @@
 
 <style lang="less">
   .j-modal-box {
-
     &.fullscreen {
       top: 0;
       left: 0;
@@ -190,7 +198,6 @@
           height: calc(100% - 55px);
         }
       }
-
       &.no-title.no-footer {
         .ant-modal-body {
           height: 100%;
@@ -217,6 +224,12 @@
         }
       }
     }
+    &.no-title{
+      .ant-modal-header {
+        padding: 0px 24px;
+        border-bottom: 0px !important;
+      }
+    }
   }
 
   @media (max-width: 767px) {

ant-design-vue-jeecg/src/components/jeecg/JVxeTable/mixins/JVxeCellMixins.js

@@ -298,7 +298,11 @@ export function dispatchEvent({cell, $event}, className, handler) {
         handler(element[0])
       } else {
         // 模拟触发点击事件
-        element[0].dispatchEvent($event)
+        console.log($event)
+        if($event){
+          console.log("$event===>",$event)
+          element[0].dispatchEvent($event)
+        }
       }
     }
   }, 10)

ant-design-vue-jeecg/src/components/jeecg/JVxeTable/utils/vxeUtils.js

@@ -141,6 +141,33 @@ export async function validateFormAndTables(form, cases, autoJumpTab) {
   return dataMap
 }
 
+/**
+ * 一次性验证主表单和所有的次表单
+ * @param form 主表单 form 对象
+ * @param cases 接收一个数组，每项都是一个JVxeTable实例
+ * @param autoJumpTab
+ * @returns {Promise<any>}
+ * @author sunjianlei
+ */
+export async function validateFormModelAndTables(form,formData, cases, autoJumpTab) {
+  if (!(form && typeof form.validate === 'function')) {
+    throw `form 参数需要的是一个form对象，而传入的却是${typeof form}`
+  }
+  let dataMap = {}
+  let values = await new Promise((resolve, reject) => {
+    // 验证主表表单
+    form.validate((valid,obj) => {
+      valid ?resolve(formData): reject({error: VALIDATE_FAILED, originError: valid})
+    })
+  })
+  Object.assign(dataMap, {formValue: values})
+  // 验证所有子表的表单
+  let subData = await validateTables(cases, autoJumpTab)
+  // 合并最终数据
+  dataMap = Object.assign(dataMap, {tablesValue: subData})
+  return dataMap
+}
+
 /**
  * 验证并获取一个或多个表格的所有值
  *

ant-design-vue-jeecg/src/components/jeecg/modal/JPopupOnlReport.vue

@@ -342,7 +342,13 @@
       combineRowKey(record){
         let res = ''
          Object.keys(record).forEach(key=>{
-           res+=record[key]
+           //update-begin---author:liusq   Date:20210203  for：pop选择器列主键问题 issues/I29P9Q------------
+           if(key=='id'){
+             res=record[key]+res
+           }else{
+             res+=record[key]
+           }
+           //update-end---author:liusq     Date:20210203  for：pop选择器列主键问题 issues/I29P9Q------------
          })
         if(res.length>50){
           res = res.substring(0,50)