centaline-data-driven 1.4.66 → 1.4.68

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

@@ -62,17 +62,10 @@ const Router = function (source) {
     set show(v) {
       source.hidden = !v;
     },
-    get actionType() {
-      return source.actionType;
-    },
-    get isImport() {
-      return source.actionType === Enum.ActionType.Import;
-    },
-    get isExport() {
-      return source.actionType === Enum.ActionType.Export;
-    },
-    get isRefreshParent() {
-      return source.actionType === Enum.ActionType.RefreshParent;
+
+    //pageStyle
+    get pageStyle() {
+      return source.pageStyle;
     },
     get isOpenForm() {
       return source.pageStyle === Enum.PageStyle.FormPageInLayer;
@@ -101,6 +94,29 @@ const Router = function (source) {
     get isUrlInSystemTab() {
       return source.pageStyle === Enum.PageStyle.UrlInSystemTab;
     },
+    get isTabInSystem() {
+      return source.pageStyle === Enum.PageStyle.TabInSystem;
+    },
+    get isTabInBrowse() {
+      return source.pageStyle === Enum.PageStyle.TabInBrowse;
+    },
+    get isLayerInSystem() {
+      return source.pageStyle === Enum.PageStyle.LayerInSystem;
+    },
+
+    //actionType
+    get actionType() {
+      return source.actionType;
+    },
+    get isImport() {
+      return source.actionType === Enum.ActionType.Import;
+    },
+    get isExport() {
+      return source.actionType === Enum.ActionType.Export;
+    },
+    get isRefreshParent() {
+      return source.actionType === Enum.ActionType.RefreshParent;
+    },
     get isOpenUrlInBrowse() {
       return source.actionType === Enum.ActionType.OpenUrlInBrowse;
     },
@@ -119,6 +135,11 @@ const Router = function (source) {
     get isCallTel() {
       return source.actionType === Enum.ActionType.CallTel;
     },
+    get isOpenBaiduMap() {
+      return source.actionType === Enum.ActionType.OpenBaiduMap;
+    },
+
+
     //打开页面（1Form,2SearchList（弹在tab）,3Tab,4执行客户端脚本,5SearchList(弹出)）
     get navToNewPage() {
       return source.navToNewPage;
@@ -153,9 +174,6 @@ const Router = function (source) {
     get pageTitle() {
       return source.pageTitle;
     },
-    get pageStyle() {
-      return source.pageStyle;
-    },
     //是否附带本页面的SearchLayout
     get flagAttachSearchCondition() {
       return source.flagAttachSearchCondition === true;

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

@@ -79,8 +79,7 @@ const SearchScreen = function (source, callBack, screenPara) {
         return this._sourceFieldsArr;
       },
       //表单组件
-      get screen() {
-        
+      get screen() {        
         if (this._screen !== null) {
           return this._screen;
         }
@@ -100,9 +99,6 @@ const SearchScreen = function (source, callBack, screenPara) {
             }
           } catch (e) {
           }
-          
-        
-
         });
         this._screen = rtnscreens;
         return rtnscreens;
@@ -228,8 +224,7 @@ const SearchScreen = function (source, callBack, screenPara) {
         });
         return rtn;
       },
-      getNewSearchValue(tempObj)
-      {
+      getNewSearchValue(tempObj){
           let codeList=JSON.parse(tempObj.searchValue1);
           let dataType=this.getDataType(tempObj.searchDataType);
           let code='';
@@ -258,8 +253,7 @@ const SearchScreen = function (source, callBack, screenPara) {
          return code;
       },
       //判断控件是否需要单独处理searchValue1
-      isHandle(type)
-      {
+      isHandle(type){
         let result=false;
         switch (type) 
         {
@@ -302,6 +296,7 @@ const SearchScreen = function (source, callBack, screenPara) {
           
           if (item instanceof Object) {
             item.form = rtn;
+            rtn.hiddenHandle(item);//是否隐藏关联组件
             rtnscreens.push(item);
           }
         });
@@ -357,6 +352,83 @@ const SearchScreen = function (source, callBack, screenPara) {
           }
         }
       },
+      //隐藏关联组件
+      hiddenHandle(item, update) {
+        if (item.id) {
+          let sign = false;
+          let field = null;
+
+          if(rtn.sourceFieldsArr){
+            for (var i in rtn.sourceFieldsArr) {
+              if (rtn.sourceFieldsArr[i].hiddenRelationField === item.id) {
+                field = rtn.sourceFieldsArr[i];
+
+                if (field) {
+                  let hiddenValueArr = field.hiddenRelationFieldValue.split(',');
+                  if (hiddenValueArr.indexOf(item.code1) > -1) {
+                    field.show = false;
+                  }
+                  else {
+                    field.show = true;
+                  }
+                  sign = true;
+
+                  if (update && rtn.self && sign) {
+                    rtn.self.$forceUpdate();
+                  }
+                }
+              }
+            }
+          }
+
+          if(rtn._screen){
+            for (var i in rtn._screen) {
+              if (rtn._screen[i].hiddenId === item.id) {
+                field = rtn._screen[i];
+
+                if (field) {
+                  let hiddenValueArr = field.hiddenValue.split(',');
+                  if (hiddenValueArr.indexOf(item.code1) > -1) {
+                    field.show = false;
+                  }
+                  else {
+                    field.show = true;
+                  }
+                  sign = true;
+
+                  if (update && rtn.self && sign) {
+                    rtn.self.$forceUpdate();
+                  }
+                }
+              }
+            }
+          }
+          
+          if(rtn._highScreen){
+            for (var i in rtn._highScreen) {
+              if (rtn._highScreen[i].hiddenId === item.id) {
+                field = rtn._highScreen[i];
+
+                if (field) {
+                  let hiddenValueArr = field.hiddenValue.split(',');
+                  if (hiddenValueArr.indexOf(item.code1) > -1) {
+                    field.show = false;
+                  }
+                  else {
+                    field.show = true;
+                  }
+                  sign = true;
+
+                  if (update && rtn.self && sign) {
+                    rtn.self.$forceUpdate();
+                  }
+                }
+              }
+            }
+          }
+
+        }
+      },
     };
     return rtn;
   };

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

@@ -415,6 +415,11 @@ const Enum = {
     ///  更新表格的列
     /// </summary>
     UpdateColumns: 24,
+
+    /**
+    * 打开百度地图
+    */
+    OpenBaiduMap:100,
   },
 
   /// <summary>
@@ -568,6 +573,19 @@ const Enum = {
     ///  根据 Action 的Url在系统内新开Tab页面
     /// </summary>
     UrlInSystemTab: 9,
+
+    /**
+     * 在系统内TAB打开
+     */
+    TabInSystem:100,
+    /**
+     * 在浏览器TAB打开
+     */
+    TabInBrowse:110,
+    /**
+     * 在系统弹层打开
+     */
+    LayerInSystem:120,
   },
 
   /// <summary>

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

@@ -130,7 +130,6 @@ export default {
   position: absolute;
   top: 50%;
   left: 50%;
-  margin-top: -10px;
-  margin-left: -15px;
+  transform: translate(-50%,-50%); 
 }
 </style>

package/src/centaline/quickInputSos/src/quickInput.vue

@@ -57,6 +57,7 @@ export default {
     }
     this.model.searchInputHeight = 26;
     this.model.$self=this;
+    this.getOptions()
   },
   updated(){
     this.model.value=this.textValue;

package/src/main.js

@@ -13,6 +13,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.6.1.162:17070/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/", 
@@ -47,7 +48,7 @@ Vue.use(centaline, {
     getRequestHeaders: function () {
       return {
         oldToken: '3ba3f510-93fd-4103-9249-73c13f3f6fc2',
-        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzk0KwjAQBeC7ZN2BZn4yE3epaTYeolQbQVdiKyji3W3xEG4_Hu-9t5sfR7dz1GknWRRCEgbGnsGyFuCQWbNp2SceQpGMqAqkxWDvWwLElKHdopQpBm2HzDEZMsFKtDb5HqyjBChsTEU4qrjG1efN7XxQI-QosXGXcfkBkskGj7neD_X1j3PX5bLO8oiep5OC-MmAz4hwRKswhRFHCZX0dHafLwAAAP__.shTXzeB9x00F9bs4SvdWhHe0KlzLxaL0F0y0EW4LXUM',
+        token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEzjsOwjAQRdG9uGYkZ_5D58SkYRGIRC6gQhAkEGLvBDZBe4r73ivd7lPapkBTZyYYdj0B12LQa5dh0ChSvKD2ctBRKqIZkI0OQ5cJEEuF7NVGqhRq-VA5iuNaWmktYbcD76kACjvTKBwmaZPa45K2nVpkRFfapNNx-YEHKX_hfmvXfXv-49x5Oa2zgpjRZofZvQGbzeBNMshkIXGc8uya3h8AAAD__w.-YYww1TP8xFOBRi6Z5m-EdRD5lKgsvRr83bsRQIcV_A',
         
         originalRequestURL: 'http://10.88.22.67:8080',
         EstateInfo: '{"estateId":"FAF029E8-EC28-4297-83CF-B8FFD826DB91","estateName":"AABBCC"}',