centaline-data-driven 1.4.33 → 1.4.35

package/package.json

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

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/getLayoutOfEdit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/edit'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,21 @@
     data() {
       return {
         apiParam:{
-          chanceID: "1602509155166457856", actionType: 3
+          actionType
+: 
+"3",
+originalTraId
+: 
+"1603271493445812226",
+pageOnly
+: 
+"true",
+pageStyle
+: 
+"2",
+pageTitle
+: 
+"成交报告"
         },
         topHeight:10,
       }

package/src/centaline/dynamicDetail/src/dynamicAlbums.vue

@@ -12,8 +12,7 @@
         >
           <template v-for="(item, index) in carouselMediaAlbums">
             <el-carousel-item :key="index">
-              <div class="swiper-i">
-                <div class="page">{{item.page}}</div>
+              <div class="swiper-i"> 
                 <img :src="getShowUrl(item)" @click="viewerfile(item)" />
                 <img
                   :src="item.albumBigImageUrl"
@@ -28,7 +27,7 @@
               </div> </el-carousel-item
           ></template>
         </el-carousel>
-
+        <div class="page">{{page}}</div>
         <div
           class="hous-img"
           style="position: absolute; bottom: 0; z-index: 9"
@@ -77,17 +76,20 @@ export default {
       newMediaAlbums: [], 
       activeAlbumsIndex: 0,
       flagChange: true,
-      carouselMediaAlbums:[]
+      carouselMediaAlbums:[],
+      page:""
     };
   },
   created() {
     this.init();
   },
   methods: {
+    setPage(item){
+      this.page=item.page;
+    },
     init() {
       var self = this;
       this.newMediaAlbums = this.mediaAlbums || []; 
-      
       this.mediaAlbums.forEach((item,index)=>{
         item.medias.forEach((n,i)=>{
            n.albumSmallImageUrl=item.albumSmallImageUrl;
@@ -100,17 +102,20 @@ export default {
           self.carouselMediaAlbums.push(n);
         })
       })
-
+      this.setPage( self.carouselMediaAlbums[self.getinitialIndex(self.carouselMediaAlbums)]);
       self.$forceUpdate();
     },
 
     changeAlbumsIndex(newindex,oldValue){
      var self = this;
      self.activeAlbumsIndex=  self.carouselMediaAlbums[newindex].groupindex;
+     this.setPage( self.carouselMediaAlbums[newindex]);
     },
     handleClick(index) {
+        var self = this;
       if (index == this.activeAlbumsIndex) return; 
        var   initialIndex = this.carouselMediaAlbums.findIndex((v) => v.groupindex == index) | 0;
+       this.setPage(self.carouselMediaAlbums[initialIndex]);
        this.$refs.mediaAlbumsCarousel.setActiveItem(initialIndex);
       this.activeAlbumsIndex = index;
       this.flagChange = !this.flagChange;
@@ -125,12 +130,7 @@ export default {
         initialIndex = list.medias.findIndex((v) => v.flagDefault == 1) | 0;
       } catch (error) {}
       return initialIndex < 0 ? 0 : initialIndex;
-    },
-    getDefaultUrl(list) {
-      var initialIndex = this.getinitialIndex(list);
-      return this.getShowUrl(list.medias[initialIndex]);
-    },
-
+    }, 
     getShowUrl(list) {
       if (list.mediaTypeID == "2") {
         return list.mediaUrl + "/260/200";
@@ -170,17 +170,17 @@ export default {
       left: 50%;
       transform: translate(-50%, -50%);
     }
-    .page{
-   position: absolute;
+  }
+ .page{
+     position: absolute;
     bottom: 20px;
     text-align: right;
     right: 0px;
-    background-color: rgb(14 12 24 / 38%);
+   background-color: rgb(14 12 24 / 38%);
     color: #FFF;
-	  padding: 0px 5px;
+    padding: 0px 5px; 
+    z-index: 9
     }
-  }
-
   .hous-img {
     margin-top: 10px;
     width: 100%;

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

@@ -311,57 +311,101 @@
                   if (field.action) {
                     field.disabled = true;//提交按钮禁用
                     self.model.pageDisabled = true;
-                    field.doAction(self.getFormObj(), (data) => {
-                      field.disabled = false;
-                      self.model.pageDisabled = false;
-                      if (data.rtnCode === 200) {
-                        if (data.notification === 17) {
-                          self.clickHandler(self.model.getRtnRouter(data.content), null)
+
+                    if (field.flagAsync) {
+                      field.doAction(self.getFormObj(), (res) => {
+                        if (res.content && res.content.action) {
+                          var dialogOption = {
+                            title: field.pageTitle || field.label,
+                            content: [{
+                              component: 'ct-progress',
+                              attrs: {
+                                progressAction: res.content.action,
+                                progressKey: res.content.key,
+                                progressType: field.isExport ? 'export' : 'import',
+                                width: '350px',
+                                height: '165px'
+                              },
+                              on: {
+                                finished(data) {
+                                  field.disabled = false;
+                                  self.model.pageDisabled = false;
+                                  self.$common.closeDialog(dialogOption.dialog);
+                                  if (data.rtnMsg) {
+                                    self.$message.success(data.rtnMsg);
+                                  }
+                                  if (data.notification === 17) {
+                                    self.clickHandler(self.model.getRtnRouter(data.content), null)
+                                  }
+                                  self.$emit('submit', { formData: self.model, responseData: data });
+                                },
+                                error(data) {
+                                  field.disabled = false;
+                                  self.model.pageDisabled = false;
+                                  self.$common.closeDialog(dialogOption.dialog);
+                                  self.$message.warning(data.rtnMsg);
+                                }
+                              }
+                            }]
+                          };
+                          self.$common.openDialog(dialogOption);
                         }
-                        if (self.model.flagAlertClose) {
-                          self.$common.confirm('操作成功，是否关闭本页面?', '提示', {
+                      });
+                    }
+                    else {
+                      field.doAction(self.getFormObj(), (data) => {
+                        field.disabled = false;
+                        self.model.pageDisabled = false;
+                        if (data.rtnCode === 200) {
+                          if (data.notification === 17) {
+                            self.clickHandler(self.model.getRtnRouter(data.content), null)
+                          }
+                          if (self.model.flagAlertClose) {
+                            self.$common.confirm('操作成功，是否关闭本页面?', '提示', {
+                              confirmButtonText: '确定',
+                              cancelButtonText: '取消',
+                              type: 'warning'
+                            }).then(() => {
+                              //如果没有弹框 则关闭tab页
+                              if (self.$common.dialogList && self.$common.dialogList.List.length === 0) {
+                                if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
+                                  self.$common.getDataDrivenOpts().handler.closeTab();
+                                }
+                              }
+                              self.$emit('submit', { formData: self.model, responseData: data });
+                            }).catch(() => {
+                              self.init();
+                            });
+                          }
+                          else {
+                            self.$emit('submit', { formData: self.model, responseData: data });
+                          }
+                          if (self.parentModel) {
+                            self.parentModel.$vue.closeTabThen(data);
+                          }
+                        }
+                        else if (data.rtnCode === 202) {
+                          self.$common.confirm(data.rtnMsg, '提示', {
                             confirmButtonText: '确定',
                             cancelButtonText: '取消',
                             type: 'warning'
                           }).then(() => {
-                            //如果没有弹框 则关闭tab页
-                            if (self.$common.dialogList && self.$common.dialogList.List.length === 0) {
-                              if (typeof self.$common.getDataDrivenOpts().handler.closeTab === 'function') {
-                                self.$common.getDataDrivenOpts().handler.closeTab();
+                            field.doAction(self.getFormObj({ flagHaveAlert: '1' }), (res) => {
+                              if (res.rtnCode === 200) {
+                                if (res.notification === 17) {
+                                  self.clickHandler(self.model.getRtnRouter(res.content), null)
+                                }
+                                else {
+                                  self.$emit('submit', { formData: self.model, responseData: res });
+                                }
                               }
-                            }
-                            self.$emit('submit', { formData: self.model, responseData: data });
+                            });
                           }).catch(() => {
-                            self.init();
                           });
                         }
-                        else {
-                          self.$emit('submit', { formData: self.model, responseData: data });
-                        }
-                        if (self.parentModel) {
-                          self.parentModel.$vue.closeTabThen(data);
-                        }
-                      }
-                      else if (data.rtnCode === 202) {
-                        self.$common.confirm(data.rtnMsg, '提示', {
-                          confirmButtonText: '确定',
-                          cancelButtonText: '取消',
-                          type: 'warning'
-                        }).then(() => {
-                          field.doAction(self.getFormObj({ flagHaveAlert: '1' }), (res) => {
-                            if (res.rtnCode === 200) {
-                              if (res.notification === 17) {
-                                self.clickHandler(self.model.getRtnRouter(res.content), null)
-                              }
-                              else {
-                                self.$emit('submit', { formData: self.model, responseData: res });
-                              }
-                            }
-                          });
-                        }).catch(() => {
-                        });
-                      }
-                    }, self.model.scripts);
+                      }, self.model.scripts);
+                    }
+
                   }
                   //无值，触发submit事件
                   else {

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

@@ -38,7 +38,7 @@
                   <ct-tablecurrency :router="v.router" :colValue="scope.row[v.id].code1" :rowData="scope.row" @click="rolRouterClickHandler">
                   </ct-tablecurrency>
                 </span>
-                <ct-span v-else :vmodel="scope.row[v.id]" :rowNum="scope.row.$sourceIndex" :key="scope.row[v.id].rowKey" ref="FieldsLabel"></ct-span>
+                <ct-span v-else :vmodel="scope.row[v.id]" :rowNum="scope.row.$sourceIndex" :rowData="scope.row" :key="scope.row[v.id].rowKey" ref="FieldsLabel"></ct-span>
               </template>
             </el-table-column>
 
@@ -74,6 +74,7 @@
     props: {
       vmodel: Object,
       rowNum: String,
+      rowData: Object,
     },
     data: function () {
       return {
@@ -84,9 +85,12 @@
         if (this.vmodel.is === "ct-inputNumber") {
           return 'ct-table-inputnumber';
         }
+      },      
+      getFontColor() {
+        return this.rowData.fontColor || '';
       }
     },
-    template: '<div :class="getClass()">{{vmodel.labelValue}}{{vmodel.unitName}}</div>'
+    template: '<div :class="getClass()" :style="{\'color\':getFontColor()}">{{vmodel.labelValue}}{{vmodel.unitName}}</div>'
   }
 
   export default {

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

@@ -127,6 +127,7 @@ const FormList = function (source, master) {
       var row = {
         field: [],
         isSet: false,
+        fontColor: r.fontColor,
         get delete() {//删除权限
           return r.rightDelete === true;
         },
@@ -194,6 +195,7 @@ const FormList = function (source, master) {
             Vue.set(row, 'isSet', false);
             Vue.set(row, 'edit', rows[i].edit);
             Vue.set(row, 'delete', rows[i].delete);
+            Vue.set(row, 'fontColor', rows[i].fontColor);
             this._tableData.push(row);
           }
         }

package/src/main.js

@@ -12,7 +12,7 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: "http://10.88.22.46:7070/max-uplink-api/v1/form/router",
+  baseUrl: "http://10.88.22.13: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.69:8080/api/", 
@@ -42,8 +42,8 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '3f518e5b-85c3-4a3e-9aa2-d476c6e43b75',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjEOgkAQRe8yNZMw7mRmlk4XbDwEWdg1wcoIJBrj3dUIHb2veMVr_n_COHdQgS7ghlZav4AbWmmJ2CtJg3uvAVnYoVEwDCyBj3XjwqGGAvL9ChWJEimbKwsY4vQLpRl_wzzm2yk__nHuMg2fWeoT5bNEjJoEOfWGplpiktg7z7LrjOD1BgAA__8.GYKnl1m1p9DYoV4G8e7guCAXfIZblTzhcpUhjbliuX0',
+        oldToken: '9a73e482-db16-4a24-81e7-67daef02b64d',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjrsOgkAQRf9laiaZYWdfdLpg40eQFYcEKyOQaIz_rkbo6D3FKU5z7xPG-QQV-AXc0EobF3BDKy2zRM-uwV30CcWJwcApYBKX5FA3Ju1rKEDvV6jYeS5FxJQFDHn6BbaBvmEe9XbUxz_OXabhM2ujNeQ7RSE6o0QizJ0ocu6You-1dxZebwAAAP__.vkp7C4-AbNZcFXOUNh7GhACgGYct_lCq8lYCyLOdfSg',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',