centaline-data-driven 1.4.67 → 1.4.68

package/build/centaline/centaline.path.js

@@ -57,6 +57,7 @@ const paths = {
     "dynamicViewerFile": "./src/centaline/dynamicViewerFile/index.js", //图片预览框组件
     "dynamicDragSort": "./src/centaline/dynamicDragSort/index.js", //上下拖拽排序组件
     "dynamicEditPictures": "./src/centaline/dynamicEditPictures/index.js", //图片编辑组件
+    "dynamicMapBaidu": "./src/centaline/dynamicMapBaidu/index.js", //地图
   },
   "plugs": {
     "api": "./src/centaline/api/index.js", //调用API插件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.67",
+  "version": "1.4.68",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,
@@ -21,6 +21,7 @@
     "save": "^2.4.0",
     "v-viewer": "^1.6.4",
     "vue": "2.5.17",
+    "vue-baidu-map": "^0.21.22",
     "vue-cropper": "^0.5.8",
     "vue-ueditor-wrap": "^2.5.6",
     "vuedraggable": "^2.24.3"

package/src/Detail.vue

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

package/src/SearchList.vue

@@ -11,10 +11,10 @@
       :searchStatsApi="'/ProfileWorklistList/getListStats'">
     </ct-searchlist> -->
 
-    <!-- <ct-searchlist :apiParam="para"
-      :searchConditionApi="'/distribution/jumpPoint/getLayoutOfSearch'" 
-      :searchDataApi="'/distribution/jumpPoint/list'">
-    </ct-searchlist> -->
+    <ct-searchlist :apiParam="para"
+      :searchConditionApi="'/RightValueList/getLayoutOfSearch'" 
+      :searchDataApi="'/RightValueList/getListOfSearchModel'">
+    </ct-searchlist>
 
     <!-- <ct-searchlist 
       :searchCategoryApi="'/PropertyPublishList/getLayoutOfSearchCategory'" 
@@ -28,11 +28,11 @@
       :searchStatsApi="'/PropertyRETList/getListStats'">
     </ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
+    <!-- <ct-searchlist :searchConditionApi="'/PropertyOFIList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyOFIList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyOFIList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/PropertyOFIList/getListStats'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/centaline/css/max.css

@@ -265,7 +265,9 @@
 .ct-text .showLabel label{ 
     line-height: 27px!important;
   }
-
+  .ct-text .el-tooltip {
+    cursor: text;
+}
   .dragItem .el-checkbox__input.is-checked+.el-checkbox__label {
     /* color: #409EFF !important; */
     color: #666 !important;

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

@@ -21,7 +21,7 @@
             <span>{{ model.fields1Dic.PropertyNo.label }}{{ model.fields1Dic.PropertyNo.value }}</span>
             <span>{{ model.fields1Dic.GovNo.label }}{{ model.fields1Dic.GovNo.value }}</span>
             <span class="mr10">{{model.fields1Dic["DistrictName"].value + model.fields1Dic.AreaName.value}}</span>
-            <img :src="model.fields1Dic.LocationUrl.value" alt="" class="location"/>
+            <img v-if="model.actionRouterMap" @click="fieldClickHandler(model.actionRouterMap, $event)" :src="model.actionRouterMap.imgUrl || model.fields1Dic.LocationUrl.value" alt="" class="location cursor"/>
           </div>
           <div class="title-tags">
             <div class="t-tag" v-for="(tag, index) in model.actionRouterLabel" :key="index" 
@@ -757,6 +757,11 @@ export default {
           router = this.model.dutyHistoryApiRouter;
         }
       }
+      if (router == undefined && this.model.actionRouterMap) {
+        if (field.id === this.model.actionRouterMap.id) {
+          router = this.model.actionRouterMap;
+        }
+      }
 
       if (router) {
         if (field.isSubmitDataFromSelf) {
@@ -819,7 +824,46 @@ export default {
           // if (typeof field.onClick !== 'undefined') {
           //   verified = self.$common.excute.call(self.model.scripts, field.onClick);
           // }
-          if (field.isBrowseAttachment) {//浏览附件
+          if(field.isTabInSystem){
+            if(field.isOpenBaiduMap){
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabBaiduMap(submitData,field.pageTitle || field.label);
+            }
+          }
+          else if(field.isTabInBrowse){
+            
+          }
+          else if(field.isLayerInSystem){
+            if(field.isOpenBaiduMap){
+              var dialogOption = {
+                title: field.pageTitle,
+                pane: self.$common.getParentPane(self),
+                content: [
+                  {
+                    component: "ct-mapBaidu",
+                    attrs: {
+                      field: field,
+                      apiParam: field.getActionPara(submitData).para,
+                      width: field.dialogWidth + "px",
+                      height: field.dialogHeight + "px",
+                    },
+                    on: {
+                      submit(ev) {
+                        if (callBack) {
+                          callBack(field);
+                        }
+                        self.$common.closeDialog(dialogOption.dialog);
+                      },
+                      closeDialog(ev) {                      
+                      }
+                    },
+                  },
+                ],
+              };
+              self.$common.openDialog(dialogOption);
+            }
+          }
+          else if (field.isBrowseAttachment) {//浏览附件
             var mediaviewpagetype=(field.isFormPageInTab||field.isSearchPageInTab)?2:0; 
             var MediaAlbum = [
               { albumName: self.model.title || "媒体", medias: [] },

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

@@ -22,7 +22,7 @@
             <span>{{ model.fields1Dic.PropertyNo.label }}{{ model.fields1Dic.PropertyNo.value }}</span>
             <span>{{ model.fields1Dic.GovNo.label}}{{ model.fields1Dic.GovNo.value }}</span>
             <span class="mr10">{{model.fields1Dic["DistrictName"].value +model.fields1Dic.AreaName.value}}</span>
-            <img :src="model.fields1Dic.LocationUrl.value" alt="" class="location"/>
+            <img v-if="model.actionRouterMap" @click="fieldClickHandler(model.actionRouterMap, $event)" :src="model.actionRouterMap.imgUrl || model.fields1Dic.LocationUrl.value" alt="" class="location cursor"/>
           </div>
           <div class="title-tags">
             <div class="t-tag" v-for="(tag, index) in model.actionRouterLabel"  :key="index"
@@ -766,6 +766,11 @@ export default {
           router = this.model.dutyHistoryApiRouter;
         }
       }
+      if (router == undefined && this.model.actionRouterMap) {
+        if (field.id === this.model.actionRouterMap.id) {
+          router = this.model.actionRouterMap;
+        }
+      }
 
       if (router) {
         if (field.isSubmitDataFromSelf) {
@@ -828,7 +833,46 @@ export default {
           // if (typeof field.onClick !== 'undefined') {
           //   verified = self.$common.excute.call(self.model.scripts, field.onClick);
           // }
-          if (field.isBrowseAttachment) {//浏览附件       
+          if(field.isTabInSystem){
+            if(field.isOpenBaiduMap){
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabBaiduMap(submitData,field.pageTitle || field.label);
+            }
+          }
+          else if(field.isTabInBrowse){
+            
+          }
+          else if(field.isLayerInSystem){
+            if(field.isOpenBaiduMap){
+              var dialogOption = {
+                title: field.pageTitle,
+                pane: self.$common.getParentPane(self),
+                content: [
+                  {
+                    component: "ct-mapBaidu",
+                    attrs: {
+                      field: field,
+                      apiParam: field.getActionPara(submitData).para,
+                      width: field.dialogWidth + "px",
+                      height: field.dialogHeight + "px",
+                    },
+                    on: {
+                      submit(ev) {
+                        if (callBack) {
+                          callBack(field);
+                        }
+                        self.$common.closeDialog(dialogOption.dialog);
+                      },
+                      closeDialog(ev) {                      
+                      }
+                    },
+                  },
+                ],
+              };
+              self.$common.openDialog(dialogOption);
+            }
+          }
+          else if (field.isBrowseAttachment) {//浏览附件       
             var mediaviewpagetype=(field.isFormPageInTab||field.isSearchPageInTab)?2:0; 
             var MediaAlbum = [
               { albumName: self.model.title || "媒体", medias: [] },

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

@@ -329,6 +329,11 @@
             router = this.model.actionRouterEstate;
           }
         }
+        if (router == undefined && this.model.actionRouterMap) {
+          if (field.id === this.model.actionRouterMap.id) {
+            router = this.model.actionRouterMap;
+          }
+        }
 
         if(router){
           if(field.isSubmitDataFromSelf){
@@ -376,7 +381,46 @@
             //   verified = self.$common.excute.call(self.model.scripts, field.onClick);
             // }
             
-            if (field.isOpenForm) {
+            if(field.isTabInSystem){
+              if(field.isOpenBaiduMap){
+                submitData = field.getActionPara(submitData).para;
+                self.$common.getDataDrivenOpts().handler.openTabBaiduMap(submitData,field.pageTitle || field.label);
+              }
+            }
+            else if(field.isTabInBrowse){
+              
+            }
+            else if(field.isLayerInSystem){
+              if(field.isOpenBaiduMap){
+                var dialogOption = {
+                  title: field.pageTitle,
+                  pane: self.$common.getParentPane(self),
+                  content: [
+                    {
+                      component: "ct-mapBaidu",
+                      attrs: {
+                        field: field,
+                        apiParam: field.getActionPara(submitData).para,
+                        width: field.dialogWidth + "px",
+                        height: field.dialogHeight + "px",
+                      },
+                      on: {
+                        submit(ev) {
+                          if (callBack) {
+                            callBack(field);
+                          }
+                          self.$common.closeDialog(dialogOption.dialog);
+                        },
+                        closeDialog(ev) {                      
+                        }
+                      },
+                    },
+                  ],
+                };
+                self.$common.openDialog(dialogOption);
+              }
+            }
+            else if (field.isOpenForm) {
               var dialogOption = {
                 title: field.pageTitle,
                 pane: self.$common.getParentPane(self),

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -428,7 +428,46 @@
                 submitData = self.getFileData(field);
               }
 
-              if (field.isOpenForm) {
+              if(field.isTabInSystem){
+                if(field.isOpenBaiduMap){
+                  submitData = field.getActionPara(submitData).para;
+                  self.$common.getDataDrivenOpts().handler.openTabBaiduMap(submitData,field.pageTitle || field.label);
+                }
+              }
+              else if(field.isTabInBrowse){
+                
+              }
+              else if(field.isLayerInSystem){
+                if(field.isOpenBaiduMap){
+                  var dialogOption = {
+                    title: field.pageTitle,
+                    pane: self.$common.getParentPane(self),
+                    content: [
+                      {
+                        component: "ct-mapBaidu",
+                        attrs: {
+                          field: field,
+                          apiParam: field.getActionPara(submitData).para,
+                          width: field.dialogWidth + "px",
+                          height: field.dialogHeight + "px",
+                        },
+                        on: {
+                          submit(ev) {
+                            if (callBack) {
+                              callBack(field);
+                            }
+                            self.$common.closeDialog(dialogOption.dialog);
+                          },
+                          closeDialog(ev) {                      
+                          }
+                        },
+                      },
+                    ],
+                  };
+                  self.$common.openDialog(dialogOption);
+                }
+              }
+              else if (field.isOpenForm) {
                 var dialogOption = {
                   title: field.pageTitle,
                   pane: self.$common.getParentPane(self),

package/src/centaline/dynamicMapBaidu/index.js

@@ -0,0 +1,11 @@
+import dynamicMapBaidu from './src/dynamicMapBaidu'
+
+dynamicMapBaidu.install = function (Vue) {
+  Vue.component(dynamicMapBaidu.name, dynamicMapBaidu);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicMapBaidu);
+}
+
+export default dynamicMapBaidu;

package/src/centaline/dynamicMapBaidu/src/dynamicMapBaidu.vue

@@ -0,0 +1,84 @@
+<template>
+  <div>
+    <baidu-map :center="center" :zoom="zoom" @ready="handler" :style="{height:mapHeight + 'px'}">
+      <bm-navigation v-if="flagShowZoom" anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-navigation>
+    </baidu-map>
+  </div>
+</template>
+<script>
+  import BaiduMap from 'vue-baidu-map'
+  export default {
+    name: 'ct-mapBaidu',
+    props: {
+      field: Object,
+      apiParam: Object,
+      documentHeight: {
+        String,
+        default: 'auto',
+      },
+      documentWidth: {
+        String,
+        default: 'auto',
+      },
+      topHeight: {
+        type: Number,
+        default: -1
+      },
+    },
+    data() {
+      return {
+        center: {lng: 0, lat: 0},// 定位位置        
+        zoom: 3,// 地图放大等级
+        flagShowZoom:false,//是否显示缩放控件
+        mapHeight:100,
+      };
+    },
+    methods: {
+      handler ({BMap, map}) {
+        var self=this;
+        // 经度
+        this.center.lng = 116.404
+        // 纬度
+        this.center.lat = 39.915
+        // 地图放大等级
+        this.zoom = 15
+
+        if(this.field && this.field.dialogHeight){
+          this.mapHeight=this.field.dialogHeight;
+        }
+        else if(this.topHeight>-1){
+          this.mapHeight=document.documentElement.clientHeight - this.topHeight;
+        }
+
+        if(this.apiParam){
+          if(this.apiParam.zoom){
+            this.zoom=Number(this.apiParam.zoom);
+          }
+          if(this.apiParam.flagShowZoom && this.apiParam.flagShowZoom=='1'){
+            this.flagShowZoom=true;
+          }
+          if(this.apiParam.address && this.apiParam.city){
+            var myGeo = new BMap.Geocoder();
+            myGeo.getPoint(this.apiParam.address, function(point){
+                if(point){
+                  self.center=point;
+                  map.addOverlay(new BMap.Marker(point, {title:self.apiParam.address}));
+                  map.addOverlay(new BMap.Label(self.apiParam.address, {position: point,offset: new BMap.Size(-25, 5)}));
+                }
+                else{
+                  alert('您选择的地址没有解析到结果！');
+                }
+            },this.apiParam.city)
+          }
+          else if(this.apiParam.city){
+            this.center=this.apiParam.city;
+          }
+        }
+
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>

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

@@ -4,9 +4,11 @@
       <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>
+          <component v-else class="list-field max-list-field" v-bind="col.listBind" :is="col.is" :vmodel="col" :api="model.optionApi" 
+          @click="clickHandler(col)" @change="changeHandler(col,$event)"></component>
         </template>
-        <component v-for="(col, index) in model.btnScreen" :key="index" :is="col.is" :vmodel="col" :api="model.optionApi" @click="clickHandler(col)"></component>
+        <component v-for="(col, index) in model.btnScreen" :key="index" :is="col.is" :vmodel="col" :api="model.optionApi" 
+        @click="clickHandler(col)" @change="changeHandler(col,$event)"></component>
       </div>
       <div class="shortcutFollow max-shortcutFollow" style="padding-left: 20px;" v-if="model.shortcutForm">
         <ct-form :source="model.shortcutForm.code1" @submit="saveShortcut"></ct-form>
@@ -186,6 +188,30 @@
       LoadLayout() {
         this.isLayout = true;
       },
+      changeHandler(field) {
+        var self = this;
+        if (typeof field.change !== 'undefined') {
+          // if (typeof this.model.scripts !== 'undefined') {
+          //   this.model.scripts.formData.setExcuteListData(this.model.fields);
+          // }
+          // this.model.scripts.$fd = field.id;
+          // this.$common.excute.call(this.model.scripts, field.change);
+        }
+
+        self.model.isChanged = true;
+        self.model.hiddenHandle(field);
+        // self.model.requiredHandle(field);
+        //self.model.validMrf(field);
+
+        // if (field.onAfterChanged && field.type !== 4) {
+        //   var router = self.model.actionRouters.find((v) => {
+        //     return v.id === field.onAfterChanged;
+        //   });
+        //   self.clickHandler(router);
+        // }
+
+        self.$forceUpdate();
+      },
     }
   }
 </script>

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

@@ -867,7 +867,46 @@ export default {
         //若不是客户端方法，则直接访问接口
         if (!field.isClientFuntion) {
           // 外部框架tab页打开
-          if (field.isFormPageInTab) {
+          if(field.isTabInSystem){
+            if(field.isOpenBaiduMap){
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabBaiduMap(submitData,field.pageTitle || field.label);
+            }
+          }
+          else if(field.isTabInBrowse){
+            
+          }
+          else if(field.isLayerInSystem){
+            if(field.isOpenBaiduMap){
+              var dialogOption = {
+                title: field.pageTitle,
+                pane: self.$common.getParentPane(self),
+                content: [
+                  {
+                    component: "ct-mapBaidu",
+                    attrs: {
+                      field: field,
+                      apiParam: field.getActionPara(submitData).para,
+                      width: field.dialogWidth + "px",
+                      height: field.dialogHeight + "px",
+                    },
+                    on: {
+                      submit(ev) {
+                        if (callBack) {
+                          callBack(field);
+                        }
+                        self.$common.closeDialog(dialogOption.dialog);
+                      },
+                      closeDialog(ev) {                      
+                      }
+                    },
+                  },
+                ],
+              };
+              self.$common.openDialog(dialogOption);
+            }
+          }
+          else if (field.isFormPageInTab) {
             submitData = field.getActionPara(submitData).para;
             if (field.pageStyle) {
               submitData.pageStyle = field.pageStyle;
@@ -1237,7 +1276,46 @@ export default {
         //若不是客户端方法，则直接访问接口
         if (!field.isClientFuntion) {
           // 外部框架tab页打开
-          if (field.isFormPageInTab) {
+          if(field.isTabInSystem){
+            if(field.isOpenBaiduMap){
+              submitData = field.getActionPara(submitData).para;
+              self.$common.getDataDrivenOpts().handler.openTabBaiduMap(submitData,field.pageTitle || field.label);
+            }
+          }
+          else if(field.isTabInBrowse){
+            
+          }
+          else if(field.isLayerInSystem){
+            if(field.isOpenBaiduMap){
+              var dialogOption = {
+                title: field.pageTitle,
+                pane: self.$common.getParentPane(self),
+                content: [
+                  {
+                    component: "ct-mapBaidu",
+                    attrs: {
+                      field: field,
+                      apiParam: field.getActionPara(submitData).para,
+                      width: field.dialogWidth + "px",
+                      height: field.dialogHeight + "px",
+                    },
+                    on: {
+                      submit(ev) {
+                        if (callBack) {
+                          callBack(field);
+                        }
+                        self.$common.closeDialog(dialogOption.dialog);
+                      },
+                      closeDialog(ev) {                      
+                      }
+                    },
+                  },
+                ],
+              };
+              self.$common.openDialog(dialogOption);
+            }
+          }
+          else if (field.isFormPageInTab) {
             submitData = field.getActionPara(submitData).para;
             if (field.pageStyle) {
               submitData.pageStyle = field.pageStyle;

package/src/centaline/index.js

@@ -1,6 +1,7 @@
 const paths = require('../../build/centaline/centaline.path').default;
 //import './css/common.css'
 import babelpolyfill from 'babel-polyfill'
+import BaiduMap from 'vue-baidu-map'
 
 let defaultInstallOpt = {
   baseUrl: '',
@@ -37,6 +38,10 @@ const centaline = {
       var plug = require("./" + plugName + "/index.js").default;
       Vue.use(plug);
     }
+    
+    Vue.use(BaiduMap, {
+      ak: 'twUFDRiSaRpMp9V4ALun9w52QSiYUGE9'
+    })
 
     opts.handler = Object.assign(defaultInstallOpt.handler, opts.handler)
     const option = Object.assign(defaultInstallOpt, opts)

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

@@ -23,6 +23,7 @@ const Detail = function (source, para, callBack) {
       _matchCustomerApiRouter: null,//匹配客户
       _routerForQRCode: null,//二维码
       _dutyHistoryApiRouter: null,//查看楼主历史
+      _actionRouterMap: null,//地图
       QRCode:"",
       detailHeight: 750,
       midlWidth: 1200,
@@ -379,6 +380,20 @@ const Detail = function (source, para, callBack) {
           return rtn._dutyHistoryApiRouter;
         }
       },
+      get actionRouterMap() {
+        if (rtn._actionRouterMap !== null) {
+          return rtn._actionRouterMap;
+        }
+        else {
+          if (data.mapApiRouter) {
+            var router = Router(data.mapApiRouter);
+            router.is = "ct-btn";
+            router.attrs = { size: "mini" }
+            rtn._actionRouterMap = router;
+          }
+          return rtn._actionRouterMap;
+        }
+      },
       get tags1() {
         return data.tags1;
       },