centaline-data-driven 1.3.44 → 1.3.47

package/package.json

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

package/src/Detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="appDetail" style="height:100%;">
-    <ct-Detail :api="'PropertyOFI/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailOFI'"></ct-Detail>
+    <ct-Detail :api="'PropertyRET/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailRET'"></ct-Detail>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>

package/src/Form.vue

@@ -15,10 +15,10 @@
       return {
         apiParam:{
           actionType: 3,
-originalTraId: "1554357607799558146",
+originalTraId: "1556877589776220161",
 pageOnly: true,
 pageStyle: 2,
-pageTitle: "成交报告",
+pageTitle: "成交报告"
         },
         topHeight:10,
       }

package/src/SearchList.vue

@@ -8,15 +8,15 @@
     :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
     :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
 
-    <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 
+    <!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" 
       :searchDataApi="'/api/third-dept-tran/tran-list'">
-    </ct-searchlist>
+    </ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
+    <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'"
       :searchDataApi="'/PropertyRETList/getListOfSearchModel'"
       :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"
       :searchStatsApi="'/exampleList/getListStats'">
-    </ct-searchlist> -->
+    </ct-searchlist>
 
     <ct-dialog-list></ct-dialog-list>
   </div>

package/src/centaline/css/max.css

@@ -275,4 +275,8 @@
     background-color: #409EFF !important;
     border-color: #409EFF !important;
 } */
-
+.ct-inputNumber .el-input-group {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+}

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

@@ -153,6 +153,7 @@
         }
       },
       callTelClick(data){
+        var self=this;
         this.message='';
         this.qrCode='';
         this.tellImgUrl='';
@@ -169,6 +170,16 @@
           if(data.content.height)this.height=data.content.height;
           if(data.content.imgUrl)this.tellImgUrl=data.content.imgUrl;
         }
+        else if(data.content.actionType=='提示确认'){
+          this.$common.confirm(data.content.message, data.content.actionType, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            center: true
+          }).then(() => {
+            self.$emit('click',self.model,self.rowData,self.rowindex,true);
+          }).catch(() => {
+          });
+        }
       },
       closeCallTel(){
         if(this.model.isCallTel){

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -24,7 +24,7 @@
     <div ref="routers" style="margin-right: 5px;" id="routersWidth">
       <component v-for="(router, index) in model.rowRouter" :key="index" :ref="'router' + router.id"
         v-if="!router.rightField || model.listData[model.value][router.rightField] == 1" :is="router.is"
-        :vmodel="router" :api="model.optionApi" @click="fieldClickHandler(router)">
+        :vmodel="router" :api="model.optionApi" @click="fieldClickHandler">
       </component>
     </div>
   </div>
@@ -97,7 +97,6 @@ export default {
       });
 
     },
-
     focusHandle: function () {
       this.$refs['ct-input'].focus();
       this.$set(this, 'focus', true);
@@ -150,7 +149,7 @@ export default {
       this.changeHandler(self.model.value);
       if (this.model.autoSearch) this.$emit('click');
     },
-    fieldClickHandler(field) {
+    fieldClickHandler(field, rowData,rowindex,flagHaveAlert) {
       var self = this;
       let submitData = {};
       var router = this.model.buttons.find((v) => {
@@ -185,6 +184,9 @@ export default {
           });
         }
       }
+      if(field.isCallTel){
+        submitData.flagHaveAlert=flagHaveAlert||false;
+      }
 
       this.routerClickHandler(router, submitData);
     },
@@ -278,10 +280,10 @@ export default {
               if (callBack) {
                 callBack();
               }
-              if (field.actionType === 10) {
+              if(field.isRefersh){
                 self.loaderObj.Contact(data, null, self.load);
               }
-              else if (field.actionType === 19) {
+              else if (field.isCallTel){
                 self.$refs['router' + field.id][0].callTelClick(data);
               }
             })

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

@@ -268,12 +268,15 @@
 
         return true;
       },
-      rolRouterClickHandler(field, rowData,rowindex) {
+      rolRouterClickHandler(field, rowData,rowindex,flagHaveAlert) {
         field.rowindex=rowindex;
         var submitData = {};
         field.submitListField.forEach((k) => {
           submitData[k] = rowData[k];
         });
+        if(field.isCallTel){
+          submitData.flagHaveAlert=flagHaveAlert||false;
+        }
         this.routerClickHandler(field, submitData, null);
       },
       fieldClickHandler(field) {
@@ -407,23 +410,26 @@
             }
             else{
               field.doAction(submitData, (data) => {
-                self.model.doAction(data,field);
                 if(callBack){
                   callBack();
                 }
-                if(field.actionType===10){
+                if(field.isRefersh){
                   data.apiRouter=self.model.apiRouter;            
                   data.rowMergedColumns=self.model.rowMergedColumns;
                   self.loaderObj.ContactList(data,null,self.load);
                   self.$forceUpdate();
                 }
-                else if(field.actionType===19){
+                else 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);
+                }
               })
             }
           }

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

@@ -155,11 +155,7 @@
             </div>
           </div>
           <div class="contacts-info base-box">
-            <ct-contactList
-              v-if="model.contactApiRouter !== null"
-              :apiRouter="model.contactApiRouter"
-              :key="'contact' + refershKey"
-            ></ct-contactList>
+            <ct-contactList v-if="model.contactApiRouter !== null" :apiRouter="model.contactApiRouter" :key="'contact' + refershKey"></ct-contactList>
           </div>
           <div class="tablist-info base-box">
             <div class="details-tabs-box">

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

@@ -100,6 +100,7 @@ export default {
   methods: {
     load(data) {
       this.model = data;
+	  this.classifyClickHandle()
     },
     handleExceed() {
       this.validMessage = "附件数量最多" + this.model.max + "张";

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

@@ -63,14 +63,14 @@
                        @tableButtonClick="clickHandler"></component>
           </el-col>
         </el-row>
-        <el-row v-if="model.links.findIndex((v)=>{return v.show}).length > -1" style="margin-top: 8px;">
+        <el-row v-if="model.links.findIndex((v)=>{return v.show}) > -1" style="margin-top: 8px;">
           <el-col :span="24" style="text-align:left">
             <component v-for="(btn, index) in model.links" :key="index" :is="btn.is" :vmodel="btn" @click="clickHandler" v-if="btn.show"></component>
           </el-col>
         </el-row>
         <el-row v-if="model.buttons.findIndex((v)=>{return v.show}) > -1" :class="isScroll?'ccai button-absolute':'button-initial'"
           :style="{'max-width':pageWidth?(pageWidth-20)+'px':'100%'}">
-          <el-col :span="24" style="text-align:center">
+          <el-col :span="24" style="text-align:center;padding-bottom: 1px;">
             <component v-for="(btn, index) in model.buttons" :key="index" :is="btn.is" :vmodel="btn" @click="clickHandler" v-if="btn.show"></component>
           </el-col>
         </el-row>
@@ -722,13 +722,13 @@
         self.$refs.Fields.forEach((f) => {
           if (f.model && typeof f.validExcute !== 'undefined') {
             if (!f.validExcute()) {
-              if(i===0 && f.model.label){
+              if(i===0){
                 if(f.model.is=="ct-file"){
                   self.$message.error(f.validMessage);
                 }
                 else{
                   if(f.validMessage){
-                    if(f.validMessage=='必填'){
+                    if(f.validMessage=='必填' && f.model.label){
                       self.$message.error('【'+f.model.label+'】'+f.validMessage);
                     }
                     else{
@@ -736,7 +736,9 @@
                     }
                   }
                   else{
-                    self.$message.error('【'+f.model.label+'】不能为空！');
+                    if(f.model.label){
+                      self.$message.error('【'+f.model.label+'】不能为空！');
+                    }
                   }
                 }
               }
@@ -837,7 +839,9 @@
 }
 .button-absolute{
   z-index: 100;
-  bottom: 6px;
+  /* bottom: 6px; */
+  bottom: 0;
+  border-radius: 0 0 4px 4px;
   position: absolute;
   line-height: 34px;
   background-color: #fff;

package/src/centaline/dynamicLayout/src/dynamicLayout.vue

@@ -157,7 +157,6 @@
           }
         }
       },
-
       xmlToJson(xml) {
         var self = this;
         // Create the return object
@@ -218,13 +217,11 @@
         }
         return obj;
       },
-      clickHandler(routerKey, rowindex, forname, forrowindex) {
-        this.$emit('click', routerKey, rowindex, forname, forrowindex);
+      clickHandler(routerKey, rowindex, forname, forrowindex,flagHaveAlert) {
+        this.$emit('click', routerKey, rowindex, forname, forrowindex,flagHaveAlert);
       },
-
     },
     mounted() {
-
     },
     beforeDestroy() {
       this.Layout = [];

package/src/centaline/dynamicLayout/src/dynamicLayoutChildren.vue

@@ -25,7 +25,6 @@
       rowindex: Number,
       forname: String,
       forrowindex: String,
-
     },
     data() {
       return {
@@ -36,8 +35,8 @@
       this.model = this.loaderObj.CellLayout(this.vmodel);
     },
     methods: {
-      clickHandler(routerKey, rowindex, forname, forrowindex) {
-        this.$emit('click', routerKey, rowindex, forname, forrowindex);
+      clickHandler(routerKey, rowindex, forname, forrowindex,flagHaveAlert) {
+        this.$emit('click', routerKey, rowindex, forname, forrowindex,flagHaveAlert);
       }
     },
     mounted() {

package/src/centaline/dynamicLayout/src/dynamicLayoutChildrenFor.vue

@@ -27,8 +27,8 @@
       this.model = this.loaderObj.CellLayout(this.vmodel);
     },
     methods: {
-      clickHandler(routerKey, rowindex, forname, forrowindex) {
-        this.$emit('click', routerKey, rowindex, forname, forrowindex);
+      clickHandler(routerKey, rowindex, forname, forrowindex,flagHaveAlert) {
+        this.$emit('click', routerKey, rowindex, forname, forrowindex,flagHaveAlert);
       }
     },
     mounted() {

package/src/centaline/dynamicLayout/src/dynamicLayoutImage.vue

@@ -51,8 +51,7 @@
       if (typeof this.vmodel !== 'undefined') {
         this.model = this.loaderObj.CellLayout(this.vmodel, this.actionRouter, this.rowdata, this.forname, this.forrowindex); 
       }
-    },
-   
+    },   
     methods: {
       clickHandler(ev) {
         if (!this.visible) {
@@ -61,10 +60,10 @@
         else {
           this.visible = false;
           this.tellImgUrl = '';
-        }
-        
+        }        
       },
       callTelClick(data) {
+        var self=this;
         this.message = '';
         this.qrCode = '';
         this.tellImgUrl = '';
@@ -81,6 +80,16 @@
           if (data.content.height) this.height = data.content.height;
           if (data.content.imgUrl) this.tellImgUrl = data.content.imgUrl;
         }
+        else if(data.content.actionType=='提示确认'){
+          this.$common.confirm(data.content.message, data.content.actionType, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            center: true
+          }).then(() => {
+            self.$emit('click',self.model.routerKey,self.rowindex,self.forname,self.forrowindex,true);
+          }).catch(() => {
+          });
+        }
       },
       closeCallTel() {
         if (this.visible) {

package/src/centaline/dynamicRepeat/src/dynamicRepeat.vue

@@ -129,13 +129,11 @@
         var self = this;
         this.model.input = field.input;//当前小组件事件作为大组件事件
         self.$emit('input');
-
       },
     }
   }
 </script>
-<style>
- 
+<style> 
   .ct-form-repeat {
     display: table;
     background: aliceblue;

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

@@ -1116,7 +1116,7 @@ export default {
         clickAcion();
       }
     },
-    rolRouterCellClickHandler(routerKey, rowindex, forname, forrowindex) {
+    rolRouterCellClickHandler(routerKey, rowindex, forname, forrowindex,flagHaveAlert) {
       var self = this;
       var submitData = {};
       var rowData = self.model.listData[rowindex];
@@ -1128,33 +1128,23 @@ export default {
         field.submitListField.forEach((k) => {
           submitData[k] = rowData[forname][forrowindex][k];
         });
-      } else {
+      } 
+      else {
         field.submitListField.forEach((k) => {
           submitData[k] = rowData[k];
         });
       }
+      if(field.isCallTel){
+        submitData.flagHaveAlert=flagHaveAlert||false;
+      }
       let action = field.action;
       if (field.actionField) {
         action = rowData[field.actionField];
       }
       self.model.selectIndex = rowindex;
-      this.routerCellClickHandler(
-        field,
-        submitData,
-        action,
-        rowindex,
-        forname,
-        forrowindex
-      );
+      this.routerCellClickHandler(field, submitData, action, rowindex, forname, forrowindex);
     },
-    routerCellClickHandler(
-      field,
-      submitData,
-      action,
-      rowindex,
-      forname,
-      forrowindex
-    ) {
+    routerCellClickHandler( field, submitData, action,rowindex, forname, forrowindex) {
       let self = this;
       action = action || field.action;
 
@@ -1176,24 +1166,25 @@ export default {
                 self.model,
                 field.dialogWidth
               );
-          } else if (field.isSearchPageInTab) {
-            // 外部框架tab页打开
+          } 
+          else if (field.isSearchPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
               .getDataDrivenOpts()
               .handler.openTabSearch(field, submitData);
-          } else if (field.isBrowserNewTab) {
-            // 浏览器打开
+          } 
+          else if (field.isBrowserNewTab) {// 浏览器打开
             submitData = field.getActionPara(submitData).para;
             let query = self.$common.objectToQueryStr(submitData);
             window.open(action + query, "_blank");
-          } else if (field.isOpenUrlInBrowse) {
-            // 浏览器打开
+          } 
+          else if (field.isOpenUrlInBrowse) {// 浏览器打开
             window.open(submitData[field.submitFormField], "_blank");
-          } else if (field.isSeeVoice) {
-            //看视频
+          } 
+          else if (field.isSeeVoice) {//看视频
             self.$common.browseVideo(field, submitData);
-          } else {
+          } 
+          else {
             //self.operationLoading = true;
 
             //Form
@@ -1286,24 +1277,17 @@ export default {
                 ],
               };
               self.$common.openDialog(dialogOption);
-            } else {
+            } 
+            else {
               field.doAction(submitData, (data) => {
                 self.model.doAction(data, field);
-                if (field.actionType === 19) {
+                if (field.isCallTel) {
                   if (self.model.currentCallTellayout) {
-                    self.closeCallTel(
-                      self.$refs[self.model.currentCallTellayout][0]
-                    );
+                    self.closeCallTel(self.$refs[self.model.currentCallTellayout][0]);
                   }
                   self.model.currentCallTellayout = "layout" + rowindex;
-                  self.model.currentCallTelrouter =
-                    "router" + forname + forrowindex;
-                  self.callTelClick(
-                    self.$refs["layout" + rowindex][0],
-                    data,
-                    forname,
-                    forrowindex
-                  );
+                  self.model.currentCallTelrouter = "router" + forname + forrowindex;
+                  self.callTelClick(self.$refs["layout" + rowindex][0], data, forname, forrowindex);
                 }
               });
             }
@@ -1335,15 +1319,14 @@ export default {
             clickAcion();
           })
           .catch(() => {});
-      } else {
+      } 
+      else {
         clickAcion();
       }
     },
     callTelClick(VueCom, data, forname, forrowindex) {
       var self = this;
-      if (
-        typeof VueCom.$refs["router" + forname + forrowindex] !== "undefined"
-      ) {
+      if ( typeof VueCom.$refs["router" + forname + forrowindex] !== "undefined") {
         VueCom.callTelClick(data);
         return true;
       }

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

@@ -59,6 +59,9 @@ const box = function (source, fileSourceList, router, optionApi) {
       //简单分类
       getOptions(callBack) {
         var self = this;
+        if(!source.paramName1){
+          return false;
+        }
         if (self.optionModel.isInit) {
           return self.optionModel.options;
         }

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

@@ -14,7 +14,8 @@ const Mo = function (source, moreActionRouter) {
       label: 'name',
       displayLabel:'displayName',
       actionType: 'actionType',
-      flagDeleted: 'flagDeleted'
+      flagDeleted: 'flagDeleted',
+      toolTip: 'toolTip'
     },
     _value:null,
     get value() {

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

@@ -38,9 +38,6 @@ const Router = function (source) {
     get isDropdown() {
       return source.buttonType === Enum.ButtonType.Dropdown;
     },
-    get isCallTel() {
-      return source.actionType === Enum.ActionType.CallTel;
-    },
     get alert() {
       return source.flagAlert === true;
     },
@@ -116,6 +113,9 @@ const Router = function (source) {
     get isRefersh() {
       return source.actionType === Enum.ActionType.Refersh;
     },
+    get isCallTel() {
+      return source.actionType === Enum.ActionType.CallTel;
+    },
     //打开页面（1Form,2SearchList（弹在tab）,3Tab,4执行客户端脚本,5SearchList(弹出)）
     get navToNewPage() {
       return source.navToNewPage;

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

@@ -41,7 +41,8 @@ const So = function (source, moreActionRouter) {
       label: 'name',
       displayLabel:'displayName',
       actionType: 'actionType',
-      flagDeleted: 'flagDeleted'
+      flagDeleted: 'flagDeleted',
+      toolTip: 'toolTip'
     },
     attrs: {
       style: {

package/src/centaline/selectOption/src/selectOptionVertical.vue

@@ -3,7 +3,9 @@
     <ul>
       <li v-for="(op, index) in model.options" :key="index" :class="[getOptionSelect(op[model.optionAttrs.value])?'select':'']" 
         @click="selectOption(op[model.optionAttrs.value],op[model.optionAttrs.label])">
-        <div v-html="op[model.optionAttrs.displayLabel]||op[model.optionAttrs.label]"></div>
+        <el-tooltip :disabled="!op[model.optionAttrs.toolTip]" :content="op[model.optionAttrs.toolTip]" placement="right">
+          <div v-html="op[model.optionAttrs.displayLabel]||op[model.optionAttrs.label]"></div>
+        </el-tooltip>
       </li>
     </ul>
   </div>

package/src/main.js

@@ -12,11 +12,11 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  // baseUrl: "http://10.88.22.46:7070/v1/form/router",
   // baseUrl: "http://10.88.23.22:9999/v1/form/router",
-  // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // baseUrl: "http://10.88.22.40:8080/", 
-  // flagRouterSelf: true,
+  baseUrl: "http://tjcptest.centaline.com.cn/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -41,7 +41,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '688032ee-2caf-4a34-a1e6-bf7f5c8cca42',
+        oldToken: '8ce4e917-2183-40d9-8b87-53ae45e1fc59',
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"201703020943128D8A8FCF463E4016D6","estateName":"%E4%B8%87%E7%A7%91%E4%BA%91%E5%9F%8E"}',
         Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE2OGI1YThjLThiZTUtNDQyZi04NTA4LWMyODY4N2NkYmEzMSJ9.Rk26QdZSUzDVdjdRxGxDApOt5W6KYjmyjmsXpWeZb5E5NwZjpXnHYwhYkKjNxIeyg--OV2UrzFa2SxGzZ-Wneg',