centaline-data-driven 1.4.14 → 1.4.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.4.14",
+  "version": "1.4.15",
   "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: "1511930510518128640"} ,
+        apiParam: {actionType: 1,chanceID: "1569558581076955136"} ,
       }
     },
     mounted() {

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="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/third-dept-tran/transaction/edit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,33 +12,7 @@
     data() {
       return {
         apiParam:{
-          actionType
-: 
-2,
-buildingID
-: 
-"1",
-estateID
-: 
-"1",
-floorID
-: 
-"1",
-pageOnly
-: 
-true,
-pageTitle
-: 
-"开盘",
-propertyID
-: 
-"",
-roomNo
-: 
-"1527",
-tradeID
-: 
-"200",
+          "originalTraId":"1594610564600369153","actionType":3,"pageStyle":2,"pageTitle":"修改成交单","pageOnly":true
         },
         topHeight:10,
       }

package/src/centaline/dynamicCheckbox/src/dynamicCheckbox.vue

@@ -69,6 +69,7 @@
         this.model.checkedItemArr = [];
         this.inputHandler(this.model.checkedItemArr);
         this.changeHandler(this.model.checkedItemArr);
+        this.model.updateCode1();
       },
       changeHandler1: function (val) {
         this.inputHandler(this.model.checkedItemArr);

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

@@ -2,7 +2,9 @@
   <div ref="main" class="main" v-if="model !== null">
     <div class="details-content">
       <div ref="header" class="details-head base-box mb10">
-        <div class="head-type">{{ model.fields1Dic.Trade.value }}</div>
+        <div class="head-type" :style="{background:model.fields1Dic.flagActive.value=='0'?'rgba(153, 153, 153, 1)':'#ee6b6b'}">
+          {{ model.fields1Dic.Trade.value }}
+        </div>
         <div class="head-info">
           <div class="title">
             <span>{{ model.fields1Dic.StatusName.value }}</span>

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

@@ -2,7 +2,9 @@
   <div ref="main" class="main" v-if="model !== null">
     <div class="details-content">
       <div ref="header" class="details-head base-box mb10">
-        <div class="head-type">{{ model.fields1Dic.Trade.value }}</div>
+        <div class="head-type" :style="{background:model.fields1Dic.flagActive.value=='0'?'rgba(153, 153, 153, 1)':'#ee6b6b'}">
+          {{ model.fields1Dic.Trade.value }}
+        </div>
         <div class="head-info">
           <div class="title">
             <span>{{ model.fields1Dic.StatusName.value }}</span>

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

@@ -30,9 +30,9 @@
           <div class="cover-list-item">
             <el-image fit="fill" :src="file.url?file.url:file.mediaUrl?file.mediaUrl+'/100/100':require('../../../assets/blank.png')" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
             </el-image>
-            <span class="cover-list-item-span-Default" v-if="model.rightDefault&&model.rightDefault==1&&file.mediaTypeID==2">
+            <span class="cover-list-item-span-Default" v-if="(model.lock&&file.flagDefault)||(model.rightDefault&&model.rightDefault==1&&file.mediaTypeID==2)">
               <i>
-                <el-radio v-model="file.flagDefault" :label="true" @change="handleDefault($event,file)" :disabled="model.lock" title="设为封面">&nbsp;</el-radio>
+                <el-radio v-model="file.flagDefault" :label="true" :class="{'browseDefault':model.lock}" @change="handleDefault($event,file)" :disabled="model.lock" title="设为封面">&nbsp;</el-radio>
               </i>
             </span>
             <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
@@ -103,9 +103,9 @@
           <div class="cover-list-item">
             <el-image fit="fill" :src="file.fileName?file.url:require('../../../assets/blank.png')" style="width: 100px; height: 100px" :z-index="previewZIndex" @click="viewerfile(file)">
             </el-image>
-            <span class="cover-list-item-span-Default" v-if="model.rightDefault&&model.rightDefault==1&&file.mediaTypeID==2">
+            <span class="cover-list-item-span-Default" v-if="(model.lock&&file.flagDefault)||(model.rightDefault&&model.rightDefault==1&&file.mediaTypeID==2)">
               <i>
-                <el-radio v-model="file.flagDefault" :label="true" @change="handleDefault($event,file)" :disabled="model.lock" title="设为封面">&nbsp;</el-radio>
+                <el-radio v-model="file.flagDefault" :label="true" :class="{'browseDefault':model.lock}" @change="handleDefault($event,file)" :disabled="model.lock" title="设为封面">&nbsp;</el-radio>
               </i>
             </span>
             <span class="cover-list-item-span-delete" v-if="!model.lock && file.rightDel">
@@ -600,4 +600,10 @@
     top: 38px;
     left: 32px;
   }
+ 
+.browseDefault .el-radio__input.is-checked .el-radio__inner {
+    border-color: #409eff ;
+    background: #409eff ;
+}
+  
 </style>

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

@@ -134,6 +134,9 @@
         downloadUrl:"",
       };
     },
+    deactivated(){
+      this.downloadUrl="";
+    },
     mounted() {
       this.init();
       this.setCss();

package/src/centaline/dynamicPhotoSelect/src/dynamicPhotoSelect.vue

@@ -31,16 +31,14 @@
                 <span style="width: 80px; height: 26px; display: inline-flex;">
                 &nbsp;{{ item.mediaLabelName }} </span>
               </span>
-              <span v-if="item.rightDefault==true||item.rightDefault=='true'"
-                :class="[
-                  item.flagDefault &&
-                  (item.flagDefault == true || item.flagDefault == 'true')
-                    ? 'checked'
-                    : 'Unchecked',
-                  'isradio',
-                ]"
-                @click="radiochecked(photoList, item)"
-              >
+              <template v-if="modelPhotoselect.lock">
+              <span v-if="item.flagDefault &&(item.flagDefault == true || item.flagDefault == 'true')"
+                class="checked isradio"> 
+              </span>
+             </template>
+              <span v-else-if="item.rightDefault==true||item.rightDefault=='true'"
+               :class="[item.flagDefault &&(item.flagDefault == true || item.flagDefault == 'true')? 'checked': 'Unchecked','isradio',]"
+                @click="radiochecked(photoList, item)">
               </span>
             </span>
           </div>

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

@@ -168,8 +168,9 @@
         确认
       </el-button>
     </div>
+    
     <div v-if="isLoading && searchLoading" v-loading="isLoading" style="top: 30px"></div>
-    <iframe :src="downloadUrl" style="height:0px;width:0px;border-width: 0px;">
+    <iframe :src="downloadUrl" style="height:0px;width:0px;border-width: 0px;position: absolute;bottom: 0px;">
     </iframe>
   </div>
 </template>
@@ -253,6 +254,9 @@ export default {
 
     };
   },
+  deactivated(){
+      this.downloadUrl="";
+  },
   activated() {
     this.$nextTick(() => {
       this.setTableHeight();
@@ -659,7 +663,7 @@ export default {
               h7 = this.$refs.listHeader.$el.offsetHeight | 0;
             }
             var h8 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0 : 0;
-            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 290;
+            let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - h8 - 290 -7;
             if (h2 == 0) {
               tableHeight = tableHeight + 15;
             }

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

@@ -212,7 +212,9 @@
         });
       });
     },
-
+    deactivated(){
+      this.downloadUrl="";
+    },
     mounted() {
       var self = this;
       self.displayAreaWidth = this.DomWidth();

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

@@ -7,10 +7,27 @@ const box = function (source, callBack) {
   var self = this;
   var init = function (data) {
     var rtn = {
+      checkedAllCode:'-99999',
+      _flagCheckedAll:null,
+      get flagCheckedAll() {
+        if (this._flagCheckedAll !== null) {
+          return this._flagCheckedAll;
+        }
+        else {
+          this._checkedItemArr=false;
+          source.selectItems1.forEach((v) => {
+            if (v[this.optionAttrs.value]===this.checkedAllCode) {
+              this._checkedItemArr=true;
+              return;
+            }
+          });
+          return this._checkedItemArr;
+        }
+      },
       get options() {
         return source.selectItems1;
       },
-	   get width1() {
+	    get width1() {
         return source.width1;
       },
       checkedIsInit: false,
@@ -20,7 +37,6 @@ const box = function (source, callBack) {
         }
         else {
           this._checkedItemArr = this.getCheckedItemArr();
-          //return this._checkedItemArr;
           return this._checkedItemArr;
         }
       },
@@ -34,9 +50,24 @@ const box = function (source, callBack) {
             }
           }
         });
+        if(this.flagCheckedAll){
+          let ic=itemArr.findIndex((op) => { return op === this.checkedAllCode });
+          let opl=ic>-1?this.options.length: this.options.length-1;
+          if(ic>-1 || itemArr.length===opl){
+            itemArr.splice(0, itemArr.length);
+            source.code1=JSON.stringify(this.options);
+            this.options.forEach((v) => {
+              if (v[this.optionAttrs.value]) {
+                itemArr.push(v[this.optionAttrs.value]);
+              }
+            });
+          }
+          else if(itemArr.length<opl){
+            if(ic>-1) itemArr.splice(ic, 1);
+          }
+        }
         return itemArr;
       },
-      //checkedItemArr1:[],
       //手动维护code1值
       updateCode1() {
         let self = this;
@@ -46,19 +77,33 @@ const box = function (source, callBack) {
 
         if (source.code1 !== '') {
           var checked = source.code1 === '' ? [] : [].concat(JSON.parse(source.code1));
-          checked.forEach((v) => {
-            if (self.checkedItemArr.indexOf(v[this.optionAttrs.value]) > -1) {
-              v[this.optionAttrs.flagDeleted] = false;
-              let ic=currentOptions.findIndex((op) => { return op[rtn.optionAttrs.value] === v[rtn.optionAttrs.value] });
-              if(ic>-1) currentOptions.splice(ic, 1);
-            }
-            else {
-              v[this.optionAttrs.flagDeleted] = true;
+          let icOld=checked.findIndex((op) => { return op[rtn.optionAttrs.value] === self.checkedAllCode && op[rtn.optionAttrs.flagDeleted] === false });
+          let icNew=self.checkedItemArr.findIndex((op) => { return op === self.checkedAllCode });
+          let opl=icNew>-1?self.options.length: self.options.length-1;
+          if(self.flagCheckedAll && icOld>-1 && icNew===-1){
+            source.code1 = '';
+          }
+          else{
+            if(self.flagCheckedAll && self.checkedItemArr.length<opl && icNew>-1 && icOld>-1){
+              self.checkedItemArr.splice(icNew, 1);
+              let ic1=currentOptions.findIndex((op) => { return op[rtn.optionAttrs.value] === self.checkedAllCode });
+              if(ic1>-1) currentOptions.splice(ic1, 1);
             }
-          });
 
-          checked = checked.concat(currentOptions);
-          source.code1 = JSON.stringify(checked);
+            checked.forEach((v) => {
+              if (self.checkedItemArr.indexOf(v[this.optionAttrs.value]) > -1) {
+                v[this.optionAttrs.flagDeleted] = false;
+                let ic=currentOptions.findIndex((op) => { return op[rtn.optionAttrs.value] === v[rtn.optionAttrs.value] });
+                if(ic>-1) currentOptions.splice(ic, 1);
+              }
+              else {
+                v[this.optionAttrs.flagDeleted] = true;
+              }
+            });
+
+            checked = checked.concat(currentOptions);
+            source.code1 = JSON.stringify(checked);
+          }
         }
         else {
           if (self.checkedItemArr.length === 0) {
@@ -68,6 +113,7 @@ const box = function (source, callBack) {
             source.code1 = JSON.stringify(currentOptions);
           }
         }
+        this.forceUpdate();
       },
       reset() {
         this.value = this.defaultValue;
@@ -87,7 +133,24 @@ const box = function (source, callBack) {
         if (this.self.$forceUpdate) {
           this.self.$forceUpdate();
         }
-      }
+      },
+      getFormObj() {
+        var rtnFormObj = {};
+        Object.defineProperty(rtnFormObj, source.fieldName1, {
+          get: function () {
+            if(rtn.flagCheckedAll && source.code1){
+              let v=JSON.parse(source.code1);
+              let ic=v.findIndex((op) => { return op[rtn.optionAttrs.value] === rtn.checkedAllCode });
+              if(ic>-1) v.splice(ic,1);
+              return JSON.stringify(v);
+            }
+            return source.code1;
+          },
+          enumerable: true,
+          configurable: true
+        });
+        return rtnFormObj;
+      },
     };
     rtn = base.copy(Base(data), rtn);
     rtn = base.copy(rtn, valid.Init(rtn));

package/src/centaline/progress/src/progress.vue

@@ -37,6 +37,9 @@ export default {
       progressFlag: false,
     };
   },
+  deactivated(){
+    this.downloadUrl="";
+  },
   methods: {
     load() {
     },

package/src/main.js

@@ -12,10 +12,10 @@ 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/max-uplink-api/v1/form/router",
   // baseUrl: "http://10.25.10.63:9999/v1/form/router",
   // baseUrl: "http://10.88.22.42:9999/v1/form/router", 
-  // baseUrl: "http://10.88.22.39:8080/api/", 
+  // baseUrl: "http://10.88.22.69:8080/api/", 
   // baseUrl: "http://tjcptest.centaline.com.cn/", 
   // flagRouterSelf: true,
   zindex: 999,
@@ -42,8 +42,8 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '94083010-671d-465a-95a9-1a3318ceb239',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laiZhmNnH0MmCjR9BdsOaYGUEEo3x39UIHb2nOMVp7n3CtCSowa3gjjZ6XcEdbfREoo5shwd1AcUKo6fgMYgNcmw7Dk0LBeT7FWqy1jsmQ1rAGOdfsGLoG5Yp30758Y9zl3n8zKaB1Q-lR61UUBxlTIYjVo6TlPHsDZfwegMAAP__.QfhMlAY_T_oYDtowkrq5sZ68l1iqJ4nvaxGUgo7fUS8',
+        oldToken: '3f518e5b-85c3-4a3e-9aa2-d476c6e43b75',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laiZx3GFnh04XbPwIsg9IsDICicb472qEjt5TnOI09z5hnCNUIAu4oZVWF3BDKy0Rq5Bt8KDikS0bdOQderaeT3Vj_LGGArr7FSqyVo01qlTAEKZf2IuU3zCP3e3cPf5x7jINn9nsovSZMnIfBDn1CWOiEnmnmiNLDNHB6w0AAP__.S8GpMp0QsAvU3rUclegNyD0VCgVWxpMFKmKQNFPcn-4',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',