epx-frame 4.2.6 → 4.2.8

package/lib/report-chart.js

@@ -2568,7 +2568,7 @@ module.exports = require("core-js/modules/es.object.keys.js");
 
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_0___default()(function(i){return i[1]});
 // Module
-___CSS_LOADER_EXPORT___.push([module.i, ".container[data-v-0619b4aa]{background:#fff}.button-group[data-v-0619b4aa]{text-align:center;padding-bottom:12px}\n", ""]);
+___CSS_LOADER_EXPORT___.push([module.i, ".container[data-v-3a4b9571]{background:#fff}.button-group[data-v-3a4b9571]{text-align:center;padding-bottom:12px}\n", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["a"] = (___CSS_LOADER_EXPORT___);
 
@@ -4985,8 +4985,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var AddFormItem = (component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/add-form-item/Preview.vue?vue&type=template&id=0619b4aa&scoped=true
-var Previewvue_type_template_id_0619b4aa_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/add-form-item/Preview.vue?vue&type=template&id=3a4b9571&scoped=true
+var Previewvue_type_template_id_3a4b9571_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5085,11 +5085,11 @@ var Previewvue_type_template_id_0619b4aa_scoped_true_render = function () {
     1
   )
 }
-var Previewvue_type_template_id_0619b4aa_scoped_true_staticRenderFns = []
-Previewvue_type_template_id_0619b4aa_scoped_true_render._withStripped = true
+var Previewvue_type_template_id_3a4b9571_scoped_true_staticRenderFns = []
+Previewvue_type_template_id_3a4b9571_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/frame/packages/add-form-item/Preview.vue?vue&type=template&id=0619b4aa&scoped=true
+// CONCATENATED MODULE: ./src/frame/packages/add-form-item/Preview.vue?vue&type=template&id=3a4b9571&scoped=true
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__(2);
@@ -5156,7 +5156,6 @@ var Mixin = __webpack_require__(87);
     },
     pageType: String
   },
-  inject: ['pageMetaId'],
   data: function data() {
     return {
       isFold: false,
@@ -5176,7 +5175,7 @@ var Mixin = __webpack_require__(87);
     },
     currentMetaId: function currentMetaId() {
       var _this$$configs$metaId = this.$configs.metaId,
-        metaId = _this$$configs$metaId === void 0 ? this.pageMetaId : _this$$configs$metaId;
+        metaId = _this$$configs$metaId === void 0 ? this.designer.page.metaId : _this$$configs$metaId;
       return metaId;
     },
     column: function column() {
@@ -5258,24 +5257,24 @@ var Mixin = __webpack_require__(87);
 });
 // CONCATENATED MODULE: ./src/frame/packages/add-form-item/Preview.vue?vue&type=script&lang=js
  /* harmony default export */ var add_form_item_Previewvue_type_script_lang_js = (Previewvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/add-form-item/Preview.vue?vue&type=style&index=0&id=0619b4aa&prod&scoped=true&lang=scss
-var Previewvue_type_style_index_0_id_0619b4aa_prod_scoped_true_lang_scss = __webpack_require__(180);
+// EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/add-form-item/Preview.vue?vue&type=style&index=0&id=3a4b9571&prod&scoped=true&lang=scss
+var Previewvue_type_style_index_0_id_3a4b9571_prod_scoped_true_lang_scss = __webpack_require__(180);
 
-// CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/add-form-item/Preview.vue?vue&type=style&index=0&id=0619b4aa&prod&scoped=true&lang=scss
+// CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/add-form-item/Preview.vue?vue&type=style&index=0&id=3a4b9571&prod&scoped=true&lang=scss
 
             
 
-var Previewvue_type_style_index_0_id_0619b4aa_prod_scoped_true_lang_scss_options = {};
+var Previewvue_type_style_index_0_id_3a4b9571_prod_scoped_true_lang_scss_options = {};
 
-Previewvue_type_style_index_0_id_0619b4aa_prod_scoped_true_lang_scss_options.insert = "head";
-Previewvue_type_style_index_0_id_0619b4aa_prod_scoped_true_lang_scss_options.singleton = false;
+Previewvue_type_style_index_0_id_3a4b9571_prod_scoped_true_lang_scss_options.insert = "head";
+Previewvue_type_style_index_0_id_3a4b9571_prod_scoped_true_lang_scss_options.singleton = false;
 
-var Previewvue_type_style_index_0_id_0619b4aa_prod_scoped_true_lang_scss_update = injectStylesIntoStyleTag_default()(Previewvue_type_style_index_0_id_0619b4aa_prod_scoped_true_lang_scss["a" /* default */], Previewvue_type_style_index_0_id_0619b4aa_prod_scoped_true_lang_scss_options);
+var Previewvue_type_style_index_0_id_3a4b9571_prod_scoped_true_lang_scss_update = injectStylesIntoStyleTag_default()(Previewvue_type_style_index_0_id_3a4b9571_prod_scoped_true_lang_scss["a" /* default */], Previewvue_type_style_index_0_id_3a4b9571_prod_scoped_true_lang_scss_options);
 
 
 
-/* harmony default export */ var add_form_item_Previewvue_type_style_index_0_id_0619b4aa_prod_scoped_true_lang_scss = (Previewvue_type_style_index_0_id_0619b4aa_prod_scoped_true_lang_scss["a" /* default */].locals || {});
-// CONCATENATED MODULE: ./src/frame/packages/add-form-item/Preview.vue?vue&type=style&index=0&id=0619b4aa&prod&scoped=true&lang=scss
+/* harmony default export */ var add_form_item_Previewvue_type_style_index_0_id_3a4b9571_prod_scoped_true_lang_scss = (Previewvue_type_style_index_0_id_3a4b9571_prod_scoped_true_lang_scss["a" /* default */].locals || {});
+// CONCATENATED MODULE: ./src/frame/packages/add-form-item/Preview.vue?vue&type=style&index=0&id=3a4b9571&prod&scoped=true&lang=scss
 
 // CONCATENATED MODULE: ./src/frame/packages/add-form-item/Preview.vue
 
@@ -5288,11 +5287,11 @@ var Previewvue_type_style_index_0_id_0619b4aa_prod_scoped_true_lang_scss_update
 
 var Preview_component = Object(componentNormalizer["a" /* default */])(
   add_form_item_Previewvue_type_script_lang_js,
-  Previewvue_type_template_id_0619b4aa_scoped_true_render,
-  Previewvue_type_template_id_0619b4aa_scoped_true_staticRenderFns,
+  Previewvue_type_template_id_3a4b9571_scoped_true_render,
+  Previewvue_type_template_id_3a4b9571_scoped_true_staticRenderFns,
   false,
   null,
-  "0619b4aa",
+  "3a4b9571",
   null
   
 )

package/lib/tabs.js

@@ -1334,6 +1334,15 @@ function _arrayLikeToArray(arr, len) {
         }
         return component.title;
       };
+    },
+    getComponentId: function getComponentId() {
+      var _this2 = this;
+      return function (component, tabId) {
+        if (!_this2.$configVersion) {
+          return _this2.$component.id + '-' + tabId + '-' + component.id;
+        }
+        return component.id;
+      };
     }
   },
   methods: {
@@ -1362,7 +1371,7 @@ function _arrayLikeToArray(arr, len) {
       }
     },
     getTabCount: function getTabCount() {
-      var _this2 = this;
+      var _this3 = this;
       var _this$$query$scopePar = this.$query.scopeParams,
         queryScopeParams = _this$$query$scopePar === void 0 ? [] : _this$$query$scopePar;
       var _ref2 = this.upPage.pageConfig || {},
@@ -1375,17 +1384,17 @@ function _arrayLikeToArray(arr, len) {
       try {
         var _loop = function _loop() {
           var tab = _step.value;
-          var showTabCount = !_this2.$_.isNil(tab.tabCount) ? tab.tabCount : _this2.$configs.tabCount;
+          var showTabCount = !_this3.$_.isNil(tab.tabCount) ? tab.tabCount : _this3.$configs.tabCount;
           var params = tab.countParams || {};
           if (showTabCount) {
             if (tab.countScopeParams) {
-              scopeParams = _this2.$_.cloneDeep([].concat(Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"])(queryScopeParams), Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"])(tab.countScopeParams)));
+              scopeParams = _this3.$_.cloneDeep([].concat(Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"])(queryScopeParams), Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"])(tab.countScopeParams)));
             } else {
               var _component2 = tab.items && tab.items[0];
               if (_component2) {
-                var instance = _this2.$refs[_component2.id] ? _this2.$refs[_component2.id][0] : null;
+                var instance = _this3.$refs[_component2.id] ? _this3.$refs[_component2.id][0] : null;
                 var componentConfig = null;
-                if (instance && !_this2.$_.isEmpty(instance.$configs)) {
+                if (instance && !_this3.$_.isEmpty(instance.$configs)) {
                   componentConfig = instance.$configs || {};
                 } else {
                   componentConfig = itemConfigs[_component2.id];
@@ -1396,7 +1405,7 @@ function _arrayLikeToArray(arr, len) {
                   configScopeParams = _componentConfig$scop === void 0 ? [] : _componentConfig$scop,
                   listFields = _componentConfig.listFields;
                 if (componentMetaId) metaId = componentMetaId;
-                scopeParams = _this2.$_.cloneDeep([].concat(Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"])(queryScopeParams), Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"])(configScopeParams)));
+                scopeParams = _this3.$_.cloneDeep([].concat(Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"])(queryScopeParams), Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_toConsumableArray_js__WEBPACK_IMPORTED_MODULE_1__[/* default */ "a"])(configScopeParams)));
                 var linkArr = [];
                 if (listFields) {
                   listFields.forEach(function (item) {
@@ -1430,7 +1439,7 @@ function _arrayLikeToArray(arr, len) {
               }
             }
             // eslint-disable-next-line no-unused-vars
-            var that = _this2;
+            var that = _this3;
             var _loop2 = function _loop2() {
               var scope = scopeParams[scopeKey];
               if (!scope) return 1; // continue
@@ -1460,14 +1469,14 @@ function _arrayLikeToArray(arr, len) {
             for (var scopeKey in scopeParams) {
               if (_loop2()) continue;
             }
-            _this2.$http.getCount(Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])({
+            _this3.$http.getCount(Object(E_workspace_gitrepo_epx_group_frame_node_modules_babel_runtime_helpers_esm_objectSpread2_js__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])({
               entityId: metaId,
               scopeParams: JSON.stringify(scopeParams)
             }, params)).then(function (data) {
               if (data.total || data.total === 0) {
-                _this2.$set(_this2.counts, tab.id, data.total || 0);
+                _this3.$set(_this3.counts, tab.id, data.total || 0);
               } else {
-                _this2.$set(_this2.counts, tab.id, data);
+                _this3.$set(_this3.counts, tab.id, data);
               }
             });
           }
@@ -2664,7 +2673,7 @@ __webpack_require__.r(__webpack_exports__);
 // EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
 var es_function_name_js_ = __webpack_require__(9);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/tabs/Tabs.vue?vue&type=template&id=4c6d841b
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/tabs/Tabs.vue?vue&type=template&id=63349738
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2704,7 +2713,7 @@ var render = function () {
                   staticClass: "epx-page-tabs__component",
                   attrs: {
                     name: component.contentType,
-                    "comp-id": _vm.getComponentId(component),
+                    "comp-id": _vm.getComponentId(component, tab.id),
                     "comp-title": component.title,
                     contentType: component.contentType,
                     "comp-configs": component.configs,
@@ -2735,7 +2744,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./src/frame/packages/tabs/Tabs.vue?vue&type=template&id=4c6d841b
+// CONCATENATED MODULE: ./src/frame/packages/tabs/Tabs.vue?vue&type=template&id=63349738
 
 // EXTERNAL MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/tabs/Tabs.vue?vue&type=script&lang=js
 var Tabsvue_type_script_lang_js = __webpack_require__(227);
@@ -2746,10 +2755,10 @@ var Tabsvue_type_script_lang_js = __webpack_require__(227);
 var injectStylesIntoStyleTag = __webpack_require__(16);
 var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
 
-// EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/tabs/Tabs.vue?vue&type=style&index=0&id=4c6d841b&prod&lang=scss
-var Tabsvue_type_style_index_0_id_4c6d841b_prod_lang_scss = __webpack_require__(376);
+// EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/tabs/Tabs.vue?vue&type=style&index=0&id=63349738&prod&lang=scss
+var Tabsvue_type_style_index_0_id_63349738_prod_lang_scss = __webpack_require__(376);
 
-// CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/tabs/Tabs.vue?vue&type=style&index=0&id=4c6d841b&prod&lang=scss
+// CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/sass-resources-loader/lib/loader.js??ref--2-3!./node_modules/vue-loader/lib??vue-loader-options!./src/frame/packages/tabs/Tabs.vue?vue&type=style&index=0&id=63349738&prod&lang=scss
 
             
 
@@ -2758,12 +2767,12 @@ var options = {};
 options.insert = "head";
 options.singleton = false;
 
-var update = injectStylesIntoStyleTag_default()(Tabsvue_type_style_index_0_id_4c6d841b_prod_lang_scss["a" /* default */], options);
+var update = injectStylesIntoStyleTag_default()(Tabsvue_type_style_index_0_id_63349738_prod_lang_scss["a" /* default */], options);
 
 
 
-/* harmony default export */ var tabs_Tabsvue_type_style_index_0_id_4c6d841b_prod_lang_scss = (Tabsvue_type_style_index_0_id_4c6d841b_prod_lang_scss["a" /* default */].locals || {});
-// CONCATENATED MODULE: ./src/frame/packages/tabs/Tabs.vue?vue&type=style&index=0&id=4c6d841b&prod&lang=scss
+/* harmony default export */ var tabs_Tabsvue_type_style_index_0_id_63349738_prod_lang_scss = (Tabsvue_type_style_index_0_id_63349738_prod_lang_scss["a" /* default */].locals || {});
+// CONCATENATED MODULE: ./src/frame/packages/tabs/Tabs.vue?vue&type=style&index=0&id=63349738&prod&lang=scss
 
 // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(15);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epx-frame",
-  "version": "4.2.6",
+  "version": "4.2.8",
   "private": false,
   "main": "./lib/epx-frame.common.js",
   "files": [