centaline-data-driven 1.6.16 → 1.6.17

package/build/centaline/centaline.path.js

@@ -67,6 +67,7 @@ const paths = {
     "dynamicImage": "./src/centaline/dynamicImage/index.js", //图片
     "dynamicAppContainer": "./src/centaline/dynamicAppContainer/index.js", //
     "dynamicSteps": "./src/centaline/dynamicSteps/index.js", //步骤控件
+    "dynamicLocation": "./src/centaline/dynamicLocation/index.js", //经纬度获取控件
   },
   "plugs": {
     "api": "./src/centaline/api/index.js", //调用API插件

package/package.json

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

package/release-log.md

@@ -1,3 +1,15 @@
+# v1.6.17
+2024-08-14
+新增
+
+经纬度获取控件
+
+优化
+
+查询条件支持onChanged事件
+
+附件浏览支持之定义路由跳转
+
 # v1.6.16
 2024-07-15
 

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/saleconfigurationmanagement/personnelcommissionallocationmethod/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
+    <ct-form :api="'/estatemanage/estate/getEstateInfo'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>

package/src/SearchList.vue

@@ -31,9 +31,10 @@
 
     <!-- CCES -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist> -->
-    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/contractmanage/ContractList/getLayoutOfSearch'"  :searchDataApi="'/contractmanage/ContractList/getList'"></ct-searchlist> -->
-    <ct-searchlist :apiParam="para" :searchConditionApi="'/sunexpensemanage/sunexpenserecordlist/getLayoutOfSearch'"  :searchDataApi="'/sunexpensemanage/sunexpenserecordlist/getList'"></ct-searchlist>
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/contractmanage/ContractList/getLayoutOfSearch'"  :searchDataApi="'/contractmanage/ContractList/getList'"></ct-searchlist>
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/sunexpensemanage/sunexpenserecordlist/getLayoutOfSearch'"  :searchDataApi="'/sunexpensemanage/sunexpenserecordlist/getList'"></ct-searchlist> -->
     <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/ProjectCustomerList/getLayoutOfSearch'"  :searchDataApi="'/customermanage/ProjectCustomerList/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/workwxmanage/WorkWXApplicationList/getLayoutOfSearch'"  :searchDataApi="'/workwxmanage/WorkWXApplicationList/getList'"></ct-searchlist> -->
     <!-- CCES -->
 
     <!-- <ct-searchlist :apiParam="para"

package/src/centaline/css/common.css

@@ -155,6 +155,20 @@ html {
  .ct-iti .el-input__inner,.ct-text .el-input__inner,.ct-so .ct-input_inner{
   border: 1px solid var(--bagGray);
  }
+ .ct-location .el-location-input{
+  border: 1px solid var(--bagGray);
+  line-height: 24px;
+  padding-left: 5px;
+  color: var(--centalineBlue);
+  border-radius: 6px !important;
+  font-size: inherit;
+ }
+ .ct-location .el-location-input:hover{
+  border-color: var(--centalineBlue);
+ }
+ .ct-location .el-location-input:focus{
+  outline:0;
+ }
  .ct-dialog_wrapper {
    /*position: absolute;*/
    position: fixed;

package/src/centaline/dynamicAppContainer/src/dynamicAppContainer.vue

@@ -54,8 +54,7 @@ export default {
         }
       });
     },
-    load(data) { 
-      console.log('data',data);
+    load(data) {
       this.data = data;
       this.model = data;
       this.model.self = this;

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

@@ -175,14 +175,12 @@
         <span class="Public-classification" style="color: #fff;border-radius: 0px 0px 4px 4px;text-align: left;line-height: 26px;display: inline-flex;overflow: hidden;"  v-if="(model.lock) || model.paramName">
           <!--锁定-->
           <span v-if="model.lock" class="el-dropdown-link">
-            <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{ model.mediaLabe.mediaLabelName
-              }}</span>
+            <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{ model.mediaLabe.mediaLabelName}}</span>
           </span>
           <!--复杂分类-->
           <span v-else-if="model.isComplexClassify" class="el-dropdown-link"
             @click.stop="classifyFormClickHandle(model.mediaLabe)">
-            <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{ model.mediaLabe.mediaLabelName
-              }}</span>
+            <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{ model.mediaLabe.mediaLabelName}}</span>
             <i class="el-icon-arrow-down el-icon--right"></i>
           </span>
           <!--简单分类-->
@@ -191,8 +189,7 @@
 
 
             <span class="el-dropdown-link" @click.stop="classifyClickHandle">
-              <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{ model.mediaLabe.mediaLabelName
-                }}</span>
+              <span style="width: 80px; height: 26px; display: inline-flex;overflow: hidden;">&nbsp;{{ model.mediaLabe.mediaLabelName}}</span>
               <i class="el-icon-arrow-down el-icon--right" style="color: #fff;"></i>
             </span>
             <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
@@ -387,7 +384,17 @@ export default {
       var index = MediaAlbum[0].medias.findIndex(
         (v) => (v === file.source)
       );
-      self.$common.viewerfile((this.model.label || "预览媒体"), MediaAlbum, 0, index, self.model.mediaViewPageType);
+      
+      if(self.model.moreActionRouter){
+        let submitData = {};
+        submitData = self.model.form.self.getFileData(self.model.moreActionRouter);
+        submitData.index=index;
+        submitData = self.model.moreActionRouter.getActionPara(submitData).para;
+        self.$emit('tableButtonClick',self.model.moreActionRouter,submitData);
+      }
+      else{
+        self.$common.viewerfile((this.model.label || "预览媒体"), MediaAlbum, 0, index, self.model.mediaViewPageType);
+      }
     },
     handleEdit(file) {
       var self = this;

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

@@ -18,6 +18,7 @@
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                        @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
                        @popupSearchList="popupSearchListHandler" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
+                       @popupLocation="popupLocationHandler"
                        @tableButtonClick="clickHandler"></component>
               </el-col>
             </template>
@@ -28,6 +29,7 @@
                         @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                         @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
                         @popupSearchList="popupSearchListHandler" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
+                        @popupLocation="popupLocationHandler"
                         @tableButtonClick="clickHandler"></component>
               </el-col>
             </template>
@@ -48,6 +50,7 @@
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                            @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
                            @popupSearchList="popupSearchListHandler" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
+                           @popupLocation="popupLocationHandler"
                            @tableButtonClick="clickHandler"></component>
                   </el-col>
                 </template>
@@ -57,7 +60,8 @@
                             :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
                             @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                             @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
-                            @popupSearchList="popupSearchListHandler" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
+                            @popupSearchList="popupSearchListHandler" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"                            
+                            @popupLocation="popupLocationHandler"
                             @tableButtonClick="clickHandler"></component>
                   </el-col>
                 </template>
@@ -82,7 +86,8 @@
                             :fileData="getFileData(col)" :from="'form'" :documentHeight="documentHeight" :documentWidth="documentWidth"
                             @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                             @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
-                            @popupSearchList="popupSearchListHandler" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
+                            @popupSearchList="popupSearchListHandler" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"                            
+                            @popupLocation="popupLocationHandler"
                             @tableButtonClick="clickHandler"></component>
                   </el-col>
                 </template>
@@ -93,6 +98,7 @@
                             @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                             @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
                             @popupSearchList="popupSearchListHandler" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
+                            @popupLocation="popupLocationHandler"
                             @tableButtonClick="clickHandler"></component>
                   </el-col>
                 </template>
@@ -112,6 +118,7 @@
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                        @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
                        @popupSearchList="popupSearchListHandler" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
+                       @popupLocation="popupLocationHandler"
                        @tableButtonClick="clickHandler"></component>
               </el-col>
             </template>
@@ -122,6 +129,7 @@
                         @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                         @input="inputHandler(col,$event)" @importComplete="importComplete" @blur="blurHandler(col,$event)"
                         @popupSearchList="popupSearchListHandler" @flagNotificationParentAfterContentChanged="flagNotificationParentAfterContentChanged"
+                        @popupLocation="popupLocationHandler"
                         @tableButtonClick="clickHandler"></component>
               </el-col>
             </template>
@@ -1269,6 +1277,43 @@
         };
         this.$common.openDialog(dialogOption);
       },
+      popupLocationHandler(field, router, callBack) {
+        var self = this;
+        var submitData = self.getFileData(router);
+        var tempFormData = self.model.getFormObj();
+        submitData.lng=field.code1;
+        submitData.lat=field.code2;
+        submitData = router.getActionPara(submitData).para;
+
+        var dialogOption = {
+          title: router.pageTitle || router.label,
+          pane: self.$common.getParentPane(self),
+          content: [{
+            component: "ct-mapBaidu",
+            attrs: {
+              field: router,
+              apiParam: submitData,
+              width: router.dialogWidth + "px",
+              height: router.dialogHeight + "px",
+              documentHeight: self.documentHeight,
+              documentWidth: self.documentWidth,
+              openType : 'Location'
+            },
+            on: {
+              submit(ev) {
+                if (callBack) {
+                  callBack(ev);
+                }
+                self.$common.closeDialog(dialogOption.dialog);
+              },
+              closeDialog(ev) {     
+                self.$common.closeDialog(dialogOption.dialog);                 
+              }
+            }
+          }]
+        };
+        this.$common.openDialog(dialogOption);
+      },
       validExcute() {
         var self = this;
         var rtnBool = true;

package/src/centaline/dynamicLocation/index.js

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

package/src/centaline/dynamicLocation/src/dynamicLocation.vue

@@ -0,0 +1,69 @@
+<template>
+  <div class="field-top">
+    <div v-if="model !== null" class="ct-location" style="width:100%;display:flex">
+      <div class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix showLabel lableinput text-justify">
+        <div v-if="model.showLabel && model.label" class="el-input-group__prepend">
+          <div slot="prepend" class="label-ellipsis" :class="[model.labelClass]" :title="model.label">
+            {{model.label}}
+          </div>
+        </div>
+        <div style="display:inline-flex;padding-left:0px;" v-bind="model.attrs" :class="model.locked ? 'ct-is-disabled' : ''">
+          <input style="text-align:left;width:100%" class="el-location-input hoverColor" :placeholder="model.attrs.placeholder1"
+                 v-model="model.value" @change="changeHandler($event)"/>
+          <input style="text-align:left;width:100%;margin-left:5px;" class="el-location-input hoverColor" :placeholder="model.attrs.placeholder2"
+                v-model="model.value1" @change="changeHandler($event);"/>
+        </div> 
+        <div v-if="model.moreActionRouter" style="display: inline-block;margin-left: 5px;">
+          <img v-if="model.moreActionRouter.imgUrl" class="ct-tablecurrencyImg ct-tablecurrencyItem" 
+            :src="model.moreActionRouter.imgUrl" :title="model.moreActionRouter.label"  @click="popupLocationHandler($event)"/>
+          <el-button v-else  size="mini" type="primary" class="h26" @click="popupLocationHandler($event)">
+            {{model.moreActionRouter.label}}
+          </el-button>
+        </div>
+      </div>      
+      <transition name="el-fade-in">
+        <span v-show="!valid" class="errorMessage">
+          {{validMessage}}
+        </span>
+      </transition>
+    </div>
+  </div>
+</template>
+<script>
+  import dynamicElement from '../../mixins/dynamicElement';
+  export default {
+    name: 'ct-Location',
+    mixins: [dynamicElement],
+    props: {
+      vmodel: Object
+    },
+    data() {
+      return {
+	    }
+    },
+    created() {
+      if (typeof this.vmodel === 'undefined') {
+        this.model = this.loaderObj.Location(this.source);
+      }
+      else {
+        this.model = this.vmodel;
+      }
+      this.model.self=this;
+    },
+	  methods: {
+      popupLocationHandler: function (e) {
+        var self = this;
+        self.showDrop=false;
+        self.$emit('popupLocation', self.model, self.model.moreActionRouter, (data) => {
+          if(data){
+            self.model.value=data.lng;
+            self.model.value1=data.lat;
+          }
+        });
+      },
+	  }
+}
+</script>
+<style scoped>
+
+</style>

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

@@ -1,7 +1,21 @@
 <template>
   <div>
-    <baidu-map :center="center" :zoom="zoom" @ready="handler" :style="{height:mapHeight + 'px'}">
+    <div v-if="openType=='Location'" style="text-align: right;padding-right:10px;">
+      <el-button size="mini" type="primary" class="h26" @click="closeHandler($event)">
+        取消
+      </el-button>
+      <el-button size="mini" type="primary" class="h26" @click="submitHandler($event)">
+        确定
+      </el-button>
+    </div>
+    <baidu-map :center="center" :zoom="zoom" 
+    :scroll-wheel-zoom="scroll_wheel_zoom" :double-click-zoom="double_click_zoom"
+    @ready="handler" @dragend="dragendHandler" @tilesloaded="tilesloadedHandler"
+    :style="{height:mapHeight + 'px'}">
       <bm-navigation v-if="flagShowZoom" anchor="BMAP_ANCHOR_TOP_RIGHT"></bm-navigation>
+      <bm-marker :position="markerPosition" :dragging="markerDragging" :animation="markerAnimation" @dragend="markerDragendHandler">
+        <bm-label :content="markerLabel" :offset="{width: -35, height: 30}"/>
+      </bm-marker>
     </baidu-map>
   </div>
 </template>
@@ -24,13 +38,24 @@
         type: Number,
         default: -1
       },
+      openType: {
+        String,
+        default: 'Browse',
+      },
     },
     data() {
       return {
-        center: {lng: 0, lat: 0},// 定位位置        
+        center: {lng: 0, lat: 0},// 定位位置
         zoom: 3,// 地图放大等级
         flagShowZoom:false,//是否显示缩放控件
         mapHeight:100,
+        scroll_wheel_zoom:false,
+        double_click_zoom:false,
+        markerDragging:false,
+        markerPosition: {lng: 0, lat: 0},// 定位位置
+        markerLabel:"",
+        markerAnimation:'',
+        rtnPoint:null,
       };
     },
     methods: {
@@ -50,6 +75,13 @@
           this.mapHeight=document.documentElement.clientHeight - this.topHeight;
         }
 
+        if(this.openType=='Location'){
+          this.flagShowZoom=true;
+          this.markerDragging=true;
+          this.mapHeight=this.mapHeight-28;
+          this.markerAnimation='BMAP_ANIMATION_BOUNCE';
+        }
+
         if(this.apiParam){
           if(this.apiParam.zoom){
             this.zoom=Number(this.apiParam.zoom);
@@ -57,13 +89,25 @@
           if(this.apiParam.flagShowZoom && this.apiParam.flagShowZoom=='1'){
             this.flagShowZoom=true;
           }
-          if(this.apiParam.address && this.apiParam.city){
-            var myGeo = new BMap.Geocoder();
+          if(this.apiParam.address){
+            this.markerLabel=this.apiParam.address;
+          }
+          
+          if(this.apiParam.lng && this.apiParam.lat){          
+            setTimeout(() => {
+              //偏移处理
+              self.center.lng = self.apiParam.lng;
+              self.center.lat = self.apiParam.lat;
+              self.markerPosition.lng = self.apiParam.lng;
+              self.markerPosition.lat = self.apiParam.lat;
+            },500)            
+          }
+          else if(this.apiParam.address && this.apiParam.city){
+            let 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)}));
+                  self.markerPosition=point;
                 }
                 else{
                   alert('您选择的地址没有解析到结果！');
@@ -74,8 +118,20 @@
             this.center=this.apiParam.city;
           }
         }
-
-      }
+      },
+      dragendHandler(event){
+      },
+      tilesloadedHandler(event){
+      },
+      markerDragendHandler(event){
+        this.rtnPoint=event.point;
+      },
+      submitHandler(){
+        this.$emit('submit',this.rtnPoint || this.markerPosition);
+      },
+      closeHandler(){
+        this.$emit('closeDialog');
+      },
     }
   }
 </script>

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

@@ -723,11 +723,13 @@ import dynamicElement from '../../mixins/dynamicElement';
         self.loadScreen();
         self.loadHighScreen();
         self.setScreenShow();
-        if (self.model.onload) {
+        if(self.model.scripts){
           self.model.scripts.formData = self.model.formData;
           self.model.scripts.formData.form = self.model;
           self.model.scripts.formData.excuteData = self.model.screen;
           self.model.scripts.formData.fieldsDic = self.model.screenDic;
+        }
+        if (self.model.onload) {
           self.$common.excute.call(self.model.scripts, self.model.onload);
         }
         self.isLoading = false;
@@ -763,8 +765,9 @@ import dynamicElement from '../../mixins/dynamicElement';
           // 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);
+          
+          this.model.scripts.$fd = field.id;
+          this.$common.excute.call(this.model.scripts, field.change);
         }
 
         this.model.isChanged = true;
@@ -772,12 +775,12 @@ import dynamicElement from '../../mixins/dynamicElement';
         // 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);
-        // }
+        if (field.onAfterChanged && field.type !== 4) {
+          var router = self.model.actionRouters.find((v) => {
+            return v.id === field.onAfterChanged;
+          });
+          self.clickHandlerfield(router);
+        }
 
         self.$forceUpdate();
       },

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

@@ -2465,7 +2465,6 @@ export default {
     // 判断是否包括样式
     hasClass(el, className) {
       let reg = new RegExp("(^|\\s)" + className + "($|\\s)");
-      console.log(reg.test(el.className));
       return reg.test(el.className);
     },
     // 添加样式

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

@@ -5,11 +5,12 @@ import Vue from 'vue';
 import common from '../../../common';
 import valid from '../../../validate/index';
 //元数据、附件列表元数据、对应router、下拉框数据api
-const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl) {
+const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl,moreActionRouter) {
   var self = this;
   var init = function (data) {
     var rtn = {
       QRCodeStatusAction:'',
+      moreActionRouter: moreActionRouter,
       get min2() {
         return source.minValue2;
       },
@@ -397,11 +398,10 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
         }
         rtn.fileList.push(awaitfile);
       },
-      jsSetFile(data)
-      {
+      jsSetFile(data){
         var photos = JSON.parse(data);
-      photos.forEach((v) => {
-        if(rtn.fileList.length<parseInt(rtn.max || 999)){
+        photos.forEach((v) => {
+          if(rtn.fileList.length<parseInt(rtn.max || 999)){
             v.videoCoverFileName=v.videoCoverFileName||null;
             v.thumbnailUrl=v.thumbnailUrl||'';
             v.mediaSourceTypeID=v.mediaSourceTypeID||null;
@@ -420,12 +420,11 @@ const box = function (source, fileSourceList, router, optionApi,videoPlayIconUrl
             FileData.width=v.width;
             FileData.height=v.height;
             rtn.fileList.push(FileData);
-            rtn.self.handleChange();
-            
-        }
-      });
-    },
-       setByPieces(res, Progress, file) {
+            rtn.self.handleChange();            
+          }
+        });
+      },
+      setByPieces(res, Progress, file) {
         if (res.rtnCode === Enum.ReturnCode.Successful) {
           //下面的方式绑定，会有一些问题 todo 不强与页面关联
           var data = {

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

@@ -0,0 +1,11 @@
+import base from '../../index';
+import Base from './Base';
+const Location = function (source,moreActionRouter) {
+  var rtn = {
+    moreActionRouter: moreActionRouter,
+  };
+  rtn = base.copy(Base(source), rtn);
+  return rtn;
+};
+
+export default Location;

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

@@ -129,8 +129,8 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
           return rtn._scripts;
         }
         else {
-          if (typeof source.scripts !== 'undefined') {
-            rtn._scripts = base.common.eval(source.scripts);
+          if (typeof source.content.scripts !== 'undefined') {
+            rtn._scripts = base.common.eval(source.content.scripts);
             return rtn._scripts;
           }
           else {

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -286,6 +286,11 @@ const Enum = {
     /// </summary>
     Steps: 57,
 
+    /// <summary>
+    ///  标签集合控件,每个标签是一个 ModelListItem 对象，可以拖动改变每个标签的顺序，locked 状态下不能拖动
+    /// </summary>
+    Tags: 58,
+
   },
 
   //返回状态码

package/src/centaline/loader/src/ctl/lib/LibFunction.js

@@ -40,6 +40,7 @@ import Contact from '../Contact';
 import LH from '../LH';
 import Image from '../Image';
 import Steps from '../Steps';
+import Location from '../Location';
 
 const LibFunction = {
   install(Vue) {},
@@ -315,7 +316,8 @@ const LibFunction = {
             }
           })
         }
-        item = File(field, files, router, source.parameterAction,source.videoPlayIconUrl);
+        moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
+        item = File(field, files, router, source.parameterAction,source.videoPlayIconUrl,moreActionRouter);
         item.is = 'ct-file';
         break;
       case Enum.ControlType.PhotoSelect: //图片选择
@@ -394,6 +396,11 @@ const LibFunction = {
         item = Steps(field);
         item.is = 'ct-Steps';
         break;
+      case Enum.ControlType.Location: //位置获取控件
+        moreActionRouter = LibFunction.getRouter(source.actionRouters, field.moreActionRouterKey);
+        item = Location(field,moreActionRouter);
+        item.is = 'ct-Location';
+        break;
       default:
         item = L(field);
         item.is = 'ct-labelText';
@@ -434,7 +441,7 @@ const LibFunction = {
           return field.singleLine === true || field.controlType === Enum.ControlType.GroupSplitLine || field.controlType === Enum.ControlType.Repeat
             || field.controlType === Enum.ControlType.List || field.controlType === Enum.ControlType.File 
             || field.controlType === Enum.ControlType.SliceUpload || field.controlType === Enum.ControlType.PhoneDial 
-            || field.controlType === Enum.ControlType.Steps 
+            || field.controlType === Enum.ControlType.Steps || field.controlType === Enum.ControlType.Location 
             || field.controlType === Enum.ControlType.SearchPage;
         },
         showLabel: showLabel

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

@@ -48,6 +48,7 @@ const loader = {
   Image: require("./ctl/Image.js").default,
   AppContainer: require("./ctl/AppContainer.js").default,
   Steps: require("./ctl/Steps.js").default,
+  Location: require("./ctl/Location.js").default,
 };
 
 export default loader;

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

@@ -41,7 +41,9 @@
     props: {
       router: Object,
       rowData: Object,
-      colValue: String,
+      colValue: {
+        type: [String, Number], // 现在 colValue 可以是对象或数字
+      },
       columnName: String,
       rowindex: Number,
       isOperationalColumn: {