centaline-data-driven 1.3.21 → 1.3.24

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

@@ -12,6 +12,8 @@ const Detail = function (source, para, callBack) {
       _fields2Dic: null,//数组，方便遍历 
       _actionRouterLabel: null,//标签
       _otherTradeActionRouter: null,//对应另外种交易的 router 如：本盘出售 则可能对应的出租的交易，没有则为空
+      _actionRoutersAll: null,//页面上的动作行为
+      _actionRoutersShow: null,//页面上的动作行为
       _actionRouters: null,//页面上的动作行为
       _actionRoutersMoreList: null,//页面上的更多动作行为
       _actionRoutersSimple: null,//页面上的动作行为
@@ -187,23 +189,65 @@ const Detail = function (source, para, callBack) {
           return rtn._contactApiRouter;
         }
       },
+      get actionRoutersAll() {
+        if (rtn._actionRoutersAll !== null) {
+          return rtn._actionRoutersAll;
+        }
+        else {
+          if (data.actionRouters) {
+            rtn._actionRoutersAll = [];
+            data.actionRouters.forEach((v, i) => {
+              var router = Router(v);
+              router.is = "ct-btn";
+              router.attrs = { size: "mini" }
+              rtn._actionRoutersAll.push(router);
+            });
+          }
+        }
+        return rtn._actionRoutersAll;
+      },
+      get actionRoutersShow() {        
+        if (rtn._actionRoutersShow !== null) {
+          return rtn._actionRoutersShow;
+        }
+        else {
+          if (data.actionRouters) {
+            rtn._actionRoutersShow = [];
+            data.actionRouters.forEach((v, i) => {
+              var router = Router(v);
+              router.is = "ct-btn";
+              router.attrs = { size: "mini" }
+              if (router.show) {
+                rtn._actionRoutersShow.push(router);
+              }
+            });
+          }
+        }
+        return rtn._actionRoutersShow;
+      },
+      get actionRouterPrice() {
+        let routerPrice=null; 
+        if (rtn.actionRoutersAll) {
+          rtn.actionRoutersAll.forEach((v, i) => {
+            if(v.id=='PropertyPriceLog') routerPrice=v;
+          });
+        }
+        return routerPrice;
+      },
       get actionRouters() {
         if (rtn._actionRouters !== null) {
           return rtn._actionRouters;
         }
         else {
-          if (data.actionRouters) {
+          if (rtn.actionRoutersShow) {
             rtn._actionRouters = [];
             let indexMore = 1;
-            if (data.actionRouters.length <= 3) {
+            if (rtn.actionRoutersShow.length <= 3) {
               indexMore = 2;
             }
-            data.actionRouters.forEach((v, i) => {
+            rtn.actionRoutersShow.forEach((v, i) => {
               if (i <= indexMore) {
-                var router = Router(v);
-                router.is = "ct-btn";
-                router.attrs = { size: "mini" }
-                rtn._actionRouters.push(router);
+                rtn._actionRouters.push(v);
               }
             });
           }
@@ -215,14 +259,11 @@ const Detail = function (source, para, callBack) {
           return rtn._actionRoutersMoreList;
         }
         else {
-          if (data.actionRouters && data.actionRouters.length > 3) {
+          if (rtn.actionRoutersShow && rtn.actionRoutersShow.length > 3) {
             rtn._actionRoutersMoreList = [];
-            data.actionRouters.forEach((v, i) => {
+            rtn.actionRoutersShow.forEach((v, i) => {
               if (i >= 2) {
-                var router = Router(v);
-                router.is = "ct-btn";
-                router.attrs = { size: "mini" }
-                rtn._actionRoutersMoreList.push(router);
+                rtn._actionRoutersMoreList.push(v);
               }
             });
           }

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

@@ -0,0 +1,35 @@
+import base from '../../index';
+import Base from './Base';
+import valid from '../../../validate/index';
+const DragSort = function (source) {
+  var init = function (data) {
+    var rtn = {
+      get tableCol() {
+        let l = '';
+        if (source.controlLabel) {
+          l = source.controlLabel;
+        }
+        if (source.labelDelimiter) {
+          l = l + source.labelDelimiter;
+        }
+
+        return [{
+          prop: 'displayName',
+          label: l
+        }];
+      },
+      get dragList() {
+        return source.code1;
+      },
+      set dragList(v) {
+        source.code1 = v;
+      },
+    };
+    rtn = base.copy(Base(source), rtn);
+    rtn = base.copy(rtn, valid.Init(rtn));
+    return rtn;
+
+  };
+  return init(source);
+}
+export default DragSort;

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

@@ -608,6 +608,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
                     for (var vkey in row) {
                       rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
                     }
+                    for (var vkey in rtn.dataDictionary[row[rtn.primaryKey]]) {
+                      rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey]||'';
+                    }
                   });
                   if (rtn.cellLayout) {
                     rtn.$vue.$set(rtn.listData, rtn.selectIndex, rtn.dataDictionary[searchValue1]);
@@ -631,7 +634,6 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
             }
           })
           .catch((error) => {
-            console.error(error);
             if (typeof callback !== 'undefined') {
               callback();
             }

package/src/main.js

@@ -43,8 +43,8 @@ Vue.use(centaline, {
       return {
         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.eyJsb2dpbl91c2VyX2tleSI6ImVjODhjOTI1LTU3OTktNDVmNy1iNDI3LWI3M2QwNGVkNWM2NSJ9.fyndFOEg4ThBHv4N2pi3pmPaWWlcD1CVPsYu0G5BKAB1hAgkL_GpOMpCZB5xdjMJLbBVomdoUjnRY7T6JSZb-g',
+        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',
       };
     },
     // 请求完成事件，可判断是否登录过期执行响应操作