centaline-data-driven 1.3.16 → 1.3.19

package/package.json

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

package/src/Detail.vue

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

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/salemanage/batchcontractadjustdetail/readImportDetail'" :apiParam="apiParam"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form>
     <!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -14,7 +14,7 @@
     data() {
       return {
         apiParam:{
-actionType:2,
+originalTraId: "1542431606998347777", actionType: 3, pageStyle: 2, pageTitle: "成交报告", pageOnly: true
           }
       }
     },

package/src/centaline/api/index.js

@@ -180,7 +180,7 @@ const api = {
     }
 
     if (data.rtnCode === Enum.ReturnCode.Successful) {
-      if (data.rtnMsg) {
+      if (data.rtnMsg && common.getDataDrivenOpts().showRequestSuccessMessage) {
         if (data.MsgAlertStyle && data.MsgAlertStyle == Enum.MessageAlertStyle.Dialog) {
           common.confirm(data.rtnMsg, '信息', { confirmButtonText: '确定', flagShowcCancelButton: '0' });
         }

package/src/centaline/common/index.js

@@ -733,7 +733,18 @@ const common = {
    */
   numToFloat(value, num) {
     if (value && num && num > 0) {
-      value = parseFloat(value).toFixed(num);
+      let ls=value.toString().split('.');
+      let l1=0;
+      value=ls[0]+'.';
+      if(ls.length>1){
+        value=value+ls[1];
+        l1=ls[1].length;
+      }
+      if(num>l1){
+        for(var i=0;i<num-l1;i++){
+          value=value+'0';
+        }
+      }
     }
     return value.toString();
   },

package/src/centaline/css/common.css

@@ -360,7 +360,10 @@ html {
    color: #303133;
    line-height: 1.769230769230769;
  }
- 
+ .el-collapse-item__content [class*=el-col-] {
+  float: none;
+  display: inline-block;
+}
  .ct-text .ct-text-label-div {
    display: flex;
    justify-content: left;
@@ -377,8 +380,14 @@ html {
  
  .ct-flex-div .ct-flex-div-input {
    flex: 1;
+   
  }
- 
+  .el-textarea .el-input__count {
+  /* right: 24px; */
+}
+.ct-flex-div-input input.el-input__inner {
+  /* width: 100%; */
+}
  .ct-flex-div .ct-flex-div-span {
    display: flex;
    justify-content: left;
@@ -801,7 +810,7 @@ html {
   color: #409eff;
 }
 .el-input-group{
-  line-height: 26px;
+  line-height: 22px;
 }
 .shortcutFollow .ct-form{
   margin:0px !important;

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

@@ -170,6 +170,14 @@
           if(data.content.imgUrl)this.tellImgUrl=data.content.imgUrl;
         }
       },
+      closeCallTel(){
+        if(this.model.isCallTel){
+          if(this.visible){
+            this.visible=false;
+            this.tellImgUrl='';
+          }
+        }
+      },
     }
   }
 </script>

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

@@ -418,6 +418,10 @@
                   self.$forceUpdate();
                 }
                 else if(field.actionType===19){
+                  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);
                 }
               })

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

@@ -170,21 +170,8 @@
           </div>
         </div>
       </div>
-      <div
-        ref="detail"
-        class="details-mid y-auto"
-        @scroll="scrollHandle($event)"
-        :style="{
-          height: model.detailHeight ? model.detailHeight + 'px' : '780px',
-        }"
-      >
-        <div
-          ref="midl"
-          class="mid-l"
-          :style="{
-            width: model.midlWidth ? model.midlWidth + 'px' : '1200px',
-          }"
-        >
+      <div ref="detail" class="details-mid y-auto" @scroll="scrollHandle($event)" :style="{height: model.detailHeight ? model.detailHeight + 'px' : '780px',}">
+        <div ref="midl" class="mid-l" :style="{ width: model.midlWidth ? model.midlWidth + 'px' : '1200px',}">
           <!-- 图片内容部分 -->
           <div class="hous-info base-box">
             <div class="info-conten">
@@ -1904,6 +1891,7 @@ export default {
   background-color: rgb(153, 153, 153);
   padding: 3px 0;
   background-clip: content-box;
+  cursor: pointer;
 }
 // .popovertablf span {
 //   display: inline-block;

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

@@ -1,10 +1,5 @@
 <template>
-  <div
-    style="width: 100%"
-    v-if="model !== null"
-    class="block ct-file"
-    :class="[model.attrs.size ? 'ct-checkbox-' + model.attrs.size : '']"
-  >
+  <div style="width: 100%" v-if="model !== null" class="block ct-file" :class="[model.attrs.size ? 'ct-checkbox-' + model.attrs.size : '']">
     <el-upload
       :class="disableUpload ? 'ct-upload-display-none' : ''"
       :disabled="model.lock"
@@ -32,73 +27,36 @@
       </div>
       <div slot="file" slot-scope="{ file }" :title="file.fileName">
         <div class="cover-list-item">
-          <el-image
-            fit="fill"
-            :src="file.url"
-            style="width: 100px; height: 100px"
-            :z-index="previewZIndex"
-            @click="viewerfile(file)"
-          >
+          <el-image fit="fill" :src="file.url" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
           </el-image>
-          <span
-            class="cover-list-item-span-delete"
-            v-if="!model.lock && file.rightDel"
-          >
+          <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
             <i class="el-icon-delete" @click="handleRemove(file)"></i>
           </span>
-          <span
-            class="cover-list-item-span"
-            v-if="model.lock || model.paramName"
-          >
+          <span class="cover-list-item-span" v-if="model.lock || model.paramName">
             <!--锁定-->
             <span v-if="model.lock || !file.rightEdit" class="el-dropdown-link">
-              <span style="width: 80px; height: 26px; display: inline-flex"
-                >&nbsp;{{ file.mediaLabelName }}</span
-              >
+              <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
             </span>
             <!--复杂分类-->
-            <span
-              v-else-if="model.isComplexClassify"
-              class="el-dropdown-link"
-              @click="classifyFormClickHandle(file)"
-            >
-              <span style="width: 80px; height: 26px; display: inline-flex"
-                >&nbsp;{{ file.mediaLabelName }}</span
-              ><i class="el-icon-arrow-down el-icon--right"></i>
+            <span v-else-if="model.isComplexClassify" class="el-dropdown-link" @click="classifyFormClickHandle(file)">
+              <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
+              <i class="el-icon-arrow-down el-icon--right"></i>
             </span>
             <!--简单分类-->
-            <el-dropdown
-              v-else
-              class="el-upload-list__item-preview"
-              trigger="click"
-              placement="top"
-              @command="classifySelectedClickHandle"
-            >
+            <el-dropdown v-else class="el-upload-list__item-preview"  trigger="click" placement="top" @command="classifySelectedClickHandle">
               <span class="el-dropdown-link" @click="classifyClickHandle">
-                <span style="width: 80px; height: 26px; display: inline-flex"
-                  >&nbsp;{{ file.mediaLabelName }}</span
-                ><i class="el-icon-arrow-down el-icon--right"></i>
+                <span style="width: 80px; height: 26px; display: inline-flex">&nbsp;{{ file.mediaLabelName }}</span>
+                <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
-              <el-dropdown-menu
-                slot="dropdown"
-                class="el-upload-list__item-preview"
-              >
-                <el-dropdown-item
-                  v-for="(option, index) in model.optionModel.options"
-                  :key="index"
-                  :command="{ option: option, file: file }"
-                >
+              <el-dropdown-menu slot="dropdown" class="el-upload-list__item-preview">
+                <el-dropdown-item v-for="(option, index) in model.optionModel.options" :key="index" :command="{ option: option, file: file }">
                   {{ option[model.optionModel.optionAttrs.label] }}
                 </el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </span>
         </div>
-        <el-progress
-          type="circle"
-          v-if="file.progressFlag"
-          :percentage="file.loadProgress"
-        ></el-progress>
+        <el-progress type="circle" v-if="file.progressFlag" :percentage="file.loadProgress"></el-progress>
       </div>
     </el-upload>
   </div>
@@ -149,17 +107,14 @@ export default {
     },
     //删除
     handleRemove(file) {
-      this.$common
-        .confirm("确定删除该附件？", "提示", {
+      this.$common.confirm("确定删除该附件？", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           //type: 'warning'
-        })
-        .then(() => {
+        }).then(() => {
           this.model.deleteFile(file, false);
           this.selfValidExcute("remove");
-        })
-        .catch(() => {});
+        }).catch(() => {});
     },
     handlePictureCardPreview(file) {
       if (this.$common.isAssetTypeAnImage(this.getSuffix(file))) {
@@ -302,7 +257,8 @@ export default {
       if (this.model.max) {
         if (this.model.getfileListLength() >= this.model.max) {
           this.disableUpload = true;
-        } else {
+        } 
+        else {
           this.disableUpload = false;
         }
       }
@@ -310,18 +266,14 @@ export default {
         if (this.model.getfileListLength() < this.model.min) {
           //change时需要判断有没有上传图片如果没有图片则不提示
           if (eventName == "change" && this.model.getfileListLength() > 0) {
-            this.validMessage =
-              "附件数量还差" +
-              (parseInt(this.model.min) - this.model.getfileListLength()) +
-              "张";
+            this.validMessage = "附件数量还差" + (parseInt(this.model.min) - this.model.getfileListLength()) + "张";
             this.valid = false;
-          } else if (eventName == "valid") {
-            this.validMessage =
-              "附件数量还差" +
-              (parseInt(this.model.min) - this.model.getfileListLength()) +
-              "张";
+          } 
+          else if (eventName == "valid") {
+            this.validMessage = "附件数量还差" + (parseInt(this.model.min) - this.model.getfileListLength()) + "张";
             this.valid = false;
-          } else if (eventName == "remove") {
+          } 
+          else if (eventName == "remove") {
             this.valid = true;
           }
           return false;

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

@@ -10,9 +10,9 @@
         <!--头部元素-->
         <el-row v-if="collapseFieldsRow.length > 0">
           <el-col v-for="(col, index) in collapseFieldsRow[0]" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
-            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
+            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
-                       @input="inputHandler(col,$event)"
+                       @input="inputHandler(col,$event)" @importComplete="importComplete"
                        @popupSearchList="popupSearchListHandler"
                        @tableButtonClick="clickHandler"></component>
           </el-col>
@@ -24,7 +24,7 @@
                        v-for="(item, index) in collapse" v-if="item.show !== false" :key="index">
             <el-row>
               <el-col v-for="(col, index) in collapseFieldsRow[index + 1]" :key="index" :span="col.colspan" v-if="col.show !== false" style="padding:5px">
-                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)"
+                <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
                            @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)" @enter="enterHandler(col,$event)"
                            @input="inputHandler(col,$event)" @importComplete="importComplete"
                            @popupSearchList="popupSearchListHandler"
@@ -56,9 +56,9 @@
         <!--尾部元素-->
         <el-row v-if="independentItem.length > 0" style="margin-top: 20px;">
           <el-col v-for="(col, index) in independentItem" :key="index" v-if="col.show !== false" :span="col.colspan" style="padding:5px">
-            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" v-bind="col.bindPara" :fileData="getFileData(col)"
+            <component ref="Fields" :is="col.is" :vmodel="col" :api="model.optionApi" :parentModel="model" v-bind="col.bindPara" :fileData="getFileData(col)" :from="'form'"
                        @click="fieldClickHandler(col,$event)" @change="changeHandler(col,$event)"
-                       @input="inputHandler(col,$event)"
+                       @input="inputHandler(col,$event)" @importComplete="importComplete"
                        @popupSearchList="popupSearchListHandler"
                        @tableButtonClick="clickHandler"></component>
           </el-col>
@@ -595,7 +595,17 @@
                   self.$message.error(f.validMessage);
                 }
                 else{
-                  self.$message.error('【'+f.model.label+'】不能为空！');
+                  if(f.validMessage){
+                    if(f.validMessage=='必填'){
+                      self.$message.error('【'+f.model.label+'】'+f.validMessage);
+                    }
+                    else{
+                      self.$message.error(f.validMessage);
+                    }
+                  }
+                  else{
+                    self.$message.error('【'+f.model.label+'】不能为空！');
+                  }
                 }
               }
               i++;

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

@@ -364,6 +364,7 @@ export default {
   padding: 3px 0;
   background-clip: content-box;
   margin-left: 5px;
+  cursor: pointer;
 }
 </style>
 <style>

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

@@ -215,7 +215,6 @@ const box = function (source, fileSourceList, router, optionApi) {
         classify.file.source.mediaLabelID = classify.option[rtn.optionModel.optionAttrs.value];
       },
       handleAvatarSuccess(res, file, fileList) {
-      
         if (res.rtnCode === Enum.ReturnCode.Successful) {
           //下面的方式绑定，会有一些问题 todo 不强与页面关联
           fileSourceList.push(res.content[0]);
@@ -240,11 +239,15 @@ const box = function (source, fileSourceList, router, optionApi) {
           rtn.fileList = fileList;//无数据会监听不到
         }
         else {
+          for (let i = 0; i < fileList.length; i++) {
+            if (fileList[i].uid === file.uid) {              
+              fileList.splice(i, 1);
+            }
+          }
           Vue.prototype.$message.error(res.rtnMsg);
         }
       },
       deleteFile(file, forceDelete) {
-
         for (let i = 0; i < rtn.fileList.length; i++) {
           if (rtn.fileList[i].uid === file.uid) {
             if (forceDelete) {
@@ -275,7 +278,6 @@ const box = function (source, fileSourceList, router, optionApi) {
             break;
           }
         }
-        console.log(rtn.fileList)
       },
       getFormObj() {
         var rtnFormObj = {};

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

@@ -384,10 +384,9 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
 
             if (data) {
                 if (data.field) {
-                    data.field.source[attrName] = value;
-                    data.listData.updateListField(data.listData.refFieldsLabel, rowNum, fiedlId);
+                  data.field.source[attrName] = value;
+                  data.listData.updateListField(data.listData.$self.$refs.FieldsLabel, rowNum, fiedlId);
                 }
-                //data.field.self.$forceUpdate();
 
                 //正在编辑的行
                 if (data.listData.currentRow.data && data.listData.currentRow.data[fiedlId] && data.listData.currentRow.data.$sourceIndex === rowNum) {

package/src/centaline/quickInputSos/src/quickInput.vue

@@ -2,7 +2,7 @@
  * @Author: linchunmei 179466780@qq.com~
  * @Date: 2022-06-21 11:29:34
  * @LastEditors: linchunmei 179466780@qq.com
- * @LastEditTime: 2022-06-28 15:45:15
+ * @LastEditTime: 2022-07-01 11:12:13
  * @FilePath: \js-sdk-v3\src\centaline\quickInputSos\src\quickInput.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -103,7 +103,7 @@ export default {
   mounted() {},
 };
 </script>
-<style>
+<style scoped>
 .ct-quickInput .el-icon-more:hover {
   cursor: pointer;
   color: #409eff;
@@ -125,8 +125,10 @@ export default {
   padding: 4px 0;
   background-clip: content-box;
   margin-left: 5px;
+  cursor: pointer;
 }
-.ct-flex-div .ct-flex-div-input {
-  margin-right: 12px;
+
+.ct-quickInput.ct-flex-div-span {
+  width: 12px;
 }
 </style>

package/src/main.js

@@ -12,11 +12,13 @@ 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.23.22:9999/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://10.88.22.69:8080/", 
+  // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // flagRouterSelf: true,
   zindex: 999,
+  showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
   handler: {
     // 打开tab页
@@ -39,10 +41,10 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: 'f6a35199-5dd7-423c-a4e4-e1553c3d76bb',
+        oldToken: 'a9e42494-1e0b-4c46-834e-eea096ba2564',
         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.eyJsb2dpbl91c2VyX2tleSI6IjZiYWE5MDU5LTNkNTEtNGFlMC04YjBlLTc5YjQ4MTQzNzhjOCJ9.IYQdOekUibZsjx2OYXnCt0AVdBq9FhEx6RKnUQdJ6SA8aW6Ou3thl5JghE2w6nzXhlYYyPmc6vVu8YBe0JINsg',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImVjODhjOTI1LTU3OTktNDVmNy1iNDI3LWI3M2QwNGVkNWM2NSJ9.fyndFOEg4ThBHv4N2pi3pmPaWWlcD1CVPsYu0G5BKAB1hAgkL_GpOMpCZB5xdjMJLbBVomdoUjnRY7T6JSZb-g',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作