centaline-data-driven 1.1.57 → 1.1.61

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

@@ -8,11 +8,17 @@ const Detail = function (source,para ,callBack) {
   var init = function (data) {
     var rtn = {
         _fields1Dic: null,//字典，方便取值,属性集合(用户固定部分)
-        _fields2Dic: null,//字典，方便取值,属性集合(用户动态部分)
+        _fields2Dic: null,//数组，方便遍历 
         _actionRouterLabel: null,//标签
         _otherTradeActionRouter: null,//对应另外种交易的 router 如：本盘出售 则可能对应的出租的交易，没有则为空
         _actionRouters:null,//页面上的动作行为
         _actionRoutersMoreList:null,//页面上的更多动作行为
+        detailHeight:750,
+        activeIndex:'0',
+        searchlistKey:0,
+        _searchConditionApiTags1:null,
+        _searchDataApiTags1:null,
+        _paramDataTags1:null,
         get fields1() {
             return data.fields1;
         },
@@ -56,7 +62,7 @@ const Detail = function (source,para ,callBack) {
                 return rtn._fields2Dic;
             }
             if (rtn.fields2) {
-                rtn._fields2Dic = {};
+                rtn._fields2Dic = [];
                 rtn.fields2.forEach((f) => {
                     let col = {
                         get label() {
@@ -66,7 +72,14 @@ const Detail = function (source,para ,callBack) {
                           return f.labelDelimiter || '';
                         },
                         get value() {
-                            return f.code1;
+                            let v=f.code1;
+                            if(f.name1){
+                                v=f.name1;
+                            }
+                            if(f.unitName1 && v){
+                                v=v+f.unitName1;
+                            }
+                            return v;
                         },
                         get unitName() {
                             if(this.value===undefined || this.value===''){
@@ -75,7 +88,7 @@ const Detail = function (source,para ,callBack) {
                             return f.unitName1;
                         },
                     }
-                    rtn._fields2Dic[f.fieldName1] = base.copy(Base(f), col);
+                    rtn._fields2Dic.push(base.copy(Base(f), col));
                 });
             }
             return rtn._fields2Dic;
@@ -153,6 +166,46 @@ const Detail = function (source,para ,callBack) {
                 return rtn._actionRoutersMoreList;
             }
         },
+        get tags1() {
+            return data.tags1;
+        },
+        get searchConditionApiTags1() {
+          if (rtn._searchConditionApiTags1 !==null){
+            return rtn._searchConditionApiTags1;
+          }
+          else if(rtn.tags1 && rtn.tags1.length>0){
+            rtn._searchConditionApiTags1= rtn.tags1[0].searchConditionApiUrl;
+            return rtn._searchConditionApiTags1;
+          }
+        },
+        set searchConditionApiTags1(v) {
+            rtn._searchConditionApiTags1 = v;
+        },
+        get searchDataApiTags1() {
+          if (rtn._searchDataApiTags1 !==null){
+            return rtn._searchDataApiTags1;
+          }
+          else if(rtn.tags1 && rtn.tags1.length>0){
+            rtn._searchDataApiTags1= rtn.tags1[0].searchDataApiUrl;
+            return rtn._searchDataApiTags1;
+          }
+        },
+        set searchDataApiTags1(v) {
+            rtn._searchDataApiTags1 = v;
+        },
+        get paramDataTags1() {
+          if (rtn._paramDataTags1){
+            return rtn._paramDataTags1;
+          }
+          else if(rtn.tags1 && rtn.tags1.length>0){
+            rtn._paramDataTags1= JSON.parse(rtn.tags1[0].paramData);
+            return rtn._paramDataTags1;
+          }
+        },
+        set paramDataTags1(v) {
+            rtn._paramDataTags1={};
+            if(v)rtn._paramDataTags1 = JSON.parse(v);
+        },
     };
     return rtn;
   }

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

@@ -1,5 +1,5 @@
 import base from '../../index';
-import Base from './Base';
+import Base from './Base';
 
 const PlaceHolder = function (source) {
   var rtn = {
@@ -14,4 +14,4 @@ const PlaceHolder = function (source) {
   return rtn;
 };
 
-export default PlaceHolder;
+export default PlaceHolder;

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

@@ -494,7 +494,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         var searchFields = this.searchModel ? this.searchModel.searchData : { fields: [] };
         if (self.primaryKey) {
           searchFields.fields.push({
-            fieldName1: self.primaryKey,
+            fieldName1: self.primaryFieldMappingDBName?self.primaryFieldMappingDBName:self.primaryKey,
             groupName: self.primaryKey,
             operation: 2,
             searchDataType: 3,
@@ -563,6 +563,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
       get primaryKey() {
         return common.initialsToUpperCase(source.content.primaryFieldName);
       },
+      get primaryFieldMappingDBName() {
+        return source.content.primaryFieldMappingDBName;
+      },
       get $index() {
         if (this.$rowCount > 0) {
           return this.selectIndex + 1;
@@ -743,6 +746,21 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
         }
       },
       formData:formData,
+      get tdClass() {
+        let c='';
+        if (source.content.lineType !== undefined && source.content.lineType !== null) {
+          if (source.content.lineType===Enum.LineType.Vertical) {
+            c='ct-td1';
+          }
+          else if (source.content.lineType===Enum.LineType.Horizon) {
+            c='ct-td2';
+          }
+          else if (source.content.lineType===Enum.LineType.Both) {
+            c='ct-td3';
+          }
+        }
+        return c;
+      },
     };
     if (rtn.template) {
       var tempLoader = template.loader(rtn.template).default;

package/src/centaline/loader/src/ctl/lib/Enum.js

@@ -554,7 +554,24 @@ const Enum = {
     //窗口
     Dialog : 20,
   },
-
+  LineType:{
+    /**
+     * 不显示线条
+     */
+    None:0,
+    /**
+     * 竖线
+     */
+    Vertical:1,
+    /**
+     * 横线
+     */
+    Horizon:2,
+    /**
+     * 横线和竖线
+     */
+    Both:3,
+  },
 };
 
 if (typeof window !== 'undefined' && window.Vue) {

package/src/main.js

@@ -12,7 +12,8 @@ Vue.use(ElementUI, { size: 'mini'});
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;
 Vue.use(centaline, {
-  baseUrl: 'http://10.88.23.22:9999/v1/form/router',
+  baseUrl: "http://10.88.22.46:7070/v1/form/router",
+  // baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",
   zindex: 999,
   showRequestErrorMessage: true,
   handler: {
@@ -20,6 +21,12 @@ Vue.use(centaline, {
     openTab: function (action) {
       alert("打开tab页:" + action)
     },
+    openDetail: function (action) {
+      alert("打开tab页:" + action)
+    },
+    openPropertyDetailRET: function (submitData, pageTitle, parentModel) {
+      alert("打开tab页:" + pageTitle)
+    },
     // 关闭当前tab
     closeTab: function () {
       alert("关闭当前tab")
@@ -27,9 +34,10 @@ Vue.use(centaline, {
     // 获取请求头
     getRequestHeaders: function () {
       return {
-        Authorization: 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjFiNTBiODcyLTdhZDAtNDIzZC05MDBhLTU1NzUwOTA0OTMyNSJ9.yQA99wDa3a-dZKSemFOrWZxyKZ6NtWmYVehf10OSUK8eO8Par7aZqboxCNMfEjIlXDGu5NH9u0KFcHQ7_17YMg',
-        originalRequestURL: 'http://10.88.23.22:9999',
-        EstateInfo: '{"estateId":"201509230915485D942241BBA30FF49F","estateName":"A-%E7%88%B1%E7%90%B4%E6%B5%B7B%E7%BB%84"}'
+        oldToken: '3007e478-86db-4d5a-8ce0-7253afb746b2',
+        estateId: '20210729104021C49F04B55C50F6AF58',
+        originalRequestURL: 'http://10.88.22.67:8080',
+        Authorization:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE0NmU5ZjEzLTVjMmYtNGVlMy1hM2U5LWIxM2QyZThjZTBhZSJ9.Gl8K5lbG7t5DyCqouu7Ux7Oh9xuAxqdOXr4JnoHCN-YwC3b2zPO-C2sHbYJUZHYQPa7kTNRmg1xJiwugpVo5Xw',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作