centaline-data-driven-v3 0.0.74 → 0.0.76

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.0.74",
+  "version": "0.0.76",
   "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/components/app/Form.vue

@@ -12,7 +12,7 @@
             </template>
         </van-nav-bar>
         <div ref="refForm" :style="{ overflow: 'auto', height: model.formHeight + 'px' }">
-            <van-sticky :container="refForm" v-if="model.tip">
+            <van-sticky :container="refForm" v-if="model.tip" offset-top="46">
                 <div class="ct-form-tip-app">
                     <span v-html="model.tip"></span>
                 </div>
@@ -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/dialog.vue

@@ -31,6 +31,7 @@ const show = ref(false)
 const actions = ref([])
 function Loaded(model) {
     data.value = model;
+    actions.value=[];
     props.vmodel.title = (model && model.title) ? model.title : props.vmodel.title;
     if (model && model.buttons) {
         buttons.value = model.buttons.filter((v) => {
@@ -58,6 +59,7 @@ function onClickRight() {
         data.value.$vue.clickHandler(buttons.value[0])
     }
     else if(buttons.value.length>1){
+        Loaded(data.value)
         show.value=true;
     }
 }

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) => {
@@ -208,13 +210,13 @@ function setminWidth() {
     let maxLength = -1;
     let text;
     for (let item of model.value.options) {
-        if (item.name) {
-            if (item.name.length > maxLength) {
-                maxLength = item.name.length;
-                text = item.name;
-            }
+      if (item.name) {
+        if (item.name.length > maxLength) {
+            maxLength = item.name.length;
+            text = item.name;
         }
-    }
+      }
+    }   
 
     let span = document.createElement('span');
     span.innerText = text;
@@ -222,9 +224,14 @@ function setminWidth() {
     span.style.width = 'auto';
     span.style.fontSize = '17px';
     document.body.appendChild(span);
-    if ((span.getBoundingClientRect().width + 40) > refselect.value.popperSize) {
-        refselect.value.popperSize = span.getBoundingClientRect().width + 40;
+    
+    if ((span.getBoundingClientRect().width + 40) <= refselect.value.selectRef.offsetWidth) {
+      refselect.value.popperSize = refselect.value.selectRef.offsetWidth;
+    }
+    else{      
+      refselect.value.popperSize = span.getBoundingClientRect().width + 40;
     }
+
     document.body.removeChild(span);
 }
 //弹出选择列表

package/src/components/web/Location.vue

@@ -37,12 +37,11 @@ const props = defineProps({
     vmodel: Object
 })
 const model = initData(props, Location)
-console.log(model.value);
 function popupLocationHandler() {
   emit('popupLocation', model.value, model.value.moreActionRouter, (data) => {
     if(data){
-      model.value.value=data.lng;
-      model.value.value1=data.lat;
+      model.value.code1=data.lng;
+      model.value.code2=data.lat;
     }
   });
 }

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="data.ak" :v="data.v" :type="data.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 data = ref({
+  ak : 'twUFDRiSaRpMp9V4ALun9w52QSiYUGE9',
+  v : '3.0',
+  type : 'API',
+  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

@@ -1061,7 +1061,7 @@ function popupLocationHandler(field, router, callBack,model,props) {
     title: router.pageTitle || router.controlLabel,
     pane: common.getParentPane(),
     content: [{
-      component: "ct-mapBaidu",
+      component: "ct-mapbaidu",
       width: router.pageWidth + "px",
       height: router.pageHeight + "px",
       documentHeight: props.documentHeight,
@@ -1074,10 +1074,10 @@ function popupLocationHandler(field, router, callBack,model,props) {
           if (callBack) {
             callBack(ev);
           }
-          common.closeDialog(dialogOption.dialog);
+          common.closeDialog(dialogOption);
         },
-        onCloseDialog(ev) {     
-          common.closeDialog(dialogOption.dialog);                 
+        onCloseDialog(ev) {
+          common.closeDialog(dialogOption);                 
         }
       }
     }]

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_f5be9890-db08-463b-b6c3-0874f422fac9",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_f5be9890-db08-463b-b6c3-0874f422fac9",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_43406e81-3337-4d1f-8917-edc5bfec9c9f",MachineCode:"e1f39b75-7069-4c4f-b5d5-c590da2d9aa2",SSO_Token:"SSOToken_43406e81-3337-4d1f-8917-edc5bfec9c9f",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: {

package/src/views/SearchList.vue

@@ -2,7 +2,7 @@
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
     <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
       :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
-      :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
+       :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>