合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!172

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java

@@ -170,6 +170,13 @@ public class CommonController {
 //                bizPath = "";
 //            }
         }
+        if(file.getOriginalFilename().length()>70){
+            if(StringUtils.equals(cut,CutEnum.CN.getValue())){
+                throw new JeroBootException("文件名长度不能超过70位，请检查！");
+            }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){
+                throw new JeroBootException("File name length cannot exceed 70 characters, please check!");
+            }
+        }
 //        OSSFile oSSFile = ossFileService.uploadLocal(file, bizPath,state,cut);
         OSSFile oSSFile = ossFileService.uploadLocalOfCos(file, bizPath,state,cut); // 切换cos
         if (oConvertUtils.isNotEmpty(oSSFile)) {
@@ -186,6 +193,10 @@ public class CommonController {
         return result;
     }
 
+    public static void main(String[] args) {
+
+    }
+
     /**
      * 查看已上传的文件
      * @param id

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java

@@ -88,11 +88,15 @@ public class TranslationDocumentUtils {
                     if(i == 0){
                         translateFrontTextSplit = translateFrontText.substring(0,splitLength);
                     }else {
+                        //每一次截取开始的下标
+                        int startSplitLength = i*(splitLength) + 1;
                         //如果长度不够根据splitLength再截取一次。
-                        if(translateFrontText.length() < i*splitLength+(splitLength+1)){
+                        if(translateFrontText.length() < i*splitLength+(splitLength)){
-                            translateFrontTextSplit = translateFrontText.substring(i*(splitLength + 1),translateFrontText.length());
+                            if(startSplitLength < translateFrontText.length()){
+                                translateFrontTextSplit = translateFrontText.substring(startSplitLength,translateFrontText.length());
+                            }
                         }else {
-                            translateFrontTextSplit = translateFrontText.substring(i*(splitLength + 1),i*splitLength+(splitLength+1));
+                            translateFrontTextSplit = translateFrontText.substring(startSplitLength,i*splitLength+(splitLength));
                         }
                     }
 

jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue

@@ -25,7 +25,7 @@
             <!--              {{$t('engineerFeedbackResults')}}-->
             <!--            </div>-->
             <a-card :bordered="false" class="box-clause" style="margin-top: 20px" v-for="(item,index) in dataSource">
-              <div class="table-operator">
+              <div class="table-operator" v-if="item.id">
                 <div class="operator-text" style="float: left;font-size: 16px">
                   {{$t('engineer')+item.createBy+$t('feedbackResults')}}
                 </div>
@@ -146,6 +146,11 @@
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             this.dataSource = res.result || []
+            if (this.dataSource.length == 0) {
+              this.dataSource.push({
+                name: ''
+              })
+            }
             this.loading = false
           } else {
             this.dataSource = []

jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue

@@ -118,9 +118,9 @@
       @cancel="visible = false"
     >
       <template slot="footer">
-        <a-button type="primary" @click="fullTextCommentsEdit">
+        <!--        <a-button type="primary" @click="fullTextCommentsEdit">-->
-          {{$t('edit')}}
+        <!--          {{$t('edit')}}-->
-        </a-button>
+        <!--        </a-button>-->
         <a-button type="primary" :loading="confirmLoading" @click="fullTextCommentsSubmit">
           {{$t('submit')}}
         </a-button>
@@ -133,11 +133,11 @@
           <a-form-model-item class="itemModel" style="width: calc(100% - 113px)" prop="comment">
             <a-textarea :placeholder="$t('pleaseEnter')+$t('fullTextComments')"
                         v-model.trim="formInlineText.comment"
-                        :disabled="fullTextDisabled"
                         :rows="4"/>
           </a-form-model-item>
         </div>
       </a-form-model>
+      <JLoading :loading="textDataLoading">{{$t('dataLoading')}}</JLoading>
     </a-modal>
     <JLoading :loading="loading">{{dataLoadingText}}</JLoading>
   </div>
@@ -173,6 +173,7 @@
           ]
         },
         loading: false,
+        textDataLoading: false,
         visible: false,
         confirmLoading: false,
         fullTextDisabled: false,
@@ -256,11 +257,24 @@
       },
       addFullTextCommentClick() {
         this.visible = true
-        if (this.formInlineText.comment) {
+        let query = {
-          this.fullTextDisabled = true
+          id: this.$route.query.id
-        } else {
-          this.fullTextDisabled = false
         }
+        this.textDataLoading = true
+        postAction('/compare/sarFileCompareInfo/getComparisonDetail', query).then((res) => {
+          if (res.success) {
+            this.formInlineText.comment = res.result.comments || ''
+            this.formInlineText = { ...this.formInlineText }
+            this.textDataLoading = false
+          } else {
+            this.textDataLoading = false
+          }
+        })
+        // if (this.formInlineText.comment) {
+        //   this.fullTextDisabled = true
+        // } else {
+        //   this.fullTextDisabled = false
+        // }
       },
       turnOffAutomaticMatchingClick() {
         this.isMatching = !this.isMatching