centaline-data-driven 1.3.57 → 1.3.58

package/package.json

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

package/src/Detail.vue

@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1524955049590132736"} ,
+        apiParam: {actionType: 1,chanceID: "1558013601325912064"} ,
       }
     },
     mounted() {

package/src/centaline/dynamicBtn/src/dynamicBtn.vue

@@ -40,8 +40,7 @@
     :style="{color:model.textColor,backgroundColor:model.imgUrl?'transparent':model.bgColor,borderColor:model.imgUrl?'transparent':model.borderColor,padding:model.imgUrl?'0px':null}"
     :icon="model.icon"
     :disabled="model.disabled || model.locked">
-    <el-popover 
-      class="Stats-popover" :popper-class="'el-popoverCallTel'" :placement="option.placement?option.placement:'left'" 
+    <el-popover  class="Stats-popover" :popper-class="'el-popoverCallTel'" :placement="option.placement?option.placement:'left'" 
       v-model="visible" :trigger="option.trigger?option.trigger:''">
       <div style="border-bottom:none">
         <div style="color: #388cd3;text-align: center;">{{message}}</div>

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -158,20 +158,10 @@
                 </div>
               </div>
             </div>
-            <div
-              v-for="(col, index) in collapse"
-              :key="index"
-              class="info-conten-b"
-              v-show="allInfo"
-            >
+            <div v-for="(col, index) in collapse" :key="index"  class="info-conten-b" v-show="allInfo">
               <div class="info-row mb20">
-                <div
-                  v-for="(c, i) in col"
-                  :key="i"
-                  :class="c.singleLine === true ? 'row-i100' : 'row-i'"
-                >
-                  <span>{{ c.label }}</span
-                  ><span>{{ c.value }}</span>
+                <div  v-for="(c, i) in col" :key="i"  :class="c.singleLine === true ? 'row-i100' : 'row-i'">
+                  <span>{{ c.label }}</span><span>{{ c.value }}</span>
                 </div>
               </div>
             </div>
@@ -181,11 +171,7 @@
             </div>
           </div>
           <div class="contacts-info base-box">
-            <ct-contactList
-              v-if="model.contactApiRouter !== null"
-              :apiRouter="model.contactApiRouter"
-              :key="'contact' + refershKey"
-            ></ct-contactList>
+            <ct-contactList v-if="model.contactApiRouter !== null"  :apiRouter="model.contactApiRouter" :key="'contact' + refershKey"></ct-contactList>
           </div>
           <div class="tablist-info base-box">
             <div class="details-tabs-box">

package/src/centaline/dynamicFile/src/dynamicFile.vue

@@ -56,7 +56,7 @@
             </el-dropdown>
           </span>
         </div>
-        <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress"></el-progress>
+        <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress" :width="96" :height="96" style="margin-left: 15px;"></el-progress>
       </div>
     </el-upload>
   </div>

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

@@ -193,6 +193,9 @@
         }
       },
       tableLoaded() {
+        if (typeof this.$refs.table.model.cellLayout !== "undefined") {
+          this.$refs.screen.LoadLayout();
+        }
         if(this.$refs.table.model.listData.length>0){
           this.flagSideBarOfData=true;
           this.flagSideBar=this.$refs.table.model.flagSideBar;

package/src/centaline/dynamicSearchList/src/dynamicSearchScreen.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="st-serach-screen">
     <div v-bind="model.attrs" style="width:100%" v-if="!isLoading">
-      <div class="ct-ptb5 max-ptb5" v-if="showScreen">
+      <div :class="isLayout === true ? 'ct-ptl0 max-ptb5' : 'ct-ptb5 max-ptb5'" v-if="showScreen">
         <template v-for="(col, index) in model.screen" v-if="col.show !== false">
           <br v-if="col.is === 'ct-linefeed'" />
           <component v-else class="list-field max-list-field" v-bind="col.listBind" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
@@ -48,7 +48,8 @@
         screenRow: [],
         highScreenRow: [],
         highScreen: false,
-        showScreen: true
+        showScreen: true,
+        isLayout: false,
       }
     },
     mounted() {
@@ -172,6 +173,9 @@
       saveShortcut(){
         this.$emit('saveShortcut');
       },
+      LoadLayout() {
+        this.isLayout = true;
+      },
     }
   }
 </script>
@@ -198,5 +202,8 @@
   .list-field {
     padding: 5px;
   }
+  .ct-ptl0 {
+    padding: 0 10px 10px 10px;
+  }
 
 </style>

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

@@ -98,8 +98,8 @@
                 v-bind="column.attrs">
                 <!--操作列-->
                 <div v-if="column.id === 'operation'" class="div_allinline" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'">
-                  <ct-tablecurrency v-for="(router, rowRouterIndex) in getRowRouterShow(row)" :key="rowRouterIndex"
-                    v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true"
+                  <ct-tablecurrency v-for="(router, rowRouterIndex) in getRowRouterShow(row)" :key="rowRouterIndex" :ref="'router' +router.id+ rowindex"
+                    v-if="!router.rightField || row[router.rightField] == 1" :isOperationalColumn="true" :rowindex="rowindex" 
                     :router="router" :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
                   <el-popover v-if="getRowRouterDisplay(row).length > 0" :ref="'popover' + rowindex"
@@ -118,12 +118,12 @@
                 </div>
 
                 <ct-tablecurrency v-else-if="column.id === 'voice'" :isShowVoice="true"
-                  :router="column.router" :colValue="column.router.label"
+                  :router="column.router" :colValue="column.router.label" :rowindex="rowindex" 
                   :rowData="row" @click="rolRouterClickHandler" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'">
                 </ct-tablecurrency>
 
                 <!--可点击的列-->
-                <ct-tablecurrency v-else-if="column.router"
+                <ct-tablecurrency v-else-if="column.router" :ref="'router' +column.router.id+ rowindex" :rowindex="rowindex" 
                   :align="column.attrs.align" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'"
                   :router="column.router" :colValue="row[column.id]" :rowData="row" @click="rolRouterClickHandler">
                 </ct-tablecurrency>
@@ -630,7 +630,16 @@ export default {
             if (this.$parent.$refs.screen) {
               h5 = this.$parent.$refs.screen.$el.offsetHeight | 0;
             }
-            let tableHeight = h1 - h2 - h3 - h4 - h5 - 290;
+            var h6 =  0;
+            if (this.$refs.toolbar) {
+              h6 = this.$refs.toolbar.$el.offsetHeight | 0;
+            }
+            var h7 =  0;
+            if (this.$refs.listHeader) {
+              h7 = this.$refs.listHeader.$el.offsetHeight | 0;
+            }
+            var h8 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0 : 0;
+            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8- 290;
             if (h2 == 0) {
               tableHeight = tableHeight + 15;
             }
@@ -793,10 +802,16 @@ export default {
 
       this.routerClickHandler(field, submitData, action);
     },
-    rolRouterClickHandler(field, rowData, rowindex) {
+    rolRouterClickHandler(field, rowData, rowindex,visible) {
       if (this.$refs["popover" + rowindex]) {
         this.$refs["popover" + rowindex][0].doClose();
       }
+      if(field.isListenVoice){
+        if(this.model.currentListenVoice){
+          this.$refs[this.model.currentListenVoice][0].closeListenVoice()
+        }
+        this.model.currentListenVoice=visible?'router'+field.id+rowindex:'';
+      }
 
       var self = this;
       var submitData = {};
@@ -1314,8 +1329,7 @@ export default {
         else {
           // let parm={submitData:submitData,field:field}
           // self.$common.excuteFunStr.call(self.model.scripts, field.action,parm);
-          let title =
-            field.pageTitle == undefined ? field.label : field.pageTitle;
+          let title =  field.pageTitle == undefined ? field.label : field.pageTitle;
           submitData.actionType = field.actionType;
           var fun = self.$common.getDataDrivenOpts().handler[action];
           fun(submitData, title, self.model);
@@ -1552,7 +1566,7 @@ export default {
         self.updateCurrentRow(field, data);
       }
     },
-    },
+  },
 };
 </script>
 <style>

package/src/centaline/templateControls/src/dynamicTableCurrency.vue

@@ -7,13 +7,13 @@
       </video>
     </div>
     <div v-else-if="router.isListenVoice">
-      <el-popover  class="Stats-popover" :popper-class="'el-listenVoice'+rowindex" :placement="option.placement?option.placement:'left'" 
+      <el-popover class="Stats-popover" :popper-class="'el-listenVoice'" :placement="option.placement?option.placement:'left'" 
         v-model="visible" :trigger="option.trigger?option.trigger:''" style="margin:0px;">
         <div class="alert fade in" role="alert" style="padding:0px;border-bottom:none;display: table-caption;">
           <button type="button" class="close el-icon-close" style="right:0px;float:right;margin-bottom: 5px;cursor: pointer;" data-dismiss="alert" aria-label="Close" @click="clickHandler">            
           </button>
-          <video ref="video" :src="rowData[router.submitFormField]" controls="true" controlslist="nodownload" @timeupdate="saveVoiceHistoryHandler"
-            @ended="voiceEndedHandler"
+          <video ref="video" :src="rowData[router.submitFormField]" controls="true" controlslist="nodownload" 
+            @timeupdate="saveVoiceHistoryHandler" @ended="voiceEndedHandler"
             :height="router.dialogHeight?router.dialogHeight:'40'" :width="router.dialogWidth?router.dialogWidth:'100%'">您的浏览器不支持 video 标签。
           </video>
         </div>
@@ -80,12 +80,20 @@
     methods: {
       clickHandler(ev) {
         if(this.router.isListenVoice){
+          if(this.visible){
+            this.$refs.video.pause();
+          }
           this.visible=!this.visible;
+          this.$emit('click', this.router, this.rowData,this.rowindex,this.visible);
         }
         else{
           this.$emit('click', this.router, this.rowData,this.rowindex);
         }
       },
+      closeListenVoice() {
+        this.$refs.video.pause();
+        this.visible=false;
+      },
       saveVoiceHistoryHandler() {
         var self=this;
         if(self.router.action && (self.visible || self.isShowVoice)){

package/src/main.js

@@ -42,7 +42,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '77791819-ac7d-4a5d-bd16-5278b9f0b5d7',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrEOgkAQRP9laza55Xb3bu30wMaPIAdSYGUEEo3x38UEOnpf8YpJJjNvGOcWDhBWcEcbja3gjjYaIrZAWuPRQkJW9hgpRUysic9V7dOpggL65x0OpEoSo7EvYMjTGrhSfsE89o9L__rHuds0LLOm5rxcDZ20HXKZFXMoZamJdx2RzyLw-QIAAP__.hjzw6Mbh5gUGa-JsoKT0XZdSO5UstBfl1tvFXfGp98g',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZM47OzMLp0u2HgIssKYaGUEEo3x7mqEjt5XvOI1_z9hmI5Qgc7gihbaOIMrWmiJOCpJg9uoCVnYYaAUMLEk3teNS7saCrD7FSoSoeBJmQo45_EXVLz7hmmw28Ee_zh3Gc-f2dhtfHTSofamyJw9BjtlzL2V5kuvTh283gAAAP__.KYZp-VKSbEpaYv2113fqdgRPNzO_IUQt81f-LIw8mXM',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
         estateId: '20210729104021C49F04B55C50F6AF58',