ecinc-cloud-mappaio 9.6.88 → 9.6.89
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/ecmappaio.common.js
CHANGED
|
@@ -299,7 +299,7 @@ function generateTitle(meta, $scope, moduleCode, i18npkg, variables) {
|
|
|
299
299
|
$scope = $scope || this;
|
|
300
300
|
if ($scope.$i18n && $scope.$i18n.locale === 'zhCN') {
|
|
301
301
|
//中文，按钮，忽略语言包
|
|
302
|
-
if (meta.btnName) {
|
|
302
|
+
if (meta.btnName && meta.btnName.indexOf('.') === -1) {
|
|
303
303
|
return meta.btnName;
|
|
304
304
|
}
|
|
305
305
|
}
|
|
@@ -6145,7 +6145,6 @@ function connectWebSocket(scope) {
|
|
|
6145
6145
|
}
|
|
6146
6146
|
|
|
6147
6147
|
// 创建连接
|
|
6148
|
-
if (!window.deviceId) window.deviceId = 'web';
|
|
6149
6148
|
console.log('创建连接===', wsurl + loginUser.userId + '_' + (window.deviceId || 'web'));
|
|
6150
6149
|
wsSocket = new WebSocket(wsurl + loginUser.userId + '_' + (window.deviceId || 'web'), protocols, options);
|
|
6151
6150
|
|
package/lib/ecmappaio.umd.js
CHANGED
|
@@ -309,7 +309,7 @@ function generateTitle(meta, $scope, moduleCode, i18npkg, variables) {
|
|
|
309
309
|
$scope = $scope || this;
|
|
310
310
|
if ($scope.$i18n && $scope.$i18n.locale === 'zhCN') {
|
|
311
311
|
//中文，按钮，忽略语言包
|
|
312
|
-
if (meta.btnName) {
|
|
312
|
+
if (meta.btnName && meta.btnName.indexOf('.') === -1) {
|
|
313
313
|
return meta.btnName;
|
|
314
314
|
}
|
|
315
315
|
}
|
|
@@ -6155,7 +6155,6 @@ function connectWebSocket(scope) {
|
|
|
6155
6155
|
}
|
|
6156
6156
|
|
|
6157
6157
|
// 创建连接
|
|
6158
|
-
if (!window.deviceId) window.deviceId = 'web';
|
|
6159
6158
|
console.log('创建连接===', wsurl + loginUser.userId + '_' + (window.deviceId || 'web'));
|
|
6160
6159
|
wsSocket = new WebSocket(wsurl + loginUser.userId + '_' + (window.deviceId || 'web'), protocols, options);
|
|
6161
6160
|
|