centaline-data-driven 1.4.81 → 1.4.83

package/package.json

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

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

@@ -71,7 +71,7 @@
                      :is="router.is" :vmodel="router" :api="model.optionApi" @click="fieldClickHandler(router)">
           </component>
           <el-popover v-if="showIndex>0" ref="popover0" :append-to-table="option.appendId?option.appendId:''"
-                      class="Stats-popover" popper-class="el-popover1" :placement="option.placement?option.placement:'left'"
+                      class="Stats-popover" popper-class="elPopoverCenta" :placement="option.placement?option.placement:'left'"
                       :trigger="option.trigger?option.trigger:''">
             <div class="tab-list" style="border-bottom:none;display: flex;flex-direction: column;">
               <component v-for="(router, index) in model.actionRoutersSimple.slice(showIndex)" :key="index" style="margin-bottom: 10px;margin-left: 0px;"
@@ -591,6 +591,12 @@
     display: table-caption;
     cursor: pointer;
 }
+
+</style>
+<style>
+#uplinkContainer .elPopoverCenta {
+  margin-bottom: 40px;
+}
 </style>
 
 

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

@@ -197,7 +197,7 @@
       },
       resizeSearchList() {
         if(this.flagSideBar && this.flagSideBarOfData){
-          if(this.sideBarStatus=='open'){
+          if(this.sideBarStatus=='open' && this.$refs.main){
             this.searchWidth=this.$refs.main.clientWidth-this.sideBarWidth;
           }
         }

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

@@ -93,22 +93,44 @@
                   column.fixed === 'right' ? 'right-fixation' : null,
                 ]" 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"
-                                    :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>
+                <div v-if="column.id === 'operation'" class="div_allinline" :class="column.autoRowHeight ? 'lineFeedCell' : 'cell'" style="float: left;">
+                  <template v-for="(router, rowRouterIndex) in getRowRouterShow(row)" >
+                    <template v-if="router.isCallTel">
+                      <component v-if="!router.rightField || !row[router.rightField] || row[router.rightField] == 1" 
+                        :key="rowRouterIndex" :ref="'router'+router.id+rowindex" :rowData="row" :rowindex="rowindex"
+                        :is="router.is" :vmodel="router" :api="model.optionApi" 
+                        @click="rolRouterClickHandler">
+                      </component>
+                    </template>
+                    <template v-else>
+                      <ct-tablecurrency v-if="!router.rightField || row[router.rightField] == 1"
+                        :key="rowRouterIndex" :ref="'router' + router.id + rowindex" :rowData="row" :rowindex="rowindex"
+                        :isOperationalColumn="true"  :router="router" :colValue="router.label"
+                        @click="rolRouterClickHandler">
+                      </ct-tablecurrency>
+                    </template>
+                  </template>
                   <el-popover v-if="getRowRouterDisplay(row).length > 0" :ref="'popover' + rowindex"
                               :append-to-table="option.appendId ? option.appendId : ''" class="Stats-popover"
                               popper-class="el-popover1" :placement="option.placement ? option.placement : 'left'"
                               :trigger="option.trigger ? option.trigger : ''">
-                    <div class="tab-list" style="border-bottom: none">
-                      <ct-tablecurrency v-for="(router, rowRouterIndex) in getRowRouterDisplay(row)"
-                                        :key="rowRouterIndex" v-if="!router.rightField || row[router.rightField] == 1"
-                                        :isOperationalColumn="true" :isShowImg="false" :rowindex="rowindex" :router="router"
-                                        :colValue="router.label" :rowData="row" @click="rolRouterClickHandler">
-                      </ct-tablecurrency>
+                    <div class="tab-list" style="border-bottom: none">                      
+                      <template v-for="(router, rowRouterIndex) in getRowRouterDisplay(row)" >
+                        <template v-if="router.isCallTel">
+                          <component v-if="!router.rightField || !row[router.rightField] || row[router.rightField] == 1" 
+                            :key="rowRouterIndex" :ref="'router'+router.id+rowindex" :rowData="row" :rowindex="rowindex"
+                            :is="router.is" :vmodel="router" :api="model.optionApi" 
+                            @click="rolRouterClickHandler">
+                          </component>
+                        </template>
+                        <template v-else>
+                          <ct-tablecurrency v-if="!router.rightField || row[router.rightField] == 1"
+                            :key="rowRouterIndex" :ref="'router' + router.id + rowindex" :rowData="row" :rowindex="rowindex"
+                            :isOperationalColumn="true"  :router="router" :colValue="router.label" :isShowImg="false"
+                            @click="rolRouterClickHandler">
+                          </ct-tablecurrency>
+                        </template>
+                      </template>
                     </div>
                     <span :slot="getRowRouterDisplay(row).length > 0 ? 'reference' : ''" class="icon-more"></span>
                   </el-popover>
@@ -842,6 +864,7 @@ export default {
       this.routerClickHandler(field, submitData, action);
     },
     rolRouterClickHandler(field, rowData, rowindex, visible) {
+      field.rowindex=rowindex;
       if (this.$refs["popover" + rowindex]) {
         this.$refs["popover" + rowindex][0].doClose();
       }
@@ -862,6 +885,10 @@ export default {
         submitData["searchFields"] = self.model.getSearchData();
       }
       
+      if(field.isCallTel){
+        submitData.flagHaveAlert=visible||false;
+      }
+
       let action = field.action;
       if (field.actionField) {
         action = rowData[field.actionField];

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

@@ -475,6 +475,7 @@
     .viewerMenu .el-menu-item {
       height: 30px !important;
       line-height: 30px !important;
+      min-height: 30px !important;
     }
     
     .viewerMenu .el-menu-item-group__title {

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

@@ -347,12 +347,13 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get actionRouter() {
         if (rtn._actionRouter !== null) {
           return rtn._actionRouter;
-        } else {
+        } 
+        else {
           rtn._actionRouter = [];
           if (source.content.actionRouters) {
             source.content.actionRouters.forEach((v) => {
               var router = Router(v);
-              //router.is = "ct-btn";
+              router.is = "ct-btn";
               //router.attrs = { size: "mini" }
               rtn._actionRouter.push(router);
             });