centaline-data-driven 1.3.31 → 1.3.32

package/package.json

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

package/src/Form.vue

@@ -14,11 +14,7 @@
     data() {
       return {
         apiParam:{
-actionType: 3,
-originalTraId: "1547488795469586434",
-pageOnly: true,
-pageStyle: 2,
-pageTitle: "成交报告"
+originalTraId:"1541678215431274497",actionType:3,pageStyle:2,pageTitle:"成交报告",pageOnly:true
           }
       }
     },

package/src/SearchList.vue

@@ -8,15 +8,15 @@
     :searchCategoryApi="'/ProfileWorklistList/getLayoutOfSearchCategory'"
     :searchDataApi="'/ProfileWorklistList/getListOfSearchModel'" :apiParam="para"></ct-searchlist> -->
 
-    <!-- <ct-searchlist :searchConditionApi="'/PropertyContactImportList/getLayoutOfSearch'" 
+    <ct-searchlist :searchConditionApi="'/PropertyContactImportList/getLayoutOfSearch'" 
       :searchDataApi="'/PropertyContactImportList/getListOfSearchModel'">
-    </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/dynamicSearchList/src/dynamicSearchTable.vue

@@ -842,12 +842,24 @@ export default {
           else if (field.isSeeVoice) {//看视频
             self.$common.browseVideo(field, submitData);
           } 
-          else if (field.isBrowseAttachment) {//浏览附件
-            var MediaAlbum = [{ albumName: self.model.title || "媒体", medias: [] },];
-            submitData.mediaData.forEach((v) => {
-              MediaAlbum[0].medias.push(v);
-            });
-            self.$common.viewerfile(field, MediaAlbum, 0, 0);
+          else if (field.isBrowseAttachment) {
+		   //浏览附件
+            var MediaAlbum = [
+              { albumName: self.model.title || "媒体", medias: [] },
+            ];
+            if (field.action) {
+              var callback = function (data) {
+                MediaAlbum[0].medias = data;
+                self.$common.viewerfile(field, MediaAlbum, 0, 0);
+              }
+              self.model.getAction(field.action, submitData, callback);
+            }
+            else {
+              submitData.mediaData.forEach((v) => {
+                MediaAlbum[0].medias.push(v);
+              });
+              self.$common.viewerfile(field, MediaAlbum, 0, 0);
+            }
           } 
           else if (field.isUrlInLayer) {//URL页面（弹层）
             var dialogOption = {
@@ -902,11 +914,20 @@ export default {
               self.model.export(field, submitData);
             }
             else{
-              field.doAction(submitData, (data) => {
-                if(data.content){
-                  window.open(data.content, "_blank");
-                }
-              });
+              if(field.action.indexOf("http://")===0 || field.action.indexOf("https://")===0){
+                window.open(field.action, "_blank");
+              }
+              else{
+                field.doAction(submitData, (data) => {
+                  if(data.content){
+                    if(data.content.indexOf("http://")===0 || data.content.indexOf("https://")===0){
+                      window.open(data.content, "_blank");
+                    }
+                    else{
+                    }
+                  }
+                });
+              }
             }
           }
           else {

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

@@ -526,7 +526,11 @@ const FormList = function (source, master) {
                   rowData.delete = iRow.delete;
                   source.rows.splice(i, 1,row);
                   rtn._rows.splice(i, 1,iRow);
-                  rtn._tableData.splice(i-1, 1,rowData);
+                  rtn.tableData.forEach((d,index) => {
+                    if(d.$sourceIndex===r.$sourceIndex){
+                      rtn.tableData.splice(index, 1,rowData);
+                    }
+                  });    
                 }
               }
             }

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

@@ -40,7 +40,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get columns() {
         var self = this;
         if (typeof source.content.columns !== 'undefined') {
-          if (self._columns.length > 0 ) {
+          if (self._columns.length > 0) {
             return self._columns;
           } else {
             var lockLeft = true;
@@ -732,6 +732,25 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           }
         }
       },
+      getAction(api, submitData, callback) {
+        Vue.prototype.$api.postHandler(common.globalUri(), {
+            action: api,
+            para: submitData
+          })
+          .then(function (response) {
+            if (response.rtnCode === Enum.ReturnCode.Successful) {
+              if (typeof callback !== 'undefined') {
+                callback(response.content);
+              }
+            }
+          })
+          .catch((error) => {
+            console.error(error);
+            if (typeof callback !== 'undefined') {
+              callback();
+            }
+          });
+      },
       doAction(response) {
         if (response.responseData) {
           response = response.responseData;
@@ -816,11 +835,10 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
           }
         });
       },
-      export(btn, submitData) {
-        Vue.prototype.$api.postHandler(common.globalUri(),
-          {
-            action: btn.action,
-            para: submitData
+      export (btn, submitData) {
+        Vue.prototype.$api.postHandler(common.globalUri(), {
+          action: btn.action,
+          para: submitData
         });
       },
       _scripts: null,

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.69:8080/", 
-  // flagRouterSelf: true,
+  baseUrl: "http://10.88.22.69:8080/", 
+  flagRouterSelf: true,
   zindex: 999,
   showRequestSuccessMessage: true,
   showRequestErrorMessage: true,
@@ -41,7 +41,7 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        oldToken: '0e5e2554-abe0-4538-8520-e024f82389b3',
+        oldToken: '6c09a5a6-8bb2-46af-beed-9efd51a28263',
         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.eyJsb2dpbl91c2VyX2tleSI6IjYzMzZiMDJiLTZjOGEtNDIzNC05MGQ5LTliYWI2MTIyNTQzNyJ9.hOxMvGLm03QMPu9C4lgRzkEHC7ECqxJ_L6mfqQRqv39xJ42I8gzSRO-E68vWp-A99ewnxnqvTZ6H_6fOQ9DljQ',