cloud-web-corejs 1.0.219 → 1.0.220

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.219",
+  "version": "1.0.220",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/baseAlert/index.vue

@@ -11,7 +11,7 @@
       @close="closeDialog"
     >
       <div class="cont" ref="cont">
-        {{ content }}
+        <p v-html="content"></p>
       </div>
       <span slot="footer" class="dialog-footer">
         <input

package/src/components/excelExport/exportFieldDialog.vue

@@ -186,7 +186,7 @@ export default {
       } else {
         //导出子表数据
         let exportItemColumns = target.exportItemColumns || [];
-        let originOption = target.originOption;
+        let originOption = target.params.originOption;
         let oriExportItemColumns = originOption.exportItemConfig?.columns || [];
 
         this.loopColumnHandle(oriExportItemColumns, (item) => {
@@ -223,7 +223,7 @@ export default {
       let exportItem = this.param.type === "exportItem";
 
       let $grid = this.getGrid();
-      let originOption = $grid.originOption;
+      let originOption = $grid.params.originOption;
       let leafColumns = this.$refs.tree.getCheckedNodes(true);
       let checkLeafIds = leafColumns.map((item) => item.id);
 
@@ -277,7 +277,7 @@ export default {
     },
     dialogConfirm() {
       let target = this.getGrid();
-      let originOption = target.originOption;
+      let originOption = target.params.originOption;
       let leafColumns = this.$refs.tree.getCheckedNodes(true);
       let checkIds = this.$refs.tree.getCheckedNodes(false, true).map((item) => item.id);
       let exportItem = this.param.type == "exportItem";

package/src/components/excelExport/index.vue

@@ -1,11 +1,26 @@
 <template>
   <div class="inner-dialog">
     <span v-if="isMinimize" class="export-box-small">
-      <a href="javascript:void(0)" @click="handleMinimize"><p>列表导出<i class="el-icon-zoom-in"></i></p>
-      <el-progress  :percentage="percentageNum" :show-text="false" :stroke-width="3" status="success"></el-progress></a>
+      <a href="javascript:void(0)" @click="handleMinimize"
+        ><p>
+          {{ $t2("列表导出", "components.excelExport.listExport")
+          }}<i class="el-icon-zoom-in"></i>
+        </p>
+        <el-progress
+          :percentage="percentageNum"
+          :show-text="false"
+          :stroke-width="3"
+          status="success"
+        ></el-progress
+      ></a>
     </span>
-    <exportFieldDialog :visiable.sync="showExportFieldDialog" v-if="showExportFieldDialog" :param="param" @close="closeExportFieldDialog"
-                       @confirm="confirmExportFieldDialog"></exportFieldDialog>
+    <exportFieldDialog
+      :visiable.sync="showExportFieldDialog"
+      v-if="showExportFieldDialog"
+      :param="param"
+      @close="closeExportFieldDialog"
+      @confirm="confirmExportFieldDialog"
+    ></exportFieldDialog>
     <el-dialog
       ref="exportDialog"
       :title="title"
@@ -18,49 +33,55 @@
       :modal-append-to-body="false"
       @close="dialogClose2"
     >
-     <!-- <el-button class="isFullIcon" @click="handleMinimize">
+      <!-- <el-button class="isFullIcon" @click="handleMinimize">
         <el-tooltip effect="dark" content="缩小" placement="top">
           <i class="el-icon-minus"></i>
         </el-tooltip>
       </el-button> -->
       <div class="export-box">
-        <div class="tips">{{ $t2('导出中，请勿关闭当前窗口', 'components.excelExport.tip') }}</div>
-        <el-progress :text-inside="true" :stroke-width="26" :percentage="percentageNum"
-                     class="export-progress"></el-progress>
+        <div class="tips">
+          {{ $t2("导出中，请勿关闭当前窗口", "components.excelExport.tip") }}
+        </div>
+        <el-progress
+          :text-inside="true"
+          :stroke-width="26"
+          :percentage="percentageNum"
+          class="export-progress"
+        ></el-progress>
         <vxe-grid ref="exportTable" v-bind="exportGrid">
-          <template #row_edit="{row}">
+          <template #row_edit="{ row }">
             <a href="javascript:void(0);" class="a-link" @click="exportAll(row)">
-              <i class="el-icon-download"/>
-              {{ $t2('下载', 'system.button.download') }}
+              <i class="el-icon-download" />
+              {{ $t2("下载", "system.button.download") }}
             </a>
           </template>
         </vxe-grid>
       </div>
       <span slot="footer" class="dialog-footer">
-				<div class="fl import-count">
-					<span class="f-red doneNum">{{ doneSize }}</span>
-					/
-					<span class="dataSize">{{tTotalSize}}</span>
-				</div>
-				<el-button type="primary" plain class="button-sty" @click="dialogClose2">
-					<i class="el-icon-close el-icon"></i>
-					{{ $t2('取 消', 'system.button.cancel2') }}
-				</el-button>
-				<el-button type="primary" @click="dialogClose2" class="button-sty">
-					<i class="el-icon-check el-icon"></i>
-					{{ $t2('确 定', 'system.button.confirm2') }}
-				</el-button>
-			</span>
+        <div class="fl import-count">
+          <span class="f-red doneNum">{{ doneSize }}</span>
+          /
+          <span class="dataSize">{{ tTotalSize }}</span>
+        </div>
+        <el-button type="primary" plain class="button-sty" @click="dialogClose2">
+          <i class="el-icon-close el-icon"></i>
+          {{ $t2("取 消", "system.button.cancel2") }}
+        </el-button>
+        <el-button type="primary" @click="dialogClose2" class="button-sty">
+          <i class="el-icon-check el-icon"></i>
+          {{ $t2("确 定", "system.button.confirm2") }}
+        </el-button>
+      </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {mixins} from './mixins';
+import { mixins } from "./mixins";
 
 export default {
-  name: 'excelExport2',
-  mixins: [mixins]
+  name: "excelExport2",
+  mixins: [mixins],
 };
 </script>
 
@@ -84,13 +105,13 @@ export default {
     padding: 0;
   }
 }
-.export-box-small{
+.export-box-small {
   position: absolute;
   left: 0;
   top: 0;
   width: 93px;
   line-height: 23px;
-  height:26px;
+  height: 26px;
   font-size: 12px;
   color: #fff;
   white-space: nowrap;
@@ -100,13 +121,20 @@ export default {
   border-radius: 2px;
   background: #2a6494;
   text-align: center;
-  .el-progress{position: absolute;bottom:-2.5px;left:0;right:0;}
-  p{margin:0;}
-  i{
+  .el-progress {
+    position: absolute;
+    bottom: -2.5px;
+    left: 0;
+    right: 0;
+  }
+  p {
+    margin: 0;
+  }
+  i {
     vertical-align: middle;
     margin-left: 8px;
     font-size: 14px;
-    color: #FFF;
+    color: #fff;
   }
 }
 </style>

package/src/components/excelExport/mixins.js

@@ -166,7 +166,7 @@ function getGrid(that, tableRef) {
 
         let that = this;
         let options = this.option;
-        let title = options.title || this.$t2('导出', 'components.excelExport.title');
+        let title = options.title? this.$t1(options.title) : this.$t2('导出', 'components.excelExport.title');
         if (!options.prefix && options.prefix !== '') {
           let originOption = this.tableTarget.params.originOption;
           let path = originOption.exportPath || originOption.path;
@@ -485,11 +485,15 @@ function getGrid(that, tableRef) {
 
           if (!originOption.exportAjax) {
             let turl = url.replace("searchCount=false", "1=1");
+            let finaParams = params;
+            if(originOption.paramHandle){
+              finaParams = originOption.paramHandle ? originOption.paramHandle(params) || {} : {};
+            }
             promise = that.$commonHttp({
               aes: originOption.aes || false,
               url: turl,
               method: "post",
-              data: params,
+              data: finaParams,
               modal: false,
               queryCreateInfo: originOption.queryCreateInfo,
               addCreateInfo: originOption.addCreateInfo
@@ -769,16 +773,15 @@ function getGrid(that, tableRef) {
               }
               let exportType = column.params?.exportType;
               let exportVal = column.params && column.params.exportVal ? column.params.exportVal : null;
-
-              resultStr = getCellValue(params);
-
               if (exportVal) {
                 resultStr = exportVal(params);
               } else if (exportType === "Number") {
+                resultStr = getCellValue(params);
                 if (resultStr !== null && resultStr !== undefined && resultStr !== "" && !(resultStr + "").startsWith("[EXPNUM]")) {
                   resultStr = "[EXPNUM]" + resultStr;
                 }
               } else if (exportType === "Image" || (showImageAtTable && exportType === "Image2")) {
+                resultStr = getCellValue(params);
                 let attachments = row[column.field];
                 if (attachments) {
                   if (Array.isArray(attachments)) {
@@ -803,6 +806,8 @@ function getGrid(that, tableRef) {
                 } else {
                   resultStr = null;
                 }
+              }else{
+                resultStr = getCellValue(params);
               }
               contents.push(resultStr);
               resultStr = null;

package/src/components/table/util/index.js

@@ -19,6 +19,10 @@ function destroyTempSoltConstructorInstance() {
   }
 }
 
+export function getFilterValue(obj){
+  return getCellValue(obj);
+}
+
 export function getCellValue(obj) {
   let {column, $table} = obj;
   let params = createParams(obj);

package/src/components/table/vxeFilter/index.js

@@ -3,7 +3,7 @@ import XEUtils from 'xe-utils';
 import FilterComplex from './FilterComplex.vue';
 import FilterContent from './FilterContent.vue';
 import FilterInput from './FilterInput.vue';
-import {getCellValue} from "../util/index.js";
+import {getFilterValue} from "../util/index.js";
 
 let moudule = {};
 let configUtil = {
@@ -78,7 +78,7 @@ configUtil.VXETable.renderer.add('FilterContent', {
     const {
       vals
     } = option.data;
-    let cellValue = getCellValue(obj);
+    let cellValue = getFilterValue(obj);
     return vals.includes(cellValue);
   }
 });
@@ -141,7 +141,7 @@ configUtil.VXETable.renderer.add('FilterInput', {
       data
     } = option;
 
-    let cellValue = getCellValue(obj);
+    let cellValue = getFilterValue(obj);
 
     if (cellValue) {
       return cellValue.indexOf(data) > -1;

package/src/components/table/vxeFilter/mixin.js

@@ -1,4 +1,4 @@
-import {getCellValue, createParams} from "../util/index.js";
+import {getFilterValue, createParams} from "../util/index.js";
 let modules = {};
 
 modules = {
@@ -52,7 +52,7 @@ modules = {
         let lsm = {};
         let colValList = [];
         fullData.map((row, $rowIndex) => {
-          let cellValue = getCellValue({
+          let cellValue = getFilterValue({
             row,
             $rowIndex,
             $table,
@@ -106,14 +106,14 @@ modules = {
               row,
               column: filterColumn,
             });
-            let cellValue = getCellValue(param);
+            let cellValue = getFilterValue(param);
             return !vals.includes(cellValue);
           });
           return item === null || item === undefined;
         });
         let lsm2 = {};
         datas.map((row, $rowIndex) => {
-          let cellValue = getCellValue({
+          let cellValue = getFilterValue({
             row,
             $rowIndex,
             $table,