centaline-data-driven-v3 0.0.94 → 0.0.96

package/package.json

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

package/src/components/app/Form.vue

@@ -82,7 +82,7 @@
             <div class="safe-area-inset-bottom-height"></div>
         </div>
         <div class="button-absoluteAPP"
-            v-if="(common.flagMicroMessenger() || common.flagHK()) && model.buttons.findIndex((v) => { return v.show }) > -1">
+            v-if="(common.flagMicroMessenger() || common.flagHK()) && model.buttons.findIndex((v) => { return v.show }) > -1 && buttonShow">
             <template v-for="(field, index) in model.buttons" :key="index">
                 <component v-if="field.show !== false" ref="Fields" :is="field.is" :vmodel="field"
                     :parameterAction="model.parameterAction" v-bind="field.bindPara" @fieldClick="clickHandler" />
@@ -150,6 +150,7 @@ const refForm = ref()
 const buttons = ref([])
 const actions = ref([])
 const show = ref(false)
+const buttonShow = ref(true)
 init()
 //初始化数据
 function init() {
@@ -159,15 +160,11 @@ function init() {
     if (isAndroid) {
         // 动态检测键盘状态
         let viewportHeight = window.innerHeight;
-
         window.addEventListener('resize', () => {
-            const newHeight = window.innerHeight;
-            const keyboardHeight = viewportHeight - newHeight;
-
-            if (keyboardHeight > 100) { // 键盘弹出
-                document.querySelector('.button-absoluteAPP').style.bottom = `${keyboardHeight}px`;
-            } else { // 键盘收起
-                document.querySelector('.button-absoluteAPP').style.bottom = '0';
+            if (window.innerHeight < viewportHeight) {
+                buttonShow.value = false
+            } else {
+                buttonShow.value = true
             }
         });
     }

package/src/components/app/ViewerFile/ViewerP360.vue

@@ -23,6 +23,9 @@ onMounted(() => {
 function init() {
     loading.value = true
     if (panoramaContainer.value) {
+        if (PSV.value) {
+            PSV.value.destroy(); // 销毁旧实例
+        }
         PSV.value = new PhotoSphereViewer({
             container: panoramaContainer.value,
             panorama: props.imgUrl, // 替换为你的全景图片路径  
@@ -66,7 +69,7 @@ function enterFullscreen() {
 }
 
 
-watch(() => props.src, () => {
+watch(() => props.imgUrl, () => {
     init();
     //complete();
 })

package/src/components/web/CheckBoxList.vue

@@ -35,7 +35,7 @@ const props = defineProps({
 })
 const model = initData(props, CheckBoxList)
 
-function change() {
+function change() { 
     model.value.setcode()
     changeHandler(model.value, emit);
     if (model.value.autoSearch) emit('search');

package/src/components/web/PhotoSelect.vue

@@ -84,7 +84,8 @@ const dragOptions = {
     chosenClass: "chosen",
     forceFallback: true,
 }
-
+const currentWidth = ref(0); // 当前显示的宽度
+    const  currentHeight= ref(0); // 当前显示的高度
 const qrtimer=ref(null)
 onBeforeUnmount(()=>{
   if (qrtimer.value) {
@@ -128,6 +129,7 @@ function handleOpen() {
         });
         return;
     }
+    updateCurrentSize();
     var params = {
         paramName: model.value.paramName1,
         parentValue: model.value.getFormParentFieldPara(),
@@ -141,8 +143,8 @@ function handleOpen() {
         pane: common.getParentPane(),
         content: [{
             component: "ct-photoselectlist",
-            width: "772px",
-            height: "550px",
+            width: currentWidth.value+"px",
+            height: currentHeight.value+"px",
 
             attrs: {
                 api: model.value.action, //  self.api,//source.xx
@@ -151,8 +153,8 @@ function handleOpen() {
                 mediaViewPageType: (model.value.mediaViewPageType || 0),
                 // width: self.model.router.pageWidth + 'px',
                 // height: self.model.router.pageHeight+'px',
-                width: "772px",
-                height: "550px",
+               width: currentWidth.value+"px",
+            height: currentHeight.value+"px",
                 para: params,
                 onHandlePhoto: (List) => {
                     nextTick(function () {
@@ -184,6 +186,14 @@ function handleOpen() {
 
 
 }
+
+function updateCurrentSize() {
+    let width = window.innerWidth;
+    let height = window.innerHeight;
+      // 根据条件更新当前宽度和高度
+      currentWidth.value = width  < 772 ? width : 772;
+      currentHeight.value =height  < 550 ? height-45 :550;
+    }
 function onEnd(a, b) {
 
     nextTick(function () {

package/src/components/web/ViewerFile/ViewerP360.vue

@@ -20,6 +20,9 @@ onMounted(() => {
 
 function init() {
     if (panoramaContainer.value) {
+        if (PSV.value) {
+            PSV.value.destroy(); // 销毁旧实例
+        }
         PSV.value = new PhotoSphereViewer({
             container: panoramaContainer.value,
             panorama: props.imgUrl, // 替换为你的全景图片路径  
@@ -74,7 +77,7 @@ const viewerHeight = computed(() => {
         return props.height
     }
 })
-watch(() => props.src, () => {
+watch(() => props.imgUrl, () => {
     init();
     //complete();
 })

package/src/loader/src/CheckBoxList.js

@@ -28,7 +28,7 @@ const CheckBoxList = function (source) {
         },
         //修改code1值
         setcode() {
-            let currentOptions = source.selectItems1.filter((v) => {
+            let currentOptions = this.selectItems1.filter((v) => {
                 return this.value.indexOf(v['code']) >= 0;
             });
             currentOptions.forEach((v) => {

package/src/loader/src/SearchTable.js

@@ -208,6 +208,9 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                 else if (rtn.sortString) {
                     return rtn.sortString;
                 }
+                else if (source.page.orderBy) {
+                    return source.page.orderBy;
+                }
             },
             get pageIndex() {
                 return rtn.pageIndex;
@@ -742,7 +745,6 @@ function apiData(model, callback) {
     }
     model.isLoading = true;
     var newSearchModel = model.getSearchData();
-
     request.postHandler(common.globalUri(), {
         action: model.searchAction,
         para: {

package/src/main.js

@@ -68,7 +68,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-bce18a8d-21f0-4022-a6ca-450de105cafc"}',
-                authObject: '{EmpID:"Token_f2b14d49-9708-4747-8e03-5c55c7c95aa7",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_f2b14d49-9708-4747-8e03-5c55c7c95aa7",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_f0a59fe5-6641-4e7d-bd99-66e6da8e85e2",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_f0a59fe5-6641-4e7d-bd99-66e6da8e85e2",Platform:"WEB"}',
             };
         },
         getToken() {

package/src/views/SearchList.vue

@@ -1,11 +1,11 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
       :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
-       :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist> -->
+       :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
 
-       <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
-      :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist>
+       <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
+      :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist> -->
 
       
       <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/AttendanceClassList/getLayoutOfSearch'"