centaline-data-driven-v3 0.0.73 → 0.0.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.0.73",
+  "version": "0.0.75",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",
@@ -16,9 +16,10 @@
     "moment": "^2.30.1",
     "photo-sphere-viewer": "^4.8.1",
     "sortablejs": "^1.15.6",
-    "vant": "^4.8.0", 
+    "vant": "^4.8.0",
     "vite-plugin-css-injected-by-js": "^3.3.0",
     "vue": "^3.3.4",
+    "vue-baidu-map-3x": "^1.0.40",
     "vue-cropper": "^1.1.1",
     "vue-router": "^4.2.5",
     "vue-ueditor-wrap": "^3.0.8",

package/src/assets/commonWeb.css

@@ -1044,4 +1044,21 @@ body {
   background-color: #ed745f;
 }
 
+.ct-location .el-location-input{
+  border: 1px solid var(--bagGray);
+  line-height: 24px;
+  padding-left: 5px;
+  color: var(--centalineBlue);
+  border-radius: 6px !important;
+  font-size: inherit;
+ }
+ .ct-location .el-location-input:hover{
+  border-color: var(--centalineBlue);
+ }
+ .ct-location .el-location-input:focus{
+  outline:0;
+ }
+ .h26{
+  height: 26px;
+}
 /*elementPlus样式重置结束*/

package/src/components/app/Form.vue

@@ -263,7 +263,7 @@ function validExcute() {
         if (f.model && typeof f.model.validExcute !== 'undefined') {
             if (!f.model.validExcute()) {
                 if (i === 0) {
-                    showDialog({ title: '提示', message: f.model.displayValidMessage, closeOnClickOverlay: true, confirmButtonText: '确定', className: 'showDialogMessage' });
+                    showDialog({ title: '提示', message: f.model.displayValidMessage, closeOnClickOverlay: true, confirmButtonText: common.LocalizedString('确定', '確認'), className: 'showDialogMessage' });
                 }
                 i++
                 //滚动条跳转到第一个验证不通过的组件位置

package/src/components/app/PhotoSelectList.vue

@@ -9,10 +9,12 @@
             <template v-if="imageList.length > 0">
                 <template v-if="layout">
                     <div style="display: flex;" v-for="(item, index) in imageList" :key="index">
-                        <van-checkbox style="margin: 0 5px;" @change="choose(item, true)" v-model="item.ischeck"
+                        <van-radio v-if="selectedMode == 1" @click="chooseRadio(item)" style="margin: 0 5px;"
+                            :checked="item.ischeck" icon-size="14px"></van-radio>
+                        <van-checkbox v-else style="margin: 0 5px;" @change="choose(item, true)" v-model="item.ischeck"
                             shape="square" icon-size="14px"></van-checkbox>
-                        <ct-layout :vmodel="item" :cellLayout="layout" :key="itemKey"  :rowindex="index" :flagMediaSelect="true"
-                            @rolRouterclick="rolRouterCellClickHandler">
+                        <ct-layout :vmodel="item" :cellLayout="layout" :key="itemKey" :rowindex="index"
+                            :flagMediaSelect="true" @rolRouterclick="rolRouterCellClickHandler">
                         </ct-layout>
                     </div>
                 </template>
@@ -39,13 +41,14 @@
                 </template>
             </template>
             <template v-else>
-                <van-empty :description="common.LocalizedString('没有数据','沒有數據')" />
+                <van-empty :description="common.LocalizedString('没有数据', '沒有數據')" />
             </template>
         </div>
         <div class="PhotoSelectList-bottom">
-            <van-checkbox @change="allchoose" v-model="allcheck" shape="square" icon-size="14px">{{common.LocalizedString('全选','全選')}}</van-checkbox>
+            <van-checkbox v-if="selectedMode != 1"  @change="allchoose" v-model="allcheck" shape="square"
+                icon-size="14px">{{ common.LocalizedString('全选', '全選') }}</van-checkbox>
             <van-button type="primary" class="van-button-app" size="small" style="display: flex;margin-left: 30%;"
-                @click="handleClick()">{{common.LocalizedString('确定','確認')}}</van-button>
+                @click="handleClick()">{{ common.LocalizedString('确定', '確認') }}</van-button>
         </div>
     </div>
     <van-popup v-model:show="showPicker" position="bottom" :safe-area-inset-bottom="true">
@@ -68,7 +71,7 @@ import { ElMessage } from 'element-plus'
 import common from '../../utils/common'
 import util from '../../utils/pub-use'
 import PhotoSelectList from '../../loader/src/PhotoSelectList';
-const emit = defineEmits(['handlePhoto','loaded', 'failLoad'])
+const emit = defineEmits(['handlePhoto', 'loaded', 'failLoad'])
 const props = defineProps({
     Selected: Array,
     api: String,
@@ -89,6 +92,7 @@ const itemKey = ref(0)
 const mediaLabelID = ref('')
 const mediaLabelName = ref('全部')
 const options = ref([])
+const selectedMode = ref(2)
 onMounted(() => {
     nextTick(function () {
         showLoadingToast({ message: '', duration: 10000 });
@@ -115,6 +119,9 @@ function load(data) {
             layout.value = data.source.content.layout;
             paramName.value = data.source.content.paramName;
             sourceRows = common.deepClone(data.source.content.mediaList);
+            if (data.source.content.selectedMode) {
+                selectedMode.value = data.source.content.selectedMode
+            }
         }
         else {
             sourceRows = common.deepClone(data.source.content);
@@ -188,6 +195,16 @@ function choose(item, flagCheckbox) {
         item.ischeck = false;
     }
 
+}
+function chooseRadio(item) {
+    let chooseItem = common.deepClone(item);
+    chooseList.value = [];
+    imageList.value.forEach((v) => {
+        v.ischeck = false;
+    });
+    item.ischeck = true;
+    chooseList.value.push(chooseItem);
+
 }
 function allchoose() {
     chooseList.value = [];

package/src/components/web/ComboBox.vue

@@ -1,7 +1,7 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
-            <el-select-v2 ref="refselect" :key="model.itemKey" v-model="model.value" :options="model.options"
+            <el-select-v2 ref="refselect" :key="model.itemKey" v-model="model.value" :options="model.options" :loading="loading"
                 :props="model.optionAttrs" v-bind="model.attrs" :disabled="model.locked" clearable @change="change"
                 :placeholder="model.placeholder" @visible-change="visibleChange" @clear="clear"
                 :filterable="model.filterable" :multiple="model.multiple" class="fieldControl" :height="300"
@@ -59,6 +59,7 @@ const model = initData(props, ComboBox)
 const refselect = ref()
 const open = ref(false)
 const isComposing = ref(false);
+const loading = ref(true)
 model.value.itemKey=Math.random();
 let cancelTokenSource = null; // 用于存储取消令牌
 
@@ -84,14 +85,15 @@ function visibleChange(visible) {
 //获取数据列表
 function getOptions(key) {
     if (cancelTokenSource) {
-        // 取消上一次未完成的请求
-        cancelTokenSource.cancel('取消上一次请求');
-      }
+      // 取消上一次未完成的请求
+      cancelTokenSource.cancel('取消上一次请求');
+    }
 
-      // 创建新的取消令牌
-      cancelTokenSource = Axios.CancelToken.source();
+    // 创建新的取消令牌
+    cancelTokenSource = Axios.CancelToken.source();
     if (!isComposing.value &&!model.value.moreActionRouter) {
         model.value.getOptions(props.parameterAction, key,cancelTokenSource, function (data) {
+          loading.value=false;
           if(data){
             data.forEach((v) => {
                 let item = model.value.globalOptions.find((v1) => {

package/src/components/web/Form.vue

@@ -16,7 +16,7 @@
                         <el-col v-if="col.show !== false" :span="col.colspan" style="padding:5px">
                             <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
                                 :parameterAction="model.parameterAction" v-bind="col.bindPara" :fileData="getFileData(col)"
-                                @change="changeHandler" @importComplete="importComplete"
+                                @change="changeHandler" @importComplete="importComplete" @popupLocation="popupLocationHandler"
                                 @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler"
                                 @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler" 
                                 @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
@@ -32,7 +32,7 @@
                         <el-col v-if="col.show !== false" :span="col.colspan" style="padding:5px">
                             <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
                                 :parameterAction="model.parameterAction" v-bind="col.bindPara"  :fileData="getFileData(col)"
-                                @change="changeHandler" @importComplete="importComplete"
+                                @change="changeHandler" @importComplete="importComplete" @popupLocation="popupLocationHandler"
                                 @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler"
                                 @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler"
                                 @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
@@ -52,7 +52,7 @@
                                     <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px">
                                         <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
                                             :parameterAction="model.parameterAction" v-bind="col.bindPara" :fileData="getFileData(col)"
-                                            @change="changeHandler" @fieldClick="fieldClickHandler"
+                                            @change="changeHandler" @fieldClick="fieldClickHandler" @popupLocation="popupLocationHandler"
                                             @popupSearchList="popupSearchListHandler" @importComplete="importComplete"
                                             @popupGroupList="popupGroupListHandler" @tableButtonClick="clickHandler"
                                             @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
@@ -83,7 +83,7 @@
                                     <el-col :span="col.colspan" v-if="col.show !== false" style="padding:5px">
                                         <component ref="Fields" :is="col.is" :vmodel="col" :key="itemKey"
                                             :parameterAction="model.parameterAction" v-bind="col.bindPara" :fileData="getFileData(col)"
-                                            @change="changeHandler" @fieldClick="fieldClickHandler"
+                                            @change="changeHandler" @fieldClick="fieldClickHandler" @popupLocation="popupLocationHandler"
                                             @popupSearchList="popupSearchListHandler" @importComplete="importComplete"
                                             @popupGroupList="popupGroupListHandler" @tableButtonClick="clickHandler"
                                             @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
@@ -102,7 +102,7 @@
                             <component ref="Fields" :is="col.is" :vmodel="col" :parameterAction="model.parameterAction"
                                 v-bind="col.bindPara" @change="changeHandler" :key="itemKey" :fileData="getFileData(col)"
                                 @fieldClick="fieldClickHandler" @popupSearchList="popupSearchListHandler" @importComplete="importComplete"
-                                @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler"
+                                @tableButtonClick="clickHandler" @popupGroupList="popupGroupListHandler" @popupLocation="popupLocationHandler"
                                 @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged">
                             </component>
                         </el-col>
@@ -353,6 +353,9 @@ function validExcute() {
                                     }
                                     else if (f.$el.offsetParent.offsetParent.offsetParent.classList[0] === 'ct-dialog_wrapper') {
                                         total = f.$el.offsetTop;
+                                        if(f.$el.offsetParent){
+                                            total+=f.$el.offsetParent.offsetTop
+                                        }
                                         document.querySelector(".ct-dialog_body").children[0].scrollTop = total;
                                     }
                                     else if (f.$el.offsetParent.offsetParent.offsetParent.localName === "body") {
@@ -547,7 +550,10 @@ function importComplete(res, field) {
 }
 //弹出选择列表
 function popupSearchListHandler(singleSelectio, field, router, callBack) {
-    Form.popupSearchListHandler(singleSelectio, field, router, model.value, Fields.value, props, callBack)
+  Form.popupSearchListHandler(singleSelectio, field, router, model.value, Fields.value, props, callBack)
+}
+function popupLocationHandler(field, router, callBack) {
+  Form.popupLocationHandler(field, router, callBack,model.value,props);
 }
 //弹出分组列表
 function popupGroupListHandler(field, router, callBack) {

package/src/components/web/Location.vue

@@ -1,20 +1,18 @@
 <template>
     <ct-field :vmodel="model">
         <template #Control>
-            <div v-if="model !== null" class="ct-location" style="width:100%;display:flex">
-            <div
-                class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix showLabel lableinput text-justify">
+            <div v-if="model !== null" class="ct-location" style="display:flex">
+            <div class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix showLabel lableinput text-justify">
                 <div v-if="model.showLabel && model.label" class="el-input-group__prepend">
                     <div slot="prepend" class="label-ellipsis" :class="[model.labelClass]" :title="model.label">
                         {{ model.label }}
                     </div>
                 </div>
-                <div style="display:inline-flex;padding-left:0px;" v-bind="model.attrs"
-                    :class="model.locked ? 'ct-is-disabled' : ''">
+                <div style="display:inline-flex;padding-left:0px;" v-bind="model.attrs" :class="model.locked ? 'ct-is-disabled' : ''">
                     <input style="text-align:left;width:100%" class="el-location-input hoverColor"
-                        :placeholder="model.attrs.placeholder1" v-model="model.value" @change="changeModel($event)" />
+                        :placeholder="model.attrs.placeholder1" v-model="model.code1" @change="changeModel($event)" />
                     <input style="text-align:left;width:100%;margin-left:5px;" class="el-location-input hoverColor"
-                        :placeholder="model.attrs.placeholder2" v-model="model.value1" @change="changeModel($event);" />
+                        :placeholder="model.attrs.placeholder2" v-model="model.code2" @change="changeModel($event);" />
                 </div>
             </div>
         </div>
@@ -22,10 +20,10 @@
         <template #Sufbutton v-if="model !== null&&model.moreActionRouter">
             <div v-if="model.moreActionRouter" style="display: inline-block;margin-left: 5px;">
                 <img v-if="model.moreActionRouter.imgUrl" class="ct-tablecurrencyImg ct-tablecurrencyItem"
-                    :src="model.moreActionRouter.imgUrl" :title="model.moreActionRouter.label"
+                    :src="model.moreActionRouter.imgUrl" :title="model.moreActionRouter.controlLabel"
                     @click="popupLocationHandler($event)" />
                 <el-button v-else size="mini" type="primary" class="h26" @click="popupLocationHandler($event)">
-                    {{ model.moreActionRouter.label }}
+                    {{ model.moreActionRouter.controlLabel }}
                 </el-button>
             </div>
         </template>
@@ -40,15 +38,15 @@ const props = defineProps({
 })
 const model = initData(props, Location)
 function popupLocationHandler() {
-    emit('popupLocation', model.value, model.value.moreActionRouter, (data) => {
-          if(data){
-            model.value.value=data.lng;
-            model.value.value1=data.lat;
-          }
-        });
+  emit('popupLocation', model.value, model.value.moreActionRouter, (data) => {
+    if(data){
+      model.value.code1=data.lng;
+      model.value.code2=data.lat;
+    }
+  });
 }
 function changeModel() {
-    changeHandler(model.value, emit); 
+  changeHandler(model.value, emit); 
 } 
 defineExpose({
     model

package/src/components/web/MapBaidu.vue

@@ -0,0 +1,137 @@
+<template>
+  <div class="ct-field">
+    <div v-if="openType=='Location'" style="text-align: right;padding-right:10px;">
+      <el-button size="mini" type="primary" class="h26" @click="closeHandler($event)">
+        取消
+      </el-button>
+      <el-button size="mini" type="primary" class="h26" @click="submitHandler($event)">
+        确定
+      </el-button>
+    </div>
+    <baidu-map :ak="ak" :v="v" :type="type" :center="data.center" :zoom="data.zoom" 
+    :scroll-wheel-zoom="data.scroll_wheel_zoom" :double-click-zoom="data.double_click_zoom"
+    @ready="handler" @dragend="dragendHandler" @tilesloaded="tilesloadedHandler"
+    :style="{height:data.mapHeight + 'px'}">
+      <bm-navigation v-if="data.flagShowZoom" anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-navigation>
+      <bm-marker :position="data.markerPosition" :dragging="data.markerDragging" :animation="data.markerAnimation" @dragend="markerDragendHandler">
+        <bm-label :content="data.markerLabel" :offset="{width: -35, height: 30}"/>
+      </bm-marker>
+    </baidu-map>
+  </div>
+</template>
+<script lang="ts" setup>
+import {BaiduMap,BmMarker,BmLabel,BmNavigation} from 'vue-baidu-map-3x'
+import { ref, nextTick, onUpdated,onDeactivated , onMounted  } from 'vue'
+import { initData, changeHandler } from '../../utils/mixins';
+
+const emit = defineEmits(['popupLocation'])
+const props = defineProps({
+  field: Object,
+  apiParam: Object,
+  documentHeight: {
+    String,
+    default: 'auto',
+  },
+  documentWidth: {
+    String,
+    default: 'auto',
+  },
+  topHeight: {
+    type: Number,
+    default: -1
+  },
+  openType: {
+    String,
+    default: 'Browse',
+  },
+})
+const ak = ref('twUFDRiSaRpMp9V4ALun9w52QSiYUGE9')
+const v = ref('3.0')
+const type = ref('API')
+const data = ref({
+  center: {lng: 0, lat: 0},// 定位位置
+  zoom: 3,// 地图放大等级
+  flagShowZoom:false,//是否显示缩放控件
+  mapHeight:100,
+  scroll_wheel_zoom:false,
+  double_click_zoom:false,
+  markerDragging:false,
+  markerPosition: {lng: 0, lat: 0},// 定位位置
+  markerLabel:"",
+  markerAnimation:'',
+  rtnPoint:null,
+})
+
+function handler({BMap, map}) {
+  // 经度
+  data.value.center.lng = 116.404
+  // 纬度
+  data.value.center.lat = 39.915
+  // 地图放大等级
+  data.value.zoom = 15
+
+  if(props.field && props.field.pageHeight){
+    data.value.mapHeight=props.field.pageHeight;
+  }
+  else if(data.value.topHeight>-1){
+    data.value.mapHeight=document.documentElement.clientHeight - data.value.topHeight;
+  }
+
+  if(props.openType=='Location'){
+    data.value.flagShowZoom=true;
+    data.value.markerDragging=true;
+    data.value.mapHeight=data.value.mapHeight-28;
+    data.value.markerAnimation='BMAP_ANIMATION_BOUNCE';
+  }
+
+  if(props.apiParam){
+    if(props.apiParam.zoom){
+      data.value.zoom=Number(props.apiParam.zoom);
+    }
+    if(props.apiParam.flagShowZoom && props.apiParam.flagShowZoom=='1'){
+      data.value.flagShowZoom=true;
+    }
+    if(props.apiParam.address){
+      data.value.markerLabel=props.apiParam.address;
+    }
+    
+    if(props.apiParam.lng && props.apiParam.lat){          
+      setTimeout(() => {
+        //偏移处理
+        data.value.center.lng = props.apiParam.lng;
+        data.value.center.lat = props.apiParam.lat;
+        data.value.markerPosition.lng = props.apiParam.lng;
+        data.value.markerPosition.lat = props.apiParam.lat;
+      },500)            
+    }
+    else if(props.apiParam.address && props.apiParam.city){
+      let myGeo = new BMap.Geocoder();
+      myGeo.getPoint(props.apiParam.address, function(point){
+          if(point){
+            data.value.center=point;
+            data.value.markerPosition=point;
+          }
+          else{
+            alert('您选择的地址没有解析到结果！');
+          }
+      },props.apiParam.city)
+    }
+    else if(props.apiParam.city){
+      data.value.center=props.apiParam.city;
+    }
+  }
+}
+function dragendHandler(event){
+}
+function tilesloadedHandler(event){
+}
+function markerDragendHandler(event){
+  data.value.rtnPoint=event.point;
+}
+function submitHandler(){
+  emit('submit',data.value.rtnPoint || data.value.markerPosition);
+}
+function closeHandler(){
+  emit('closeDialog');
+}
+</script>

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

@@ -403,15 +403,30 @@ function load(data) {
         fiexdHead()
         //当表格没有占满表格框时，主动请求下一页
         var next = function (rtn) {
-            if (rtn) {
-                nextTick(() => {
-                    searchEnd.value = Date.now();
-                });
-            }
-            else {
-                searchEnd.value = Date.now();
-            }
-        };
+          if (rtn) {
+            nextTick(() => {
+              if(!model.value.isLayout){
+                if(refTableParent.value  && refTableParent.value.scrollHeight != 0  && refTableParent.value.offsetHeight != 0 
+                && refTableParent.value.scrollHeight <= refTableParent.value.offsetHeight){
+                  tableLoading.value = true;
+                  SearchTable.nextPage(model.value,next);
+                }
+                else {
+                  tableLoading.value = false;
+                  rowColorChange(model.value.selectIndex, true);
+                  resetScroll();
+                  calculatingRowHeight();
+                  getScrollAttr();
+                }
+              }
+              searchEnd.value = Date.now();
+            });
+          }
+          else {
+            searchEnd.value = Date.now();
+            tableLoading.value = false;
+          }
+        };     
         next(true);
         nextTick(() => {
             loadStats()

package/src/loader/src/Form.js

@@ -62,6 +62,14 @@ function loadFromModel(source, isFormList) {
           router[attrKey] = attrValue;
         }
       },
+      setbuttonRouter(id, attrKey, attrValue) {
+        var router = this.form.buttons.find((v1) => {
+          return v1.key === id;
+        });
+        if (router) {
+          router[attrKey] = attrValue;
+        }
+      },
       //获取Field的属性attrKey的值
       getValueByFieldName(id, attrKey) {
         attrKey = common.initialsToLowerCase(attrKey);
@@ -1043,6 +1051,39 @@ function popupSearchListHandler(singleSelectio, field, router, model, Fields, pr
   }
   common.openDialog(dialogOption);
 }
+function popupLocationHandler(field, router, callBack,model,props) {
+  var submitData = Form.getFileData(router,model);
+  submitData.lng=field.code1;
+  submitData.lat=field.code2;
+  submitData = router.getActionPara(submitData).para;
+
+  var dialogOption = {
+    title: router.pageTitle || router.controlLabel,
+    pane: common.getParentPane(),
+    content: [{
+      component: "ct-mapbaidu",
+      width: router.pageWidth + "px",
+      height: router.pageHeight + "px",
+      documentHeight: props.documentHeight,
+      documentWidth: props.documentWidth,
+      attrs: {
+        field: router,
+        apiParam: submitData,
+        openType : 'Location',
+        onSubmit(ev) {
+          if (callBack) {
+            callBack(ev);
+          }
+          common.closeDialog(dialogOption);
+        },
+        onCloseDialog(ev) {
+          common.closeDialog(dialogOption);                 
+        }
+      }
+    }]
+  };
+  common.openDialog(dialogOption);
+}
 //弹出分组搜索列表
 function popupGroupListHandler(field, router, model, Fields, props, callBack) {
   let submitData = {};
@@ -1225,5 +1266,6 @@ const Form = {
   changeHandler,
   getRouterAndSubmitData,
   updateFields,
+  popupLocationHandler,
 };
 export default Form;

package/src/loader/src/LibFunction.js

@@ -216,9 +216,10 @@ const LibFunction = {
                 item.is = 'ct-customizecolumns'
                 break;
             case Enum.ControlType.Location:
-                item = Location(item);
-                item.is = 'ct-Location';
-                break;
+              moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
+              item = Location(item,moreActionRouter);
+              item.is = 'ct-location';
+              break;
             case Enum.ControlType.SearchPage: //搜索列表页面
                 item = {};
                 item.is = 'ct-searchlist';

package/src/loader/src/Location.js

@@ -1,8 +1,8 @@
 import base from '../../loader/index';
 import valid from '../../utils//validate';
-const Location = function (source) {
+const Location = function (source,moreActionRouter) {
     let rtn = {
-        moreActionRouter: source.moreActionRouter,
+        moreActionRouter: moreActionRouter,
         getFormObj() {
             var rtnFormObj = {};
             Object.defineProperty(rtnFormObj, source.fieldName1, {

package/src/loader/src/SearchTable.js

@@ -753,7 +753,7 @@ function apiData(model, callback) {
     })
         .then(function (response) {
             if (model.$vue && model.$vue.searchStrat && model.$vue.searchEnd) {
-                model.$vue.searchEnd = Date.now();
+              model.$vue.searchEnd = Date.now();
             }
             model.isLoading = false;
             if (response.rtnCode === Enum.ReturnCode.Successful) {
@@ -836,8 +836,6 @@ function apiData(model, callback) {
             else {
                 callback(false);
             }
-
-
         })
         .catch((error) => {
             model.isLoading = false;

package/src/main.js

@@ -27,7 +27,7 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.111:38028/",
     
     flagRouterSelf: true,
-    flagApp: false,//是否app端
+    flagApp: true,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
@@ -65,7 +65,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:"1-a7289bb2-9f1e-4a04-9016-1e555bf39188"}',
-                authObject: '{EmpID:"Token_8ce6c140-f584-45ed-b683-ca52837993aa",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_8ce6c140-f584-45ed-b683-ca52837993aa",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_ca06f97c-4158-48ad-bf50-19d052a7edce",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_ca06f97c-4158-48ad-bf50-19d052a7edce",Platform:"IOS"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/utils/common.js

@@ -282,7 +282,7 @@ const common = {
         showDialog({ message: message, allowHtml: true });
       }
       else if (type == 'error') {
-        showDialog({ title: '提示', message: message, closeOnClickOverlay: true, confirmButtonText: '确定', className: 'showDialogMessage' });
+        showDialog({ title: '提示', message: message, closeOnClickOverlay: true, confirmButtonText: this.LocalizedString('确定', '確認'), className: 'showDialogMessage' });
       }
       else {
         showToast(message);

package/src/utils/mixins.js

@@ -405,7 +405,7 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                             title: field.pageTitle,
                             content: [
                                 {
-                                    component: "ct-mapBaidu",
+                                    component: "ct-mapbaidu",
                                     width: field.pageWidth + 'px',
                                     height: field.pageHeight + 'px',
                                     attrs: {