centaline-data-driven-v3 0.0.46 → 0.0.47

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.0.46",
+  "version": "0.0.47",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/assets/commonWeb.css

@@ -80,7 +80,7 @@ body {
   line-height: normal;
 }
 
-.ct-form-tip{
+.ct-form-tip {
   background-color: #ffe7cc;
   border-color: #ffe7cc;
   border-radius: 5px;
@@ -114,6 +114,7 @@ body {
   line-height: 26px;
   color: var(--centalineGray);
 }
+
 .sufLabel2 {
   margin-left: 20px;
   font-size: 12px;
@@ -146,7 +147,8 @@ body {
   margin: auto;
   box-shadow: 0 2px 20px 0 rgb(0 0 0 / 10%);
 }
-.unitName{
+
+.unitName {
   font-size: 12px;
   line-height: 26px;
 }
@@ -418,6 +420,7 @@ body {
   cursor: pointer;
   color: #2E58E6;
 }
+
 .ct-tablecurrencyImg {
   width: 24px;
   margin-top: 2px;
@@ -777,6 +780,11 @@ body {
   margin-right: 15px;
 }
 
+.ct-Radio .el-checkbox .el-checkbox__label {
+  display: flex;
+  align-items: center;
+}
+
 #ct-TreeList .el-main {
   padding: 0 0 0 10px;
 }
@@ -799,9 +807,11 @@ body {
 .viewerMenu .el-sub-menu__title .el-sub-menu__icon-arrow {
   display: inline-block;
 }
-.handle{
-  cursor: move; 
-  user-select: none; /* 禁止文本选择 */
+
+.handle {
+  cursor: move;
+  user-select: none;
+  /* 禁止文本选择 */
 }
 
 
@@ -1035,7 +1045,8 @@ body {
   width: 14px;
   height: 14px;
 }
-.ct-Radio .el-radio.el-radio--small .el-radio__label{
+
+.ct-Radio .el-radio.el-radio--small .el-radio__label {
   height: 24px;
   line-height: 24px;
 }
@@ -1053,21 +1064,26 @@ body {
   border-color: #EE6B6B;
   color: #EE6B6B;
 }
-.el-tag--small{
+
+.el-tag--small {
   height: auto;
   line-height: 16px;
   padding: 3px 9px;
 }
-.el-checkbox.el-checkbox--small{
+
+.el-checkbox.el-checkbox--small {
   height: auto;
   padding: 5px 0;
 }
-.ct-photoSelectList .el-checkbox.el-checkbox--small .el-checkbox__inner{
+
+.ct-photoSelectList .el-checkbox.el-checkbox--small .el-checkbox__inner {
   width: 15px;
   height: 15px;
   border: 1px solid #ed745f;
 }
-.ct-photoSelectList .el-checkbox__input.is-checked .el-checkbox__inner{
+
+.ct-photoSelectList .el-checkbox__input.is-checked .el-checkbox__inner {
   background-color: #ed745f;
 }
+
 /*elementPlus样式重置结束*/

package/src/components/app/CheckBoxList.vue

@@ -1,12 +1,20 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
-            <van-checkbox-group v-model="model.value" direction="horizontal" @change="change"
-                :disabled="model.locked" :max="parseInt(model.maxValue1 || 999)">
-                <van-checkbox v-for="item in model.selectItems1" :key="item.code" shape="square" :name="item.code"
-                :style="{ width: model.width1 + 'px' }" style="white-space: normal;">
-                   <span v-html="item.name"></span>
-                </van-checkbox>
+            <van-checkbox-group v-model="model.value" direction="horizontal" @change="change" :disabled="model.locked"
+                :max="parseInt(model.maxValue1 || 999)">
+                <template v-for="item in model.selectItems1" :key="item.code">
+                    <van-checkbox shape="square" :name="item.code" :style="{ width: model.width1 + 'px' }"
+                        style="white-space: normal;">
+                        <span v-html="item.name"></span>
+                    </van-checkbox>
+                    <van-popover v-if="item.toolTip">
+                        <div v-html="item.toolTip" style="font-size: 14px;padding: 10px;"></div>
+                        <template #reference>
+                            <van-icon name="info" size="20" style="top: 5px;" />
+                        </template>
+                    </van-popover>
+                </template>
             </van-checkbox-group>
         </template>
     </ct-field>
@@ -14,7 +22,7 @@
 <script lang="ts" setup>
 import { initData, changeHandler } from '../../utils/mixins';
 import CheckBoxList from '../../loader/src/CheckBoxList';
-const emit = defineEmits(['click', 'change','search'])
+const emit = defineEmits(['click', 'change', 'search'])
 const props = defineProps({
     parameterAction: String,
     vmodel: Object,

package/src/components/app/PhotoSelectList.vue

@@ -205,13 +205,7 @@ function allchoose() {
 function handleClick() {
     if (chooseList.value && chooseList.value.length > 0) {
         emit('handlePhoto', chooseList.value);
-    } else {
-        ElMessage({
-            message: "请选择至少一张图片",
-            type: 'warning',
-            showClose: true,
-        });
-    }
+    } 
 }
 function rolRouterCellClickHandler(routerKey, rowindex, sourceIndex) {
     if (routerKey == 'photoPreview') {

package/src/components/app/SearchList/SearchStats.vue

@@ -21,9 +21,14 @@ const props = defineProps({
         Boolean,
         default: false,
     },
+    apiParam: {
+        type: Object,
+        default: () => { }
+    },
 })
 const model = ref(null)
 const selectStats = ref("")
+const fieldName1 = ref("")
 const tableStatistics = ref()
 function searchStatsComplate() {
     nextTick(function () {
@@ -40,6 +45,17 @@ function searchStatsComplate() {
 }
 function load(data) {
     model.value = data;
+    data.source.content.forEach((item) => {
+        fieldName1.value = item.fieldName1;
+    });
+    if (selectStats.value == '') {
+        var i = data.source.content.findIndex((v) => {
+            return v.code1 == props.apiParam[fieldName1.value];
+        });
+        if (i > -1) {
+            selectStats.value = i
+        }
+    }
     emit("setTableHeight");
 }
 function handleClick(ev) {

package/src/components/app/SearchList/SearchTable.vue

@@ -1,7 +1,8 @@
 <template>
     <div class="ct-searchtableAPP" ref="refSearchTable" v-if="model">
         <SearchStats ref="refTableStats" v-if="model && searchStatsApi" :api="searchStatsApi"
-            @searchStats="clickSearchStats" :searchModel="model.searchModel" @setTableHeight="setTableHeight">
+            @searchStats="clickSearchStats" :searchModel="model.searchModel" @setTableHeight="setTableHeight"
+            :apiParam="apiParam">
         </SearchStats>
         <div class="ct-table-tip ct-table-tip-mini" style="display: block;" ref="refListHeader"
             v-if="model && model.listHeader" v-html="model.listHeader">
@@ -16,7 +17,7 @@
                         <van-radio-group v-model="checkeds" ref="refCheckboxGroup">
                             <div class="ct-list" v-for="(row, rowindex) in model.listData" :key="rowindex">
                                 <van-radio @click="selectRow(row)" icon-size="16px" checked-color="#EE6B6B"
-                                    :name="rowindex" :disabled="row.flagSelect == false ? true : false"> </van-radio>
+                                    :name="rowindex" :disabled="!flagSelect(row)"> </van-radio>
                                 <ct-layout :vmodel="row" :cellLayout="model.cellLayout" :rowindex="rowindex"
                                     :key="itemKey" @rolRouterclick="rolRouterCellClickHandler"
                                     :actionRouter="model.actionRouter"
@@ -30,7 +31,7 @@
                             <div class="ct-list" v-for="(row, rowindex) in model.listData" :key="rowindex">
                                 <van-checkbox v-if="isoperate || flagPopupSearchlist" shape="square"
                                     checked-color="#EE6B6B" icon-size="14px" :name="rowindex" @click="selectRow(row)"
-                                    :disabled="row.flagSelect == false ? true : false"></van-checkbox>
+                                    :disabled="!flagSelect(row)"></van-checkbox>
                                 <ct-layout :vmodel="row" :cellLayout="model.cellLayout" :rowindex="rowindex"
                                     :key="itemKey" @rolRouterclick="rolRouterCellClickHandler"
                                     :actionRouter="model.actionRouter"
@@ -90,6 +91,10 @@ const props = defineProps({
     api: String,
     searchStatsApi: String,
     flagAppMode: Boolean,
+    apiParam: {
+        type: Object,
+        default: () => { }
+    },
     flagFocus: {
         Boolean,
         default: true,
@@ -461,6 +466,12 @@ function confirmClickHandler() {
         emit('submit', rtnData);
     }
 }
+function flagSelect(row) {
+    if (!model.value.rightCheckBoxColumn || common.getDataOfUpperLower(row, model.value.rightCheckBoxColumn) == 1) {
+        return true;
+    }
+    return false;
+}
 defineExpose({
     model,
     searchComplate,

package/src/components/app/SearchList.vue

@@ -10,7 +10,8 @@
             @showTitle="showTitleScreenHandler" @sort="loadsort"></ct-searchscreen>
         <searchTable ref="refTable" :api="searchDataApi" :searchStatsApi="searchStatsApi"
             :flagPopupSearchlist="flagPopupSearchlist" :singleSelectio="singleSelectio" :flagTabbar="flagTabbar"
-            @scrollHandle="scrollHandle" v-on:submit="popupSearchListConfirm" @loaded="tableLoaded"></searchTable>
+            :apiParam="apiParam" @scrollHandle="scrollHandle" v-on:submit="popupSearchListConfirm"
+            @loaded="tableLoaded"></searchTable>
     </div>
 </template>
 <script lang="ts" setup>
@@ -111,17 +112,17 @@ function tableLoaded() {
     var router = refTable.value.model.buttons.find((v) => {
         return v.key === 'sort';
     });
-    if(router&&refScreen.value){
+    if (router && refScreen.value) {
         refScreen.value.getsortfield(router);
     }
     emit('loaded', refTable.value.model);
 }
-function loadsort(ev){
+function loadsort(ev) {
     if (refTable.value.model) {
         refTable.value.model.sortString = ev.code;
         refTable.value.getPage(1);
     }
-   
+
 }
 function showTitleScreenHandler() {
 

package/src/components/app/ViewerFile.vue

@@ -192,6 +192,7 @@ function onswipenext() {
     display: inline-block !important;
     font-size: 14px;
     padding: 10px;
+    background: rgba(0, 0, 0, .45);
 }
 
 .enlarge-picture {

package/src/components/app/searchScreen.vue

@@ -6,7 +6,7 @@
                     style=" width: 100%;">
                     <van-dropdown-item v-for="(field, index) in screendata" :key="index" ref="Refitem"
                         :title-class="field.searchValue || field.searchValue1 ? 'title color-EE6B6B' : 'title'"
-                        @open="open(field)" @close="close(field)">
+                        @open="open(field)" @close="close(field)" :disabled="field.locked">
                         <template #title>
                             <span v-if="field.searchValue || field.searchValue1">{{ getLableShow(field) }}</span>
                             <span v-else>{{ field.controlLabel }}</span>
@@ -16,31 +16,31 @@
                         <div style="padding: 5px 16px; display: flex;" v-if="field.is != 'ct-combobox'">
                             <van-button color="#ECECEC" block @click="field.reset()"
                                 style="color:333333;margin-right: 10px;">
-                                重置
+                                {{ getBtnLabel(Enum.ControlType.ButtonReset, '重置') }}
                             </van-button>
                             <van-button color="#FF5252" block @click="clickHandler(field)">
-                                确定
+                                {{ getBtnLabel(Enum.ControlType.ButtonSearch, '确定') }}
                             </van-button>
                         </div>
                     </van-dropdown-item>
                     <van-dropdown-item v-if="ismore" key="4" title="更多" ref="RefitemMore" title-class="title"
                         class="screen-more" @open="openMore" @close="closeMore">
                         <template v-for="(field, index) in model.screen" :key="index">
-                            <component :is="field.is" :vmodel="field" ref="Fields"
+                            <component v-if="field.show !== false" :is="field.is" :vmodel="field" ref="Fields"
                                 :parameterAction="model.parameterAction" />
                         </template>
                         <template v-for="(field, index) in model.highScreen" :key="index">
-                            <component :is="field.is" :vmodel="field" ref="Fields"
+                            <component v-if="field.show !== false" :is="field.is" :vmodel="field" ref="Fields"
                                 :parameterAction="model.parameterAction" />
                         </template>
                         <van-sticky position="bottom">
                             <div style="padding: 5px 16px; display: flex;background-color: #ffffff;">
                                 <van-button color="#ECECEC" block @click="reset"
                                     style="color:333333;margin-right: 10px;">
-                                    重置
+                                    {{ getBtnLabel(Enum.ControlType.ButtonReset, '重置') }}
                                 </van-button>
                                 <van-button color="#FF5252" block @click="clickHandlerMore()">
-                                    确定
+                                    {{ getBtnLabel(Enum.ControlType.ButtonSearch, '确定') }}
                                 </van-button>
                             </div>
                         </van-sticky>
@@ -157,7 +157,9 @@ function failLoad() {
 //无任何筛选条件时，不显示该div
 function setScreenShow() {
     let showField = model.value.screen.find((v) => {
-        return v.show !== false;
+        return v.show !== false &&
+            v.controlType !== Enum.ControlType.LineFeed &&
+            v.controlType !== Enum.ControlType.IndependentGroup;
     });
     if (!showField) {
         showField = model.value.btnScreen.find((v) => {
@@ -172,8 +174,9 @@ function setscreendata() {
     screendata.value = [];
     var screens = model.value.screen.filter((v, i) => {
         return (
-            v.show === true &&
-            v.type != Enum.ControlType.IndependentGroup
+            v.show !== false &&
+            v.controlType !== Enum.ControlType.IndependentGroup &&
+            v.controlType !== Enum.ControlType.LineFeed
         );
     });
     if (screens.length > 4) {
@@ -280,10 +283,14 @@ function closeMore() {
 function setsearchdata() {
     searchdata.value = [];
     var screens = model.value.screen.filter((v) => {
-        return v.show === true && v.controlType != Enum.ControlType.IndependentGroup;
+        return v.show === true &&
+            v.controlType != Enum.ControlType.IndependentGroup &&
+            v.controlType !== Enum.ControlType.LineFeed;
     });
     var highScreen = model.value.highScreen.filter((v) => {
-        return v.show === true && v.controlType != Enum.ControlType.IndependentGroup;
+        return v.show === true &&
+            v.controlType != Enum.ControlType.IndependentGroup &&
+            v.controlType !== Enum.ControlType.LineFeed;
     });
     screens = [...screens, ...highScreen];
     screens.forEach((v) => {
@@ -337,6 +344,16 @@ function selectsort(ev) {
     }
     emit("sort", ev);
 }
+function getBtnLabel(controlType, controlLabel) {
+    let rtn = controlLabel;
+    let field = model.value.btnScreen.find((v) => {
+        return v.controlType === controlType;
+    });
+    if (field) {
+        rtn = field.controlLabel
+    }
+    return rtn;
+}
 function getLableShow(field) {
     let labelShow = field.searchName;
     if (!labelShow) {

package/src/components/web/CheckBoxList.vue

@@ -1,11 +1,19 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
-            <div class="ct-Radio fieldControl" :class="[model.value !== ''&&model.value.length>0&&!model.locked ? 'hasValue' : '']" >
-                <el-checkbox-group v-model="model.value" @change="change" :max="parseInt(model.maxValue1 || 999)" style="display: inline-block;">
+            <div class="ct-Radio fieldControl"
+                :class="[model.value !== '' && model.value.length > 0 && !model.locked ? 'hasValue' : '']">
+                <el-checkbox-group v-model="model.value" @change="change" :max="parseInt(model.maxValue1 || 999)"
+                    style="display: inline-block;">
                     <el-checkbox v-bind="model.attrs" v-for="(item, index) in model.selectItems1" :key="index"
-                        :label="item.code" :disabled="model.locked" :style="{ width: model.width1 + 'px' }" style="white-space: normal;">
+                        :label="item.code" :disabled="model.locked" :style="{ width: model.width1 + 'px' }"
+                        style="white-space: normal;">
                         <span v-html="item.name" style="line-height: 16px;"></span>
+                        <el-icon :size="18" v-if="item.toolTip" style="margin-left: 5px;">
+                            <el-tooltip  raw-content :content="item.toolTip" placement="top" effect="light">
+                                <WarningFilled />
+                            </el-tooltip>
+                        </el-icon>
                     </el-checkbox>
                     <el-icon @click="clearClickHandle" class="el-range__close-icon" style="margin-left: 10px;">
                         <CircleClose />
@@ -18,7 +26,7 @@
 <script lang="ts" setup>
 import { initData, changeHandler } from '../../utils/mixins';
 import CheckBoxList from '../../loader/src/CheckBoxList';
-const emit = defineEmits(['click', 'change','search'])
+const emit = defineEmits(['click', 'change', 'search'])
 const props = defineProps({
     parameterAction: String,
     vmodel: Object,
@@ -33,7 +41,7 @@ function change() {
 }
 function clearClickHandle() {
     model.value.reset()
-     change()
+    change()
 }
 defineExpose({
     model

package/src/components/web/PhotoSelect.vue

@@ -6,9 +6,10 @@
 
                     <li class="el-upload-list__item is-success" v-bind:key="index">
                         <div class="cover-list-item">
-                            <el-image fit="fill" :src="element.thumbnailUrl" style="width: 100px; height: 100px"
-                                @click.stop="viewerfile(model.fileList, index)">
-                            </el-image>
+                            <div @click.stop="viewerfile(model.fileList, index)">
+                                <el-image fit="fill" :src="element.thumbnailUrl" style="width: 100px; height: 100px">
+                                </el-image>
+                            </div>
                             <span class="cover-list-item-play" v-if="element.videoPlayIconUrl">
                                 <div class="swiper-i" @click.stop="viewerfile(model.fileList, index)">
                                     <img :src="element.videoPlayIconUrl" class="hous-icon" />

package/src/components/web/PhotoSelectList.vue

@@ -211,13 +211,7 @@ function allchoose() {
 function handleClick() {
     if (chooseList.value && chooseList.value.length > 0) {
         emit('handlePhoto', chooseList.value);
-    } else {
-        ElMessage({
-            message: "请选择至少一张图片",
-            type: 'warning',
-            showClose: true,
-        });
-    }
+    } 
 }
 function rolRouterCellClickHandler(routerKey, rowindex, sourceIndex) {
     if (routerKey == 'photoPreview') {

package/src/components/web/SearchList/SearchStats.vue

@@ -160,7 +160,7 @@ function load(data) {
         });
         if (selectStats.value == '') {
             var m = data.source.content.find((v) => {
-                return v.code1 === props.apiParam[fieldName1.value];
+                return v.code1 == props.apiParam[fieldName1.value];
             });
             if (m) {
                 selectStats.value = m.key

package/src/components/web/other/PopupSearchListTable.vue

@@ -10,7 +10,7 @@
                 <template v-else>
                     <el-table-column width="50" fixed="left">
                         <template #default="scope">
-                            <el-radio v-model="model.selectIndex" :disabled="!scope.row.flagSelect"
+                            <el-radio v-model="model.selectIndex" :disabled="!flagSelect(scope.row)"
                                 :label="scope.$index">&nbsp;</el-radio>
                         </template>
                     </el-table-column>
@@ -111,7 +111,7 @@ function loadFields() {
 
 }
 function selectable(row) {
-    if (row.flagSelect === false) {
+    if (flagSelect(row) === false) {
         return false;
     }
     return true;
@@ -136,13 +136,13 @@ function handleSelectionChange(val) {
 }
 //当单选项发生变化时会触发该事件
 function handleCurrentChange(val) {
-    if (val && val.flagSelect === false) {
+    if (val && flagSelect(val) === false) {
         return;
     }
     currentRow.value = val;
 }
 function handleCellClick(row) {
-    if (row.flagSelect === false) {
+    if (flagSelect(row) === false) {
         return;
     }
     model.value.selectIndex = row.tableIndex;
@@ -211,13 +211,16 @@ function confirmClickHandler() {
         emit('submit', multipleSelection.value);
     }
 }
+function flagSelect(row){
+    if(!model.value.rightCheckBoxColumn || common.getDataOfUpperLower(row, model.value.rightCheckBoxColumn) == 1){
+       return true;
+    }
+    return false;
+}
 //重置列宽（自适应列宽）
 function resetTabelWidth() {
     model.value.columns.forEach((c) => {
         tableData.value.forEach((t) => {
-            if (t.flagSelect !== false) {
-                t.flagSelect = true;
-            }
             var colStr = t[c.id];//动态获取每列的属性值
             c.maxLen = c.maxLen ? c.maxLen : common.strCharLen(c.name);
             c.maxLen = c.maxLen > common.strCharLen(colStr) ? c.maxLen : common.strCharLen(colStr);

package/src/loader/src/SearchScreen.js

@@ -56,7 +56,7 @@ function loadSearchScreenModel(source, prevParam) {
                     continue;
                 }
                 if ((source.fields[key].controlType === Enum.ControlType.DateRange
-                    || source.fields[key].controlType===Enum.ControlType.Location
+                    || source.fields[key].controlType === Enum.ControlType.Location
                     || source.fields[key].controlType === Enum.ControlType.DateTimeRange)
                     && source.fields[key].code2 == undefined) {
                     source.fields[key].code2 = '';
@@ -76,7 +76,8 @@ function loadSearchScreenModel(source, prevParam) {
                 return v.controlType === Enum.ControlType.ButtonSearch;
             });
             var screens = rtn.sourceFieldsArr.filter((v, i) => {
-                return (advIndex === -1 || i < advIndex) && v.controlType !== Enum.ControlType.From;
+                return (advIndex === -1 || i < advIndex) && v.controlType !== Enum.ControlType.From
+                    || v.controlType == Enum.ControlType.Hidden;
             });
 
             rtnscreens = this.initScreen(screens);
@@ -221,34 +222,34 @@ function loadSearchScreenModel(source, prevParam) {
             });
             return rtn;
         },
-        get searchDataOfHide() {      
+        get searchDataOfHide() {
             var rtn = {
-              fields: []
+                fields: []
             };
             this.screen.forEach((v) => {
-              if(v.controlType===Enum.ControlType.Hidden){
-                var tempObj = common.deepClone(v.searchObj);          
-                if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
-                  if(isHandle(v.controlType)){
-                    tempObj.searchValue1=getNewSearchValue(tempObj); 
-                  }
-                  rtn.fields.push(tempObj);           
+                if (v.controlType === Enum.ControlType.Hidden) {
+                    var tempObj = common.deepClone(v.searchObj);
+                    if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
+                        if (isHandle(v.controlType)) {
+                            tempObj.searchValue1 = getNewSearchValue(tempObj);
+                        }
+                        rtn.fields.push(tempObj);
+                    }
                 }
-              }
             });
             this.highScreen.forEach((v) => {
-              if(v.controlType===Enum.ControlType.Hidden){
-                var tempObj = common.deepClone(v.searchObj);
-                if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
-                  if(isHandle(v.controlType)){
-                    tempObj.searchValue1=getNewSearchValue(tempObj); 
-                  }
-                  rtn.fields.push(tempObj);
+                if (v.controlType === Enum.ControlType.Hidden) {
+                    var tempObj = common.deepClone(v.searchObj);
+                    if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
+                        if (isHandle(v.controlType)) {
+                            tempObj.searchValue1 = getNewSearchValue(tempObj);
+                        }
+                        rtn.fields.push(tempObj);
+                    }
                 }
-              }
             });
             return rtn;
-          },
+        },
         //绑定联动参数组件
         getRefFieldPara(refFieldNameArr) {
             let submitData = {};
@@ -397,7 +398,7 @@ function hiddenHandle(item, model) {
         }
     }
 }
-function getAction(api,  callback) {
+function getAction(api, callback) {
     request.postHandler(common.globalUri(), {
         action: api
     })

package/src/loader/src/SearchTable.js

@@ -196,7 +196,13 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                 if (this.$vue && this.$vue.searchStrat && this.$vue.searchEnd) {
                     let searchTotal = this.$vue.searchEnd - this.$vue.searchStrat;
                     if (searchTotal > 0) {
-                        data = data + " 总耗时 " + searchTotal + " 毫秒";
+                        if (data.indexOf('总耗时') > -1 || data.indexOf('總耗時') > -1) {
+                            data = data + " " + searchTotal + " 毫秒";
+                        }
+                        else {
+                            data = data + " 总耗时 " + searchTotal + " 毫秒";
+                        }
+
                     }
                 }
                 return data;

package/src/main.js

@@ -63,7 +63,7 @@ app.use(centaline, {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"1647-1802885825978044416",platform:"WEB"}',
-                authObject: '{EmpID:"Token_de95f4d5-ff59-4e26-bcbc-0581d420ca06",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_de95f4d5-ff59-4e26-bcbc-0581d420ca06",Platform:"IOS"}',
+                authObject: '{EmpID:"Token_7b4fbffd-3089-4925-87ed-bb85c501f81a",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_7b4fbffd-3089-4925-87ed-bb85c501f81a",Platform:"IOS"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作