centaline-data-driven 1.5.11 → 1.5.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.5.11",
+  "version": "1.5.13",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/Form.vue

@@ -12,6 +12,7 @@
     data() {
       return {
         apiParam:{
+          "transactionId":"1643860874929975297","actionType":1,"pageOnly":true
         },
         topHeight:10,
       }

package/src/centaline/dynamicDetail/src/dynamicPropertySimpleDetailRET.vue

@@ -1,6 +1,6 @@
 <template>
-  <div ref="main" class="main" v-if="model !== null" style="position: relative;overflow: hidden;">
-    <div style="height:36px;margin-top: 10px;display: flex;border-bottom: solid 2px var(--chinaRed);">
+  <div ref="main" class="main" style="position: relative;overflow: hidden;">
+    <div v-if="model !== null" style="height:36px;margin-top: 10px;display: flex;border-bottom: solid 2px var(--chinaRed);">
       <el-popover v-if="model.routerForQRCode !== null" placement="left-start" trigger="hover"
         @show="fieldClickHandler(model.routerForQRCode, $event)">
         <div style="border-bottom:none">
@@ -36,7 +36,7 @@
         </div>
       </el-drawer>
     </div>
-    <div style="padding-left: 20px;padding-right: 20px;">
+    <div v-if="model !== null" style="padding-left: 20px;padding-right: 20px;">
       <div ref="title" style="margin-top: 18px;">
         <div style="font-weight: Bold;font-size: 16px;color: #333333;display: flex;">
           <img v-if="model.actionRouterFavorite" :src="model.actionRouterFavorite.imgUrl" alt=""
@@ -132,6 +132,7 @@
         </div>
       </div>
     </div>
+    <div v-if="isLoading" v-loading="isLoading" :style="{'height': loadingHeight+'px',}"></div>
   </div>
 </template>
 
@@ -170,6 +171,8 @@ export default {
         placement: 'left-start',//方向，传值可查看Popper UI组件placement属性
       },
       drawer: false,
+      isLoading:true,
+      loadingHeight:0,
     }
   },
   watch: {
@@ -182,6 +185,7 @@ export default {
   mounted() {
     var self = this;
     this.$nextTick(function () {
+      this.loadingHeight=this.$refs.main.parentElement.parentElement.offsetHeight;
       if (self.vmodel) {
         self.load(self.vmodel);
       }
@@ -200,6 +204,7 @@ export default {
   },
   methods: {
     load(data) {
+      this.isLoading=false;
       var self = this;
       this.refershKey = this.refershKey + 1;
       this.model = data;

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -18,6 +18,10 @@
          :style="{ height: '0px', top: model.tableHeight * 0.55 + 'px' }"></div>
     <div v-loading="operationLoading"></div>
 
+
+   <div class="theadTitle" id="theadTitle" :style="{top:theadTitleTop+'px',left:theadTitleLeft+'px'}" v-show="theadTitleShow">
+                  左右拖动竖线调整列宽
+     </div>
     <div class="ct-tableParent" ref="tableParent" v-bind="model.attrs" v-if="!isLoading && model"
          :style="{ height: from == 'form' ? '100%' : model.tableHeight + 'px', 'border-bottom': isLayout ? 'none' : '', 'border-top': isLayout ? 'none' : '', }"
          @scroll="scrollHandle($event)" :v-focus="model.flagFocus" @keydown.up="rowKeyDownHandle($event, 0)"
@@ -39,7 +43,7 @@
                 </label>
               </th>
               <th :ref="column.fixed ? column.fixed === 'left' ? 'headLeftThs' : 'headRightThs' : 'headThs'"
-                  v-for="(column, colIndex) in columns" :key="colIndex" v-if="column.show" class="ct-td ct-searchtable-th" data-tooltip="左右拖动竖线调整列宽"
+                  v-for="(column, colIndex) in columns" :key="colIndex" v-if="column.show" class="ct-td ct-searchtable-th"
                   :rowspan="column.rowspan" :colspan="column.colspan" :class="[colHasWidth[colIndex], column.sortAction, model.tdClass,
                 colIndex === leftShadow ? 'shadowLeft' : null,
                 colIndex === rightShadow ? 'shadowRight' : null,
@@ -47,9 +51,9 @@
                 column.fixed === 'right' ? 'right-fixation-th' : null,
                 column.width === undefined ? 'ct-table-auto' : null,
                 typeof column.fixed === 'undefined' ? 'right-no-fixation-th' : null,
-                model.columnWidthSaveAction ?'theadBorder theadLine':'',
-                ]" @mousemove="thMouseMoveHandle($event)" @mousedown="thMouseDownHandle($event, colIndex)"
-                  v-bind="column.attrs">
+                model.columnWidthSaveAction ?'theadLine':'',
+                ]" @mousemove="thMouseMoveHandle($event)" @mousedown="thMouseDownHandle($event, colIndex)" @mouseover="theadTitleHover" @mouseout="theadTitleLeave"
+                  v-bind="column.attrs" id="thHeight">
                 <span>{{ column.name }}</span>
                 <span class="caret-wrapper" v-if="column.sort" @click="toSort($event, column)"
                       @contextmenu.prevent="clearSort($event, column)">
@@ -285,6 +289,12 @@ export default {
       disabledStats:false,
       searchStrat:0,
       searchEnd:0,
+
+      visible:false,
+      theadTitleShow:false,
+      theadTitleTop:0,
+      theadTitleLeft:0,
+      theadTitleWidth:0
     };
   },
   deactivated(){
@@ -296,6 +306,33 @@ export default {
     });
   },
   methods: {
+    theadTitleHover(ev){
+         this.theadTitleShow = true
+            let tagsViewHeight = 0
+            let thHeight = 0
+        if (document.getElementById("tags-view-container")) {
+          tagsViewHeight = document.getElementById("tags-view-container").offsetHeight;
+          thHeight = document.getElementById("thHeight").offsetHeight;
+          if (document.getElementById("theadTitle")) {
+            this.theadTitleWidth =  document.getElementById("theadTitle").offsetWidth;
+          } else {
+            this.theadTitleWidth = 0
+          }
+        }else{
+          tagsViewHeight = 0;
+          thHeight = -10;
+          if (document.getElementById("theadTitle")) {
+            this.theadTitleWidth =  document.getElementById("theadTitle").offsetWidth *0.5;
+          } else {
+            this.theadTitleWidth = 0
+          }
+        }
+        this.theadTitleLeft = ev.clientX -this.theadTitleWidth;
+       this.theadTitleTop =ev.currentTarget.getBoundingClientRect().top -thHeight - tagsViewHeight -20 -10;
+    },
+    theadTitleLeave(){
+       this.theadTitleShow = false
+    },
     rowCheckClass(row) {
       if (row.$select) {
         return "is-checked";
@@ -385,13 +422,14 @@ export default {
       if (ev.offsetX > ev.currentTarget.offsetWidth - 10) {
         ev.currentTarget.style.cursor = "col-resize";
         ev.currentTarget.canResize = true;
+        this.theadTitleShow = true
       } else {
         ev.currentTarget.style.cursor = "default";
         ev.currentTarget.canResize = false;
       }
+      
     },
     thMouseDownHandle(ev, colIndex) {
-     
       var self = this;
       var col = self.model.columns[colIndex];
        var oldWidth=col.width;
@@ -405,7 +443,7 @@ export default {
           self.currentTh = null;
           document.removeEventListener("mouseup", MouseUpHandle, false);
           document.removeEventListener("mousemove", MouseMoveHandle, false);
-
+          
           //保存列宽
           if(oldWidth!=col.width&&self.model.columnWidthSaveAction&&self.model.columnWidthSaveAction.length>0)
           {
@@ -2058,9 +2096,6 @@ export default {
   box-shadow: 0 2px 10px 0 rgb(0 0 0 / 10%);
   margin-bottom: 8px;
 }
-.theadBorder {
-            position: relative;
-}
 .theadLine {
             position: relative;
 }
@@ -2077,28 +2112,29 @@ export default {
 .theadLine:last-child::before{
   width: 0px !important;
 }
-.theadBorder::after {
-  content: attr(data-tooltip);
+.theadTitle{
   position: absolute;
-  top: 100%;
-  left: 50%;
-  transform: translateX(-50%);
-  padding: 6px 12px;
-  border-radius: 4px;
-  background-color: #fff;
-  color: #606266;
-  font-size: 12px;
-  white-space: nowrap;
-  opacity: 0;
-  visibility: hidden;
-  border: 1px solid;
-  transition: opacity 0.2s ease, visibility 0.2s ease;
+  z-index: 999;
+  padding: 1px 6px;
+ border-radius: 4px;
+ background-color: #fff;
+ color: var(--centalineBlack);
+border: 1px solid var(--centalineBlack);
+font-size: 12px;
+font-weight: 500;
+white-space: nowrap;
 }
-
-.theadBorder:hover::after {
-  opacity: 1;
-  visibility: visible;
+.box-card { 
+ position: absolute;
+ z-index: 1000;
+ padding: 1px 6px;
+ border-radius:4px;
+ background-color: #fff;
+ color: #606266;
+ border: 1px solid;
+ font-size: 12px;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
 }
-
-
 </style>

package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue

@@ -46,7 +46,7 @@
           <!--Photo-->
           <template v-else-if="itemFile.mediaTypeID == '2'">
             <ct-viewerImage ref="viewerImage"
-                            :imgUrl="resultObject+'/'+displayAreaWidth+'/'+displayAreaHeight"
+                            :imgUrl="resultObject+'/'+displayAreaWidth+'/'+displayAreaHeight+'?FlagC=0'"
                             :rotate="rotate"></ct-viewerImage>
           </template>
           <!--ThreeDimensional-->

package/src/centaline/loader/src/ctl/FormList.js

@@ -519,8 +519,8 @@ const FormList = function (source, master) {
         source.rows.splice(1, source.rows.length-1);
         rtn._rows.splice(1, rtn._rows.length-1);
         if(newRows.length>0){
-          source.rows.push(newRows);
-          rtn._rows.push(newRows);
+          Array.prototype.push.apply(source.rows,newRows);
+          Array.prototype.push.apply(rtn._rows,newRows);
         }
       }    
     }, 

package/src/main.js

@@ -15,10 +15,10 @@ Vue.use(ElementUI, { size: 'mini'});
 Vue.config.productionTip = false;
 Vue.use(centaline, {
   // baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
-  baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
+  // baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
   // baseUrl: "http://10.25.10.67:8080/",
-  // baseUrl: "http://10.88.22.42:9999/service-api/v1/form/router", 
+  baseUrl: "http://10.88.22.42:9999/service-api/v1/form/router", 
   // baseUrl: "http://10.88.22.69:8080/api/", 
   // baseUrl: "http://10.88.22.40:8080/api/",
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
@@ -50,15 +50,15 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '1ae3431d-8b29-4c75-9913-4b757dc2b2db',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf-lMy-hfa-vfWxQ2sWPIDSUBCcjkGiM_64muLl7hjuc5dyHWvesGoXspI2sIVjyQKwtCKUEoWYWTDVi3w9yAD_my0AuSNtGB1R3DJRsBDEhAYrteoqt6yOrSpXbRTWaPVohFFOpZdwOUTv5iH0t11O5_-PceVveWTOJzMZP4DRmIGMIRiGCrH3O8zxOWFg9XwAAAP__.xlvqlKs_L6vjmyUCyclR8pyqLtX4oq9S7rnA86iH010',
+        oldToken: '632bca00-6b02-4627-8340-3d493b9b23d8',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgjAURf_lzbwE2tfXPjag7eJHkAI1wckIJBrjv4tRN3fPcIez3HOHZRugBs1WmsAVdoYcElcGhWLErmQWHUutve_lA_6YLz3ZTpomWKSyZaRoAorqImoxrafQWB8YCsjXM9QVO81OKdYFzGl9CyPGvcS25Msh3_4Rd1rn_dZNo1TDkHDMlJCUGdCxOeKUbd6jnaSphMcTAAD__w.w-jPx1RbRqFVk6rTRjiBPh930YHPSoFvXl3XlLfTei0',
         
         originalRequestURL: 'http://10.88.22.67:8080',
-        EstateInfo: '{"estateId":"2209201708108B8F50AB530A49EAA858","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E7%82%B9%E4%BD%8D"}',
+        EstateInfo: '{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',
         estateId: '20210729104021C49F04B55C50F6AF58',
 
-        authObject: '{"currentEstate":{"estateId":"2209201708108B8F50AB530A49EAA858","estateName":"U%E7%89%88%E6%B5%8B%E8%AF%95%E6%A5%BC%E7%9B%98%E7%82%B9%E4%BD%8D"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"ce04f173da7df2e78a9da25595111387","token":"","random":"xISAbR","time":1683364729084,"sign":"ceb09a67fc50aa89aafcb2d435e4b41c"}',
-        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjExZDZkYWM3LWUxZjgtNDExZS1hNzFmLTFiNjIwNTk0OTFlNyJ9.dJKIU1UNLLjf9FHtfntmSHR4VacBkPLnsbfSKMUvAjzpEgrggU8j0YY6yFZTP8VHIPAZN4b_yfB7r3S5BnRKEA',
+        authObject: '{"currentEstate":{"estateId":"20191114134322C29C9B83A84F192964","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"ce04f173da7df2e78a9da25595111387","token":"","random":"XNEYyu","time":1683686365201,"sign":"79be68006872c6a088eb49f7e3dab45a"}',
+        AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjYyOTk5ZDhjLTYwY2MtNGM0OS05MzM4LWY1MTBhNjI5OGVjYiJ9.A7lCMb4mBHjse6DlvFLVV5jEQSWzREtlbeZJ6StCW4kVyyRG4RlkhRl2FJvaBZEdtoEItI52IEgBsX4X_H1m4w',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作