epx-frame 4.0.0 → 4.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/epx-frame.common.js +1 -1
- package/lib/formula.js +8 -4
- package/lib/page.js +8 -4
- package/package.json +1 -1
package/lib/formula.js
CHANGED
|
@@ -1092,15 +1092,19 @@ function formatI18nConfig(configs, language) {
|
|
|
1092
1092
|
var tabClient = this.$tab.CLIENT;
|
|
1093
1093
|
var routeClient = this.$route.query.client;
|
|
1094
1094
|
var userClient = this.user.client;
|
|
1095
|
-
var
|
|
1096
|
-
|
|
1095
|
+
var _this$appConfig = this.appConfig,
|
|
1096
|
+
appClient = _this$appConfig.CLIENT,
|
|
1097
|
+
clientId = _this$appConfig['CLIENT|ID'];
|
|
1098
|
+
return queryClient || tabClient || routeClient || userClient || appClient || clientId;
|
|
1097
1099
|
},
|
|
1098
1100
|
SYSTEM: function SYSTEM() {
|
|
1099
1101
|
var querySystem = this.$query.SYSTEM;
|
|
1100
1102
|
var tabSystem = this.$tab.SYSTEM;
|
|
1101
1103
|
var routeSystem = this.$route.query.system;
|
|
1102
|
-
var
|
|
1103
|
-
|
|
1104
|
+
var _this$appConfig2 = this.appConfig,
|
|
1105
|
+
appSystem = _this$appConfig2.SYSTEM,
|
|
1106
|
+
systemId = _this$appConfig2['SYSTEM|ID'];
|
|
1107
|
+
return querySystem || tabSystem || routeSystem || appSystem || systemId;
|
|
1104
1108
|
},
|
|
1105
1109
|
/**
|
|
1106
1110
|
* 选中标签页
|
package/lib/page.js
CHANGED
|
@@ -977,15 +977,19 @@ function formatI18nConfig(configs, language) {
|
|
|
977
977
|
var tabClient = this.$tab.CLIENT;
|
|
978
978
|
var routeClient = this.$route.query.client;
|
|
979
979
|
var userClient = this.user.client;
|
|
980
|
-
var
|
|
981
|
-
|
|
980
|
+
var _this$appConfig = this.appConfig,
|
|
981
|
+
appClient = _this$appConfig.CLIENT,
|
|
982
|
+
clientId = _this$appConfig['CLIENT|ID'];
|
|
983
|
+
return queryClient || tabClient || routeClient || userClient || appClient || clientId;
|
|
982
984
|
},
|
|
983
985
|
SYSTEM: function SYSTEM() {
|
|
984
986
|
var querySystem = this.$query.SYSTEM;
|
|
985
987
|
var tabSystem = this.$tab.SYSTEM;
|
|
986
988
|
var routeSystem = this.$route.query.system;
|
|
987
|
-
var
|
|
988
|
-
|
|
989
|
+
var _this$appConfig2 = this.appConfig,
|
|
990
|
+
appSystem = _this$appConfig2.SYSTEM,
|
|
991
|
+
systemId = _this$appConfig2['SYSTEM|ID'];
|
|
992
|
+
return querySystem || tabSystem || routeSystem || appSystem || systemId;
|
|
989
993
|
},
|
|
990
994
|
/**
|
|
991
995
|
* 选中标签页
|