eoss 0.1.0-alpha.47 → 0.1.0-alpha.49

package/lib/dropdown-item.js

@@ -220,12 +220,12 @@ module.exports = require("eoss/lib/tooltip");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dropdown/src/dropdown-item.vue?vue&type=template&id=9fae2152&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dropdown/src/dropdown-item.vue?vue&type=template&id=2e18ceea&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  return !_vm.rules || _vm.rules(_vm.param)
+  return _vm.checkRules()
     ? _c(
         "li",
         {
@@ -293,7 +293,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/dropdown/src/dropdown-item.vue?vue&type=template&id=9fae2152&
+// CONCATENATED MODULE: ./packages/dropdown/src/dropdown-item.vue?vue&type=template&id=2e18ceea&
 
 // EXTERNAL MODULE: external "dompurify"
 var external_dompurify_ = __webpack_require__(111);
@@ -369,7 +369,11 @@ var tooltip_default = /*#__PURE__*/__webpack_require__.n(tooltip_);
   name: 'EsDropdownItem',
 
   mixins: [emitter_js_default.a],
-  inject: ['dropdownMenu'],
+  inject: {
+    dropdownMenu: { default: null },
+    // 按钮组内使用时由 es-button-group provide；独立使用 dropdown 时为 null
+    esButtonGroup: { default: null }
+  },
   components: { EsTooltip: tooltip_default.a, EsIcon: icon_default.a },
 
   props: {
@@ -431,6 +435,21 @@ var tooltip_default = /*#__PURE__*/__webpack_require__.n(tooltip_);
   },
 
   methods: {
+    /**
+     * rules 校验：按钮组场景（表格操作列）用行数据调用，
+     * 否则 rules 拿到 undefined 会把本该显示的菜单项判掉
+     * @returns {Boolean} 是否渲染该菜单项
+     */
+    checkRules: function checkRules() {
+      if (!this.rules) {
+        return true;
+      }
+      if (this.esButtonGroup) {
+        return this.rules(this.esButtonGroup.data, this.esButtonGroup.rowData);
+      }
+      return this.rules(this.param);
+    },
+
     /**
      * 处理点击事件
      * @param {Event} evt - 点击事件对象

package/lib/dropdown.js

@@ -310,7 +310,7 @@ render._withStripped = true
 // CONCATENATED MODULE: ./packages/dropdown/src/dropdown.vue?vue&type=template&id=cf516038&
 
 // EXTERNAL MODULE: external "eoss/lib/utils/clickoutside.js"
-var clickoutside_js_ = __webpack_require__(29);
+var clickoutside_js_ = __webpack_require__(28);
 var clickoutside_js_default = /*#__PURE__*/__webpack_require__.n(clickoutside_js_);
 
 // EXTERNAL MODULE: external "eoss/lib/mixins/emitter.js"
@@ -318,7 +318,7 @@ var emitter_js_ = __webpack_require__(8);
 var emitter_js_default = /*#__PURE__*/__webpack_require__.n(emitter_js_);
 
 // EXTERNAL MODULE: external "eoss/lib/mixins/migrating.js"
-var migrating_js_ = __webpack_require__(31);
+var migrating_js_ = __webpack_require__(30);
 var migrating_js_default = /*#__PURE__*/__webpack_require__.n(migrating_js_);
 
 // EXTERNAL MODULE: external "eoss/lib/button"
@@ -1041,14 +1041,14 @@ dropdown.install = function (Vue) {
 
 /***/ }),
 
-/***/ 29:
+/***/ 28:
 /***/ (function(module, exports) {
 
 module.exports = require("eoss/lib/utils/clickoutside.js");
 
 /***/ }),
 
-/***/ 31:
+/***/ 30:
 /***/ (function(module, exports) {
 
 module.exports = require("eoss/lib/mixins/migrating.js");

package/lib/empty.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 205);
+/******/ 	return __webpack_require__(__webpack_require__.s = 206);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 205:
+/***/ 206:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";