centaline-data-driven 1.6.17 → 1.6.19

package/package.json

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

package/release-log.md

@@ -1,3 +1,32 @@
+ 
+# v1.6.19
+2024-09-05
+
+优化
+
+表格没有返回rows添加判断
+
+文件预览组件，下载增加参数 download=1 
+
+表单列表数据非新增数据默认传flagNew=false
+
+表单列表行操作位置改为api控制，默认最后一列
+
+表单页面提示信息，显示在页面顶部并且悬停，支持html
+
+js给表单列表赋值超过页面高度，保存按钮没有浮动处理
+
+预览文件组件，图片拖动位置
+
+# v1.6.18
+2024-08-16
+
+优化
+
+经纬度获取控件优化验证
+
+表单列表锁定样式调整为不显示按钮
+
 # v1.6.17
 2024-08-14
 新增

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="'/estatemanage/estate/getEstateInfo'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
+    <ct-form :api="'/callcustomer/callcustpoolimport/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "actionType":2
+          "type":"top"
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -31,10 +31,13 @@
 
     <!-- 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="'/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> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/UrgentResponsiblePersonList/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/UrgentResponsiblePersonList/getList'"></ct-searchlist> -->
+    <!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customerquery/publiccustcalltaskreferrallist/getLayoutOfSearch'"  :searchDataApi="'/customerquery/publiccustcalltaskreferrallist/getList'"></ct-searchlist> -->
+    <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'"  :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist>
     <!-- CCES -->
 
     <!-- <ct-searchlist :apiParam="para"
@@ -103,6 +106,10 @@
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PropertyVRRealLookBalanceList/getLayoutOfSearchForOFI'" :searchDataApi="'/PropertyVRRealLookBalanceList/getListOfSearchModel'"></ct-searchlist> -->
 
 
+    <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
+:searchDataApi="'/propertyPublishList/getListOfSearchModel'"
+:searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist> -->
+
 
     <!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/cache/getLayoutOfSearchForCache'" :searchDataApi="'/cache/getListOfSearchModelForCache'"></ct-searchlist> -->
     

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

@@ -1,6 +1,10 @@
 <template>
   <div v-loading="loading" :style="{width:pageWidth?pageWidth+'px':'100%',margin:'auto','min-height': minHeight}">
     <div v-if="model !== null && !loading" class="ct-form" :class="{'domDisabled':model.pageDisabled}" :key="formKey">
+      <div v-if="model.tip" class="tip-absolute" :style="{width:(tipWidth-20)+'px'}">
+        <span v-html="model.tip"></span>
+      </div>
+
       <!--可根据场景判断显示el-card还是el-main-->
       <component :is="model.showTitle?'el-main':'el-card'">
         <div slot="header" class="clearfix" v-if="typeof model.title !== 'undefined' && model.flagShowTitle">
@@ -213,6 +217,7 @@
         independentItem: [],//最后一个独立分组的行列布局
         minHeight: 'auto',
         downloadUrl:"",
+        tipWidth:0,
       };
     },
     deactivated(){
@@ -220,18 +225,24 @@
     },
     mounted() {
       this.init();
-      this.setCss();
+      this.setCss();      
+      this.$nextTick(() => {
+        this.tipWidth=this.$el.clientWidth;
+      })
     },
     updated() {
-      this.$nextTick(() => {
-        let parentDom=this.$el.parentElement;
-        if (parentDom.scrollHeight > parentDom.clientHeight
-          && this.model && (!this.model.isHorizontalLayout || this.flagScroll)) {
-          this.isScroll = true;
-        }
-      });
+      this.computeScroll();
     },
     methods: {
+      computeScroll(){
+        this.$nextTick(() => {
+          let parentDom=this.$el.parentElement;
+          if (parentDom.scrollHeight > parentDom.clientHeight
+          && this.model && (!this.model.isHorizontalLayout || this.flagScroll)) {
+            this.isScroll = true;
+          }
+        });
+      },
       init() {
         var self = this;
         //初始化
@@ -1497,7 +1508,6 @@
     /* bottom: 6px; */
     bottom: 0;
     left: 0;
-    right: 0;
     border-radius: 0 0 4px 4px;
     position: absolute;
     line-height: 34px;
@@ -1506,4 +1516,17 @@
     margin: auto;
     box-shadow: 0 2px 20px 0 rgb(0 0 0 / 10%);
   }
+  
+  .tip-absolute {
+    z-index: 100;
+    top: 10;
+    left: 10;
+    position: absolute;
+    line-height: 24px;
+    background-color:#ffe7cc;
+    color:#EC3D3D;
+    border-radius: 5px;
+    padding: 8px;
+    font-size: 12px;
+  }
 </style>

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

@@ -1,30 +1,57 @@
 <template>
-  <div class="ct-form-list" v-focus="foucus" :class="{'tableDisabled':model.tableDisabled}">
+  <div class="ct-form-list" v-focus="foucus">
+    <!-- :class="{'tableDisabled':model.tableDisabled}" -->
     <div v-if="model.title" class="list-title">
       <h5>{{model.title}}</h5>
     </div>
     <div v-else-if="model.create || (model.selectRouter && model.selectRouter.id) || model.toolButtonsShow.length>0" class="list-title"></div>
     <div class="list-button">
-      <ul>
-        <li v-for="(v,i) in model.toolButtonsShow" >
-          <component :is="v.is" :vmodel="v" :parentModel="model" @click="toolButtonsClick" @importComplete="importComplete" @change="toolButtonsChangeHandler(v,$event)"></component>
-        </li>
-        <li v-if="model.selectRouter!==null">
-          <component :is="model.selectRouter.is" :vmodel="model.selectRouter" @click="popupSearchListHandle" ></component>
-        </li>
-        <li v-if="model.create" >
-          <el-button :disabled="model.disabled" type="success" class="max-btn-add" style="width: auto;" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
-            {{model.createText}}
-          </el-button>
-        </li>
-      </ul>
+      <template v-if="!model.tableDisabled">
+        <ul>
+          <li v-for="(v,i) in model.toolButtonsShow" >
+            <component :is="v.is" :vmodel="v" :parentModel="model" @click="toolButtonsClick" @importComplete="importComplete" @change="toolButtonsChangeHandler(v,$event)"></component>
+          </li>
+          <li v-if="model.selectRouter!==null">
+            <component :is="model.selectRouter.is" :vmodel="model.selectRouter" @click="popupSearchListHandle" ></component>
+          </li>
+          <li v-if="model.create" >
+            <el-button :disabled="model.disabled" type="success" class="max-btn-add" style="width: auto;" size="mini" icon="el-icon-circle-plus-outline" @click="addRow">
+              {{model.createText}}
+            </el-button>
+          </li>
+        </ul>
+      </template>
     </div>
 
     <div id="listTable">
       <el-row>
         <el-col :span="24">
           <el-table size="mini" class="max-table--border" :data="model.tableData" border 
-            style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
+            style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">            
+            <!--操作列-->
+            <template v-if="model.rowActionRoutersAlign === 1">
+              <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.length > 0)" :fixed="fixedButtons" :width="'100%'" :render-header="renderHeader" :min-width="tableColumnWith">
+                <template slot-scope="scope">
+                  <template v-if="!model.tableDisabled">
+                    <span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
+                      {{scope.row.isSet?'保存':"修改"}}
+                    </span>
+                    <span v-if="scope.row.delete && !scope.row.isSet" class="el-tag el-tag--danger el-tag--mini" style="cursor: pointer;" @click="deleteRow(scope.$index, scope.row.$sourceIndex)">
+                      删除
+                    </span>
+                    <span v-else-if="scope.row.isSet" class="el-tag  el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,false)">
+                      取消
+                    </span>
+                    <span v-for="(v,i) in model.buttons" 
+                      v-if="!scope.row.isSet && v.show && ( !v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1 )" 
+                      class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="buttonClick(scope.row, v)">
+                      {{v.label}}
+                    </span>
+                </template>
+                </template>
+              </el-table-column>
+            </template>
+
              <!--数据列-->
             <el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" :width="v.width" :fixed="model.frozenColumns.includes(v.id)" v-if="v.show !== false && v.type!==13" :render-header="renderHeader" :min-width="tableColumnWith">
               <template slot="header" slot-scope="scope">
@@ -52,24 +79,28 @@
             </el-table-column>
 
             <!--操作列-->
-            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.length > 0)" :fixed="fixedButtons" :width="'100%'" :render-header="renderHeader" :min-width="tableColumnWith">
-              <template slot-scope="scope">
-                <span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
-                  {{scope.row.isSet?'保存':"修改"}}
-                </span>
-                <span v-if="scope.row.delete && !scope.row.isSet" class="el-tag el-tag--danger el-tag--mini" style="cursor: pointer;" @click="deleteRow(scope.$index, scope.row.$sourceIndex)">
-                  删除
-                </span>
-                <span v-else-if="scope.row.isSet" class="el-tag  el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,false)">
-                  取消
-                </span>
-                <span v-for="(v,i) in model.buttons" 
-                  v-if="!scope.row.isSet && v.show && ( !v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1 )" 
-                  class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="buttonClick(scope.row, v)">
-                  {{v.label}}
-                </span>
-              </template>
-            </el-table-column>
+            <template v-if="model.rowActionRoutersAlign !== 1">
+              <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.length > 0)" :fixed="fixedButtons" :width="'100%'" :render-header="renderHeader" :min-width="tableColumnWith">
+                <template slot-scope="scope">
+                  <template v-if="!model.tableDisabled">
+                    <span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
+                      {{scope.row.isSet?'保存':"修改"}}
+                    </span>
+                    <span v-if="scope.row.delete && !scope.row.isSet" class="el-tag el-tag--danger el-tag--mini" style="cursor: pointer;" @click="deleteRow(scope.$index, scope.row.$sourceIndex)">
+                      删除
+                    </span>
+                    <span v-else-if="scope.row.isSet" class="el-tag  el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,false)">
+                      取消
+                    </span>
+                    <span v-for="(v,i) in model.buttons" 
+                      v-if="!scope.row.isSet && v.show && ( !v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1 )" 
+                      class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="buttonClick(scope.row, v)">
+                      {{v.label}}
+                    </span>
+                </template>
+                </template>
+              </el-table-column>
+            </template>
           </el-table>
         </el-col>
       </el-row>

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

@@ -9,9 +9,9 @@
         </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)"/>
+                 v-model="model.value" @change="changeModel($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);"/>
+                v-model="model.value1" @change="changeModel($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" 
@@ -61,6 +61,9 @@
           }
         });
       },
+      changeModel(event) {
+        this.changeHandler(event);
+      }
 	  }
 }
 </script>

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

@@ -349,15 +349,18 @@ export default {
         thHeight = document.getElementById("thHeight").offsetHeight;
         if (document.getElementById("theadTitle")) {
           this.theadTitleWidth = document.getElementById("theadTitle").offsetWidth;
-        } else {
+        } 
+        else {
           this.theadTitleWidth = 0
         }
-      } else {
+      } 
+      else {
         tagsViewHeight = 0;
         thHeight = -10;
         if (document.getElementById("theadTitle")) {
           this.theadTitleWidth = document.getElementById("theadTitle").offsetWidth * 0.5;
-        } else {
+        } 
+        else {
           this.theadTitleWidth = 0
         }
       }
@@ -492,11 +495,13 @@ export default {
         ev.currentTarget.canResize = true;
         if (this.model.columnWidthSaveAction) {
           this.theadTitleShow = true
-        } else {
+        } 
+        else {
           this.theadTitleShow = false
         }
 
-      } else {
+      } 
+      else {
         ev.currentTarget.style.cursor = "default";
         ev.currentTarget.canResize = false;
       }
@@ -523,7 +528,8 @@ export default {
           if (oldWidth != col.width && self.model.columnWidthSaveAction && self.model.columnWidthSaveAction.length > 0) {
             var submitData = { 'columnName': col.id, columnWidth: col.width }
             self.model.getAction(self.model.columnWidthSaveAction, submitData);
-          } else if (!self.model.columnWidthSaveAction) {
+          }
+          else if (!self.model.columnWidthSaveAction) {
             window.localStorage.setItem(self.model.title + "_" + col.id, col.width);
           }
 
@@ -2730,7 +2736,7 @@ export default {
 }
 
 .ct-searchtable .ct-search-table-tag {
-  background-color: #fdf6ec;
+  background-color: #ffe7cc;
   border-color: #faecd8;
   width: 100%;
   box-shadow: 0 2px 10px 0 rgb(0 0 0 / 10%);

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

@@ -289,10 +289,10 @@
     handDownloadUrl(url){
       let self = this;
       if (url.indexOf("?") > -1) {
-          self.downloadUrl = self.getDownloadUrl(url) + "&" + Math.random();
+          self.downloadUrl = self.getDownloadUrl(url) + "&download=1&" + Math.random();
         }
         else {
-          self.downloadUrl = self.getDownloadUrl(url) + "?" + Math.random();
+          self.downloadUrl = self.getDownloadUrl(url) + "?download=1&" + Math.random();
         }
         setTimeout(function () {
           self.downloadLoading = false;

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

@@ -39,10 +39,47 @@ export default {
   },
   mounted() {
     this.loading = true;
-    this.startDrag(
-      document.getElementById("ViewerImage"),
-      document.getElementById("ViewerImage")
-    );
+    var self = this;
+    this.$nextTick(function () { 
+         // 获取容器和图片元素 
+    var dragImg = document.getElementById('ViewerImage');
+ 
+
+    // 鼠标按下事件
+    dragImg.onmousedown = function (event) {
+        // 计算鼠标相对图片的位置 
+        self.params.currentX = event.clientX;
+        self.params.currentY = event.clientY;
+        // 监听鼠标移动和松开事件
+        document.onmousemove = function (event) {
+            // 计算图片新的位置
+
+            let nowX = event.clientX,
+                nowY = event.clientY;
+            let disX = nowX - self.params.currentX,
+                disY = nowY - self.params.currentY;
+                dragImg.style.left = parseInt( self.params.left) + disX + "px";
+                dragImg.style.top = parseInt( self.params.top) + disY + "px";
+        };
+
+      document.onmouseup = function () {
+            // 鼠标松开，移除鼠标移动和松开事件的监听
+            document.onmousemove = null;
+            document.onmouseup = null;
+            if (self.getImgCss(dragImg, "left") !== "auto") {
+              self.params.left = self.getImgCss(dragImg, "left");
+        }
+        if (self.getImgCss(dragImg, "top") !== "auto") {
+          self.params.top = self.getImgCss(dragImg, "top");
+        }
+        };
+    };
+
+    // 防止默认事件（如图片拖动默认行为）
+    dragImg.ondragstart = function () {
+        return false;
+    };
+    })
   },
    watch: {
     imgUrl(newValue, oldValue) {
@@ -81,57 +118,7 @@ export default {
         ? e.currentStyle[key]
         : document.defaultView.getComputedStyle(e, false)[key];
     },
-    startDrag(bar, target, callback) {
-      let that = this;
-      if (that.getImgCss(target, "left") !== "auto") {
-        that.params.left = that.getImgCss(target, "left");
-      }
-      if (that.getImgCss(target, "top") !== "auto") {
-        that.params.top = that.getImgCss(target, "top");
-      }
-      bar.onmousedown = function (event) {
-        that.params.flag = true;
-        if (!event) {
-          event = window.event;
-          bar.onselectstart = function () {
-            return false;
-          };
-        }
-        let e = event;
-        that.params.currentX = e.clientX;
-        that.params.currentY = e.clientY;
-      };
-      document.onmouseup = function () {
-        that.params.flag = false;
-        if (that.getImgCss(target, "left") !== "auto") {
-          that.params.left = that.getImgCss(target, "left");
-        }
-        if (that.getImgCss(target, "top") !== "auto") {
-          that.params.top = that.getImgCss(target, "top");
-        }
-      };
-      document.onmousemove = function (event) {
-        let e = event ? event : window.event;
-        if (that.params.flag) {
-          let nowX = e.clientX,
-            nowY = e.clientY;
-          let disX = nowX - that.params.currentX,
-            disY = nowY - that.params.currentY;
-          target.style.left = parseInt(that.params.left) + disX + "px";
-          target.style.top = parseInt(that.params.top) + disY + "px";
-          if (typeof callback == "function") {
-            callback(
-              (parseInt(that.params.left) || 0) + disX,
-              (parseInt(that.params.top) || 0) + disY
-            );
-          }
-          if (event.preventDefault) {
-            event.preventDefault();
-          }
-          return false;
-        }
-      };
-    },
+    
   },
 };
 </script>

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

@@ -206,7 +206,9 @@ const Base = function (source) {
         || this.type===Enum.ControlType.MultiLineLabel){
       }
       else if(this.isScreen){
-        if(this.type===Enum.ControlType.DateRange || this.type===Enum.ControlType.DateTimeRange){
+        if(this.type===Enum.ControlType.DateRange 
+          || this.type===Enum.ControlType.DateTimeRange 
+          || this.type===Enum.ControlType.Location){
           this.value = this.defaultFormat[0];
           this.value1 = this.defaultFormat[1];
         }
@@ -240,7 +242,9 @@ const Base = function (source) {
         }
       }
       else{
-        if(this.type===Enum.ControlType.DateRange || this.type===Enum.ControlType.DateTimeRange){
+        if(this.type===Enum.ControlType.DateRange 
+          || this.type===Enum.ControlType.DateTimeRange 
+          || this.type===Enum.ControlType.Location){
           this.value = '';
           this.value1 = '';
         }

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

@@ -25,6 +25,9 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
       set title(v) {
         source.title = v;
       },
+      get tip() {
+        return source.tip;
+      },
       get flagShowTitle() {
         let v=false;
         if(source.flagShowTitle)v=source.flagShowTitle;
@@ -490,6 +493,9 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
           });
           if(listData){
             listData.insertRow(rows);
+            if(this.form && this.form.self){
+              this.form.self.computeScroll();
+            }
           }
         },
         //新增或替换表格数据

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

@@ -13,6 +13,12 @@ const FormList = function (source, master) {
     get id(){
       return source.name;
     },
+    get rowActionRoutersAlign(){
+      if(source.rowActionRoutersAlign != undefined && source.rowActionRoutersAlign != null && source.rowActionRoutersAlign != ""){
+        return source.rowActionRoutersAlign;
+      }
+      return 2;
+    },
     get type() {
       return master.controlType;
     },
@@ -100,7 +106,7 @@ const FormList = function (source, master) {
           Object.assign(rtnFormObj, s.getFormObj());
         });
         rtnFormObj.flagDeleted = rtn.rows[i].deleted;
-        rtnFormObj.flagNew = rtn.rows[i].isNewFlag;
+        rtnFormObj.flagNew = rtn.rows[i].isNewFlag || false;
         rtnFormArr.push(rtnFormObj);
       }
 

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

@@ -1,10 +1,30 @@
 import base from '../../index';
 import Base from './Base';
+import valid from '../../../validate/index';
 const Location = function (source,moreActionRouter) {
   var rtn = {
     moreActionRouter: moreActionRouter,
+    getFormObj() {
+      var rtnFormObj = {};
+      Object.defineProperty(rtnFormObj, source.fieldName1, {
+        get: function () {
+          return source.code1;
+        },
+        enumerable: true,
+        configurable: true
+      });
+      Object.defineProperty(rtnFormObj, source.fieldName2, {
+        get: function () {
+          return source.code2;
+        },
+        enumerable: true,
+        configurable: true
+      });
+      return rtnFormObj;
+    },
   };
   rtn = base.copy(Base(source), rtn);
+  rtn = base.copy(rtn, valid.Init(rtn));
   return rtn;
 };
 

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

@@ -155,6 +155,7 @@ const SearchScreen = function (source, callBack, screenPara, prevParam) {
             continue;
           }
           if((source.content.fields[key].controlType===Enum.ControlType.DateRange 
+            || source.content.fields[key].controlType===Enum.ControlType.Location
             || source.content.fields[key].controlType===Enum.ControlType.DateTimeRange)
             && source.content.fields[key].code2==undefined){
             source.content.fields[key].code2='';

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

@@ -532,8 +532,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               self.$vue.searchEnd=Date.now();
             }
             self.isLoading = false;
-            if (response.rtnCode === Enum.ReturnCode.Successful) {
-              if (response.content.rows.length > 0) {
+            if (response.rtnCode === Enum.ReturnCode.Successful) {              
+              if (response.content.rows && response.content.rows.length > 0) {
                 // rtn.setRow(response.content.rows);
                 response.content.rows.forEach((nr) => {
                   rtn.listData.push(nr);
@@ -584,7 +584,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
               }
               
               if (typeof callback !== 'undefined') {
-                if (response.content.rows.length > 0) {
+                if (response.content.rows && response.content.rows.length > 0) {
                   callback(true,response);
                 } 
                 else {
@@ -654,7 +654,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           })
           .then(function (response) {
             if (response.rtnCode === Enum.ReturnCode.Successful) {
-              if (response.content.rows.length > 0) {
+              if (response.content.rows && response.content.rows.length > 0) {
                 if (router.flagAddRowAfterAction) {
                   // rtn.setStyleRow(response.content.rows);
                   response.content.rows.forEach((nr) => {

package/src/centaline/mixins/dynamicElement.js

@@ -148,9 +148,9 @@ export default {
     validExcute() {
       var self = this;
       self.validMessage="";
-
+      
       //通用校验
-      if (typeof this.model.validating === "function") {
+      if (typeof this.model.validating === "function") {        
         let validtemp = this.model.validating();
         self.valid = validtemp.valid;
         if (!self.valid) {