ecinc-cloud-mappaio 9.6.87 → 9.6.89

package/lib/ecmappaio.common.js

@@ -299,7 +299,7 @@ function generateTitle(meta, $scope, moduleCode, i18npkg, variables) {
   $scope = $scope || this;
   if ($scope.$i18n && $scope.$i18n.locale === 'zhCN') {
     //中文，按钮，忽略语言包
-    if (meta.btnName) {
+    if (meta.btnName && meta.btnName.indexOf('.') === -1) {
       return meta.btnName;
     }
   }
@@ -6145,7 +6145,6 @@ function connectWebSocket(scope) {
   }
 
   // 创建连接
-  if (!window.deviceId) window.deviceId = 'web';
   console.log('创建连接===', wsurl + loginUser.userId + '_' + (window.deviceId || 'web'));
   wsSocket = new WebSocket(wsurl + loginUser.userId + '_' + (window.deviceId || 'web'), protocols, options);
 
@@ -7000,7 +6999,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".van-textarea-field[data-v-b0aab914]{p
 
 /***/ }),
 
-/***/ 8617:
+/***/ 1877:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7014,7 +7013,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".busi-form-container[data-v-aa9f0f16]{background-color:#f7f8fa;height:100%;position:relative;z-index:10}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".busi-form-container[data-v-490ac5ca]{background-color:#f7f8fa;height:100%;position:relative;z-index:10}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -32351,19 +32350,19 @@ var update = add("32fd27e2", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 5083:
+/***/ 7939:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(8617);
+var content = __webpack_require__(1877);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("45b71082", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("70963184", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -53113,8 +53112,8 @@ PdfTools_src.install = function (Vue) {
   Vue.component(PdfTools_src.name, PdfTools_src);
 };
 /* harmony default export */ var PdfTools = (PdfTools_src);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/index.vue?vue&type=template&id=aa9f0f16&scoped=true
-var srcvue_type_template_id_aa9f0f16_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/index.vue?vue&type=template&id=490ac5ca&scoped=true
+var srcvue_type_template_id_490ac5ca_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -53196,7 +53195,7 @@ var srcvue_type_template_id_aa9f0f16_scoped_true_render = function render() {
     })];
   })], 2) : _vm._e(), _vm.disabledDialog == 0 ? _c('SelectDialog') : _vm._e()], 1);
 };
-var srcvue_type_template_id_aa9f0f16_scoped_true_staticRenderFns = [];
+var srcvue_type_template_id_490ac5ca_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/index.vue?vue&type=script&lang=js
 function Basicform_srcvue_type_script_lang_js_typeof(o) { "@babel/helpers - typeof"; return Basicform_srcvue_type_script_lang_js_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, Basicform_srcvue_type_script_lang_js_typeof(o); }
@@ -53668,7 +53667,7 @@ function Basicform_srcvue_type_script_lang_js_toPrimitive(t, r) { if ("object" !
                               _this.isnew = false;
                               _this.vo.isnew = false;
                               _this.onBasicFormSubmited(_this, _this.vo);
-                              if (saveCallBack === undefined) {
+                              if (!saveCallBack) {
                                 _this.$toast.success(res.message);
                                 if (_this4.callback !== null) {
                                   _this4.callback(res, _this.vo);
@@ -53731,7 +53730,7 @@ function Basicform_srcvue_type_script_lang_js_toPrimitive(t, r) { if ("object" !
                   _this.doing = false;
                 });
               }, function () {
-                if (saveCallBack !== undefined) {
+                if (saveCallBack) {
                   saveCallBack(false);
                 }
               });
@@ -53973,9 +53972,9 @@ function Basicform_srcvue_type_script_lang_js_toPrimitive(t, r) { if ("object" !
 });
 ;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/index.vue?vue&type=script&lang=js
  /* harmony default export */ var ecmapp_Basicform_srcvue_type_script_lang_js = (Basicform_srcvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/index.vue?vue&type=style&index=0&id=aa9f0f16&prod&lang=scss&scoped=true
-var srcvue_type_style_index_0_id_aa9f0f16_prod_lang_scss_scoped_true = __webpack_require__(5083);
-;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/index.vue?vue&type=style&index=0&id=aa9f0f16&prod&lang=scss&scoped=true
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/index.vue?vue&type=style&index=0&id=490ac5ca&prod&lang=scss&scoped=true
+var srcvue_type_style_index_0_id_490ac5ca_prod_lang_scss_scoped_true = __webpack_require__(7939);
+;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/index.vue?vue&type=style&index=0&id=490ac5ca&prod&lang=scss&scoped=true
 
 ;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/index.vue
 
@@ -53988,11 +53987,11 @@ var srcvue_type_style_index_0_id_aa9f0f16_prod_lang_scss_scoped_true = __webpack
 
 var Basicform_src_component = (0,componentNormalizer/* default */.A)(
   ecmapp_Basicform_srcvue_type_script_lang_js,
-  srcvue_type_template_id_aa9f0f16_scoped_true_render,
-  srcvue_type_template_id_aa9f0f16_scoped_true_staticRenderFns,
+  srcvue_type_template_id_490ac5ca_scoped_true_render,
+  srcvue_type_template_id_490ac5ca_scoped_true_staticRenderFns,
   false,
   null,
-  "aa9f0f16",
+  "490ac5ca",
   null
   
 )

package/lib/ecmappaio.umd.js

@@ -309,7 +309,7 @@ function generateTitle(meta, $scope, moduleCode, i18npkg, variables) {
   $scope = $scope || this;
   if ($scope.$i18n && $scope.$i18n.locale === 'zhCN') {
     //中文，按钮，忽略语言包
-    if (meta.btnName) {
+    if (meta.btnName && meta.btnName.indexOf('.') === -1) {
       return meta.btnName;
     }
   }
@@ -6155,7 +6155,6 @@ function connectWebSocket(scope) {
   }
 
   // 创建连接
-  if (!window.deviceId) window.deviceId = 'web';
   console.log('创建连接===', wsurl + loginUser.userId + '_' + (window.deviceId || 'web'));
   wsSocket = new WebSocket(wsurl + loginUser.userId + '_' + (window.deviceId || 'web'), protocols, options);
 
@@ -7010,7 +7009,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".van-textarea-field[data-v-b0aab914]{p
 
 /***/ }),
 
-/***/ 617:
+/***/ 6258:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -7024,7 +7023,7 @@ __webpack_require__.r(__webpack_exports__);
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, ".busi-form-container[data-v-aa9f0f16]{background-color:#f7f8fa;height:100%;position:relative;z-index:10}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, ".busi-form-container[data-v-490ac5ca]{background-color:#f7f8fa;height:100%;position:relative;z-index:10}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -32361,19 +32360,19 @@ var update = add("4624dee2", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 5477:
+/***/ 3721:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 
 // style-loader: Adds some css to the DOM by adding a <style> tag
 
 // load the styles
-var content = __webpack_require__(617);
+var content = __webpack_require__(6258);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(9548)/* ["default"] */ .A)
-var update = add("17881846", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("42673948", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -53123,8 +53122,8 @@ PdfTools_src.install = function (Vue) {
   Vue.component(PdfTools_src.name, PdfTools_src);
 };
 /* harmony default export */ var PdfTools = (PdfTools_src);
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/index.vue?vue&type=template&id=aa9f0f16&scoped=true
-var srcvue_type_template_id_aa9f0f16_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/index.vue?vue&type=template&id=490ac5ca&scoped=true
+var srcvue_type_template_id_490ac5ca_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -53206,7 +53205,7 @@ var srcvue_type_template_id_aa9f0f16_scoped_true_render = function render() {
     })];
   })], 2) : _vm._e(), _vm.disabledDialog == 0 ? _c('SelectDialog') : _vm._e()], 1);
 };
-var srcvue_type_template_id_aa9f0f16_scoped_true_staticRenderFns = [];
+var srcvue_type_template_id_490ac5ca_scoped_true_staticRenderFns = [];
 
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/index.vue?vue&type=script&lang=js
 function Basicform_srcvue_type_script_lang_js_typeof(o) { "@babel/helpers - typeof"; return Basicform_srcvue_type_script_lang_js_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, Basicform_srcvue_type_script_lang_js_typeof(o); }
@@ -53678,7 +53677,7 @@ function Basicform_srcvue_type_script_lang_js_toPrimitive(t, r) { if ("object" !
                               _this.isnew = false;
                               _this.vo.isnew = false;
                               _this.onBasicFormSubmited(_this, _this.vo);
-                              if (saveCallBack === undefined) {
+                              if (!saveCallBack) {
                                 _this.$toast.success(res.message);
                                 if (_this4.callback !== null) {
                                   _this4.callback(res, _this.vo);
@@ -53741,7 +53740,7 @@ function Basicform_srcvue_type_script_lang_js_toPrimitive(t, r) { if ("object" !
                   _this.doing = false;
                 });
               }, function () {
-                if (saveCallBack !== undefined) {
+                if (saveCallBack) {
                   saveCallBack(false);
                 }
               });
@@ -53983,9 +53982,9 @@ function Basicform_srcvue_type_script_lang_js_toPrimitive(t, r) { if ("object" !
 });
 ;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/index.vue?vue&type=script&lang=js
  /* harmony default export */ var ecmapp_Basicform_srcvue_type_script_lang_js = (Basicform_srcvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/index.vue?vue&type=style&index=0&id=aa9f0f16&prod&lang=scss&scoped=true
-var srcvue_type_style_index_0_id_aa9f0f16_prod_lang_scss_scoped_true = __webpack_require__(5477);
-;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/index.vue?vue&type=style&index=0&id=aa9f0f16&prod&lang=scss&scoped=true
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecmapp/Basicform/src/index.vue?vue&type=style&index=0&id=490ac5ca&prod&lang=scss&scoped=true
+var srcvue_type_style_index_0_id_490ac5ca_prod_lang_scss_scoped_true = __webpack_require__(3721);
+;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/index.vue?vue&type=style&index=0&id=490ac5ca&prod&lang=scss&scoped=true
 
 ;// CONCATENATED MODULE: ./packages/ecmapp/Basicform/src/index.vue
 
@@ -53998,11 +53997,11 @@ var srcvue_type_style_index_0_id_aa9f0f16_prod_lang_scss_scoped_true = __webpack
 
 var Basicform_src_component = (0,componentNormalizer/* default */.A)(
   ecmapp_Basicform_srcvue_type_script_lang_js,
-  srcvue_type_template_id_aa9f0f16_scoped_true_render,
-  srcvue_type_template_id_aa9f0f16_scoped_true_staticRenderFns,
+  srcvue_type_template_id_490ac5ca_scoped_true_render,
+  srcvue_type_template_id_490ac5ca_scoped_true_staticRenderFns,
   false,
   null,
-  "aa9f0f16",
+  "490ac5ca",
   null
   
 )