centaline-data-driven 1.4.83 → 1.4.85

package/package.json

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

package/src/SearchList.vue

@@ -4,12 +4,18 @@
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
     
-    <ct-searchlist :apiParam="para"
+    <!-- <ct-searchlist :apiParam="para"
+      :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 
+      :searchDataApi="'/api/third-dept-tran/tran-list'">
+    </ct-searchlist> -->
+
+
+    <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/ProfileWorklistList/getLayoutOfSearch'" 
       :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
       :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" 
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <!-- <ct-searchlist :apiParam="para"
       :searchConditionApi="'/RightValueList/getLayoutOfSearch'" 
@@ -22,11 +28,11 @@
       :searchDataApi="'/PropertyPublishList/getListOfSearchModelForRET'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyRETList/getListStats'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
     <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"

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

@@ -56,8 +56,14 @@
     :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">
-    <img v-if="model.imgUrl" :title="model.label" :src="model.imgUrl" :height="model.buttonHeight+'px'"/>
-    <span v-else>{{model.label}}</span>
+    <div v-if="flagAppMode" :title="model.label">
+      <img  :src="model.imgUrl" :height="model.buttonHeight+'px'"/>
+      <div style="margin-top:5px;" class="labelText">{{model.label}}</div>
+    </div>
+    <div v-else>
+      <img v-if="model.imgUrl" :title="model.label" :src="model.imgUrl" :height="model.buttonHeight+'px'"/>
+      <span v-else>{{model.label}}</span>
+    </div>
   </el-button>
 </template>
 <script>
@@ -70,6 +76,7 @@
       optionApi:String,
       rowData: Object,
       rowindex:Number,
+      flagAppMode:Boolean,
     },
     mixins: [dynamicElement],
     data: function () {
@@ -195,3 +202,8 @@
     }
   }
 </script>
+<style>
+.labelText{
+-webkit-transform: scale(0.90);
+}
+</style>

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

@@ -8,7 +8,7 @@
       
       <ct-PropertySimpleDetailRET :api="api" :apiParam="apiParam" :selectIndex="selectIndex" :rowCount="rowCount" class="ct-PropertySimpleDetailRET"  
       @loaded="loaded" @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
-      v-if="pageType=='PropertySimpleDetailRET'" @closeSideHandler="closeSideHandler"></ct-PropertySimpleDetailRET>
+      v-if="pageType=='PropertySimpleDetailRET'" @closeSideHandler="closeSideHandler" :drowerClose="drowerClose"></ct-PropertySimpleDetailRET>
     </div>
 </template>
 
@@ -32,6 +32,7 @@
       selectIndex:Number,
       rowCount:Number,
       top:Number,
+      drowerClose:String,
     },
     data() {
       return {

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

@@ -17,7 +17,22 @@
              style="width: 26px;height: 26px;vertical-align: bottom;margin-right:11px;cursor: pointer">
         <img :class="{'domDisabled':selectIndex===rowCount-1}" @click="clickNextHandler" src="../../../assets/B.png" alt=""
              style="width: 26px;height: 26px;vertical-align: bottom;margin-right:8px;cursor: pointer">
-        <div class="el-icon-close cursor" style="padding-top: 5px;" @click="closeSideHandler"></div>
+        <div v-if="!model.flagAppMode" class="el-icon-close cursor" style="padding-top: 5px;" @click="closeSideHandler"></div>
+        <span v-if="model.flagAppMode" :slot="showIndex>0?'reference':''" class="more" style="margin-right: 10px;"  @click="drawer = true"></span>
+          <el-drawer
+            title="更多操作"
+              :visible.sync="drawer"
+              direction="ttb"
+              :modal="false"
+              class="drawerMore"
+              size="30%">
+            <div style="display: flex;flex-flow:row wrap ">
+              <component v-for="(router, index) in model.actionRoutersSimple.slice(showIndex)" :key="index" class="drawerButton"
+                         v-if="!router.rightField || (model.fields1Dic[router.rightField] && model.fields1Dic[router.rightField].value == 1)"
+                         :is="router.is" :vmodel="router" :flagAppMode="model.flagAppMode" :api="model.optionApi" @click="fieldClickHandler(router)">
+              </component>
+            </div>
+          </el-drawer>
       </div>
       <div style="padding-left: 20px;padding-right: 20px;">
         <div ref="title" style="margin-top: 18px;">
@@ -64,7 +79,7 @@
         <div ref="contact" id="contact" style="margin-top: 16px;" v-if="!model.flagHiddenSensitiveInfo && model.contactApiRouter!==null">
           <ct-contact :key="refreshKey" :apiRouter="model.contactApiRouter" :api="model.contactApiRouter.action" :apiParam="model.contactApiRouter.getSearchPara()"></ct-contact>
         </div>
-        <div ref="routers" v-if="!model.flagHiddenSensitiveInfo && model.actionRoutersSimple!==null" style="margin-top: 16px;display: flex;">
+        <div ref="routers" v-if="!model.flagAppMode && !model.flagHiddenSensitiveInfo && model.actionRoutersSimple!==null" style="margin-top: 16px;display: flex;">
           <component v-for="(router, index) in model.actionRoutersSimple.slice(0,showIndex>0?showIndex:model.actionRoutersSimple.length)" :key="index"
                      :ref="'routers'+index"
                      v-if="!router.rightField || (model.fields1Dic[router.rightField] && model.fields1Dic[router.rightField].value == 1)"
@@ -96,7 +111,7 @@
             <ct-searchlist ref="searchlist"  v-if="model.searchConditionApiTags1" :key="'list'+listKey.toString()+refershKey"
                            :apiParam="model.paramDataTags1" :flagFocus="false"
                            :searchConditionApi="model.searchConditionApiTags1"
-                           :searchDataApi="model.searchDataApiTags1"></ct-searchlist>
+                           :searchDataApi="model.searchDataApiTags1" :flagAppMode="model.flagAppMode"></ct-searchlist>
           </div>
         </div>
       </div>
@@ -120,6 +135,7 @@
       apiParam: Object,
       selectIndex:Number,
       rowCount:Number,
+      drowerClose:String,
     },
     computed: {      
     },
@@ -136,8 +152,16 @@
           trigger: 'hover',//触发方式，传值可查看Popper UI组件trigger属性
           placement: 'left-start',//方向，传值可查看Popper UI组件placement属性
         },
+        drawer: false,
       }
     },
+    watch: {
+      drowerClose(newValue) {
+      if (newValue=='open') {
+        this.handleClose();
+      }
+    }
+  },
     mounted() {
       var self = this;
       this.$nextTick(function () {
@@ -161,7 +185,7 @@
       load(data) {
         var self = this;
         this.refershKey = this.refershKey + 1;
-        this.model = data; 
+        this.model = data;
         this.model.$vue = self;
         this.loadFields();
         if(this.model.tags2 && this.model.tags2[0]){
@@ -298,6 +322,7 @@
         }
 
         var self = this;
+        self.handleClose();
         var callBack=null;
         let submitData={};
         var router = this.model.actionRouters.find((v) => {
@@ -508,11 +533,21 @@
             }
             else{
               field.doAction(submitData, (data) => {
-                self.model.doAction(data,field);
                 if(callBack){
                   callBack();
                 }
-                self.$emit('simpleRouterclickHandler',field,data);
+                if (field.isCallTel) {
+                  self.model.doAction(data, field);
+                  if(self.model.currentCallTel){
+                    self.$refs[self.model.currentCallTel][0].closeCallTel()
+                  }
+                  self.model.currentCallTel='router'+field.id+field.rowindex;
+                  self.$refs['router'+field.id+field.rowindex][0].callTelClick(data);
+                }
+                else{
+                  self.model.doAction(data,field);
+                  self.$emit('simpleRouterclickHandler',field,data);
+                }
               })
             }
           }
@@ -545,6 +580,10 @@
           clickAcion(field,submitData);
         }
       },
+      handleClose(){
+        let self = this;
+        self.drawer=false;
+      },
       closeSideHandler() {
         this.$emit('closeSideHandler');
       },
@@ -591,11 +630,52 @@
     display: table-caption;
     cursor: pointer;
 }
-
 </style>
 <style>
-#uplinkContainer .elPopoverCenta {
-  margin-bottom: 40px;
+.drawerMore{
+  width: 410px;
+  left: auto; 
+  top:18px;
+}
+.v-modal {
+    position: relative;
+}
+.drawerMore .el-drawer__container{
+  top: 70px;
+}
+.drawerMore .el-drawer.ttb {
+    height: auto !important;
+    background:rgba(47, 47, 47, 0.8);
+    padding-bottom: 10px;
+}
+.drawerMore .el-drawer__header{
+  margin-bottom: 5px;
+  color: #fff;
+  padding-top: 10px;
+  padding-left: 10px;
+  font-size: 14px;
+}
+.drawerMore .el-drawer__body{
+  padding-left: 3px;
+}
+.drawerMore .el-drawer__header i.el-dialog__close.el-icon.el-icon-close{
+color: #fff;
+}
+.drawerButton{
+  margin-bottom: 10px !important;
+  margin-left: 6px !important;
+    background-color: #181818 !important;
+    border-color: #181818 !important;
+    width: 94px !important;
+    height: 56px !important;
+}
+.drawerButton.el-button--primary:hover{
+  background: #2b2b2b;
+    border-color: #2b2b2b;
+    color: #FFF;
+}
+.drawerMore .el-icon-close:before {
+    content: "\E6DB";
 }
 </style>
 

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

@@ -13,7 +13,7 @@
       @showTitle="showTitleScreenHandler"></ct-searchscreen>
 
       <ct-searchtable ref="table" :api="searchDataApi" :searchStatsApi="searchStatsApi" :from="from" :isIframe="isIframe" :documentHeight="documentHeight" 
-      @loaded="tableLoaded" :documentWidth="documentWidth" :flagPopupSearchlist="flagPopupSearchlist" :screenTop="screenTop"
+      @loaded="tableLoaded" :documentWidth="documentWidth" :flagPopupSearchlist="flagPopupSearchlist" :screenTop="screenTop" :flagAppMode="flagAppMode"
       @toolbarClick="toolbarClickHandler" @refreshParent="refreshParentHandler"  :key="reloadKeyTable" @searchComplate="searchComplate" 
       @rowClickHandle="rowClickHandle" @scrollHandle="scrollHandle" @refreshRowHandle="refreshRowHandle" @doClosePopoverHandle="doClosePopoverHandle" 
       @showTitle="showTitleHandler" @popupClickHandler="popupClickHandler"></ct-searchtable>      
@@ -22,7 +22,7 @@
     :style="{'height': pageHeight? pageHeight:'100%','width':sideBarWidth+'px',right:sideBarRight+'px'}" 
     class="sidebar">
       <ct-Detail ref="detail" :api="sideBarApi" :apiParam="sideBarApiParam" :pageType="sideBarPageType" 
-      :selectIndex="selectIndex" :rowCount="rowCount" :key="detailKey" 
+      :selectIndex="selectIndex" :rowCount="rowCount" :key="detailKey" :drowerClose="drowerClose"
       @clickNextHandler="clickNextHandler" @clickPrevHandler="clickPrevHandler" @simpleRouterclickHandler="simpleRouterclickHandler"
       @closeSideHandler="closeSideHandler"></ct-Detail>
       <ct-SearchSideMenu ref="sideMenu" :sideBarMenuRight="sideBarMenuRight" :sideBarStatus="sideBarStatus" 
@@ -55,6 +55,7 @@
       searchDataApi: String,
       searchStatsApi: String,
       pageHeight: String,
+      flagAppMode:Boolean,
       apiParam: {
         type: Object,
         default: () => { }
@@ -76,6 +77,11 @@
         default:false,
       },
     },
+    data() {
+      return {
+        drowerClose:'',
+      }
+    },
     created() {
       this.model = this.vmodel;
       this.screenPara=this.apiParam;
@@ -279,6 +285,7 @@
         this.rowClickHandle();
       },
       sideMenuClickHandler(v) {
+        this.drowerClose = v;
         let popoverCallTels=document.getElementsByClassName('el-popoverCallTel');
         if(v=='open'){
           this.sideBarStatus ='close';

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

@@ -214,6 +214,7 @@ export default {
     vmodel: Object,
     api: String,
     searchStatsApi: String,
+    flagAppMode:Boolean,
     flagFocus: {
       Boolean,
       default: true,
@@ -699,6 +700,9 @@ export default {
             }
             var h8 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0 : 0;
             let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 290 -7;
+            if(this.flagAppMode){
+              tableHeight = tableHeight + 40;
+            }
             if (h2 == 0) {
               tableHeight = tableHeight + 15;
             }

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

@@ -70,6 +70,9 @@ const Detail = function (source, para, callBack) {
       get title() {
         return data.title;
       },
+      get flagAppMode() {
+        return data.flagAppMode;
+      },
       get flagHiddenSensitiveInfo() {
         return data.flagHiddenSensitiveInfo;
       },

package/src/main.js

@@ -12,7 +12,7 @@ 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.88.22.13:7070/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.6.1.162:17070/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.63:9999/v1/form/router",
   // baseUrl: "http://10.88.22.42:9999/v1/form/router", 
@@ -47,8 +47,8 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzjsOwjAQRdG9uGYkZz6eGTonJg2LQA5xARUiIIEQeyeIRdCe4r73Cst9CtvgqMmYCYZdT8AlK_SpizAkz5ItY-rlkEYpiKpAOhoMXSRAzAWiFR2pkCeNh8KeDdfSSmsJux1YTxlQ2JhGYVcJm9Ael7DtkkUntyibcKq3H5gQf-G-tOu-Pf9x7nw7fWcJvbZ5Bm9zA56cwGViaGa1qmK1dgzvDwAAAP__.muXO336Qhg1m00cMVrDKHQ7wgHJ_w7JbngtJt-K2r84',
+        oldToken: '038e4dcf-1976-4fca-a66a-93611ea1b18c',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzksKwjAUheG9ZOyF5L7jLG3sxEWI1RR0JFZBEfduxUU4_Qb_Oa8w38ewDhlNnZmg33QEXItBpylCr7lI8YLayU4HqYhmQDY49CkSIJYK0asNVCmrxV3lXByX0kJLCdMGvKMCKOxMg3A2CavQHpewTuqJRKPQKpz2tx-gZv3CfW7XbXv-49z5dlpmR0t8lDiBWGvAqSnsZZogjkqCaTocyMP7AwAA__8.S8HluKh69E2SDbM5s5Ff9U6dYD3vC_g9UbVQZOyLRGM',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',