@weitutech/by-components 1.2.18 → 1.2.20

package/lib/by-components.common.js

@@ -101526,8 +101526,8 @@ var ByGridLayout_component = normalizeComponent(
 )
 
 /* harmony default export */ var ByGridLayout = (ByGridLayout_component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"185687ec-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/by-tag/ByTag.vue?vue&type=template&id=91c49304
-var ByTagvue_type_template_id_91c49304_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"185687ec-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/by-tag/ByTag.vue?vue&type=template&id=021fe5fe
+var ByTagvue_type_template_id_021fe5fe_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-tag', _vm._g(_vm._b({
@@ -101536,18 +101536,21 @@ var ByTagvue_type_template_id_91c49304_render = function render() {
       "type": _vm.elTagType,
       "color": _vm.elTagColor
     }
-  }, 'el-tag', _vm.tagAttrs, false), _vm.$listeners), [_vm.hasIcon ? _c('span', {
+  }, 'el-tag', _vm.tagAttrs, false), _vm.$listeners), [_vm.hasProvidedIconSlot ? _c('span', {
     staticClass: "by-tag__icon",
     attrs: {
       "aria-hidden": "true"
     }
-  }, [_vm._t("icon", function () {
-    return [_vm.icon ? _c('i', {
-      class: _vm.icon
-    }) : _vm._e()];
-  })], 2) : _vm._e(), _vm._t("default")], 2);
+  }, [_vm._t("icon")], 2) : _vm.icon ? _c('span', {
+    staticClass: "by-tag__icon",
+    attrs: {
+      "aria-hidden": "true"
+    }
+  }, [_c('i', {
+    class: _vm.icon
+  })]) : _vm._e(), _vm._t("default")], 2);
 };
-var ByTagvue_type_template_id_91c49304_staticRenderFns = [];
+var ByTagvue_type_template_id_021fe5fe_staticRenderFns = [];
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/by-tag/ByTag.vue?vue&type=script&lang=js
 
@@ -101558,6 +101561,11 @@ var ByTagvue_type_template_id_91c49304_staticRenderFns = [];
  */
 const NATIVE_TYPES = ['primary', 'success', 'info', 'warning', 'danger'];
 const EXTENDED_TYPES = ['blue', 'navy', 'sky', 'default', 'slate', 'charcoal', 'purple', 'violet', 'lavender', 'indigo', 'cyan', 'teal', 'aqua', 'ink', 'mint', 'lime', 'forest', 'olive', 'sage', 'crimson', 'rose', 'pink', 'blossom', 'magenta', 'scarlet', 'orange', 'coral', 'brick', 'amber', 'gold', 'lemon', 'brown', 'sand', 'beige', 'wine', 'silver', 'copper'];
+function slotHasContent(nodes) {
+  if (!nodes) return false;
+  if (Array.isArray(nodes)) return nodes.length > 0;
+  return true;
+}
 /* harmony default export */ var ByTagvue_type_script_lang_js = ({
   name: 'ByTag',
   inheritAttrs: false,
@@ -101593,11 +101601,22 @@ const EXTENDED_TYPES = ['blue', 'navy', 'sky', 'default', 'slate', 'charcoal', '
     isExtendedType() {
       return this.type && EXTENDED_TYPES.includes(this.type);
     },
-    hasIconSlot() {
-      return Boolean(this.$scopedSlots && this.$scopedSlots.icon || this.$slots && this.$slots.icon);
+    /**
+     * 是否真正传入了 #icon 插槽（需有内容）。
+     * 不能只用 !!$scopedSlots.icon：lib 打包 + 嵌套 scopedSlot 场景下可能存在空函数。
+     */
+    hasProvidedIconSlot() {
+      if (slotHasContent(this.$slots && this.$slots.icon)) {
+        return true;
+      }
+      const scopedIcon = this.$scopedSlots && this.$scopedSlots.icon;
+      if (typeof scopedIcon !== 'function') {
+        return false;
+      }
+      return slotHasContent(scopedIcon({}));
     },
     hasIcon() {
-      return Boolean(this.icon) || this.hasIconSlot;
+      return Boolean(this.icon) || this.hasProvidedIconSlot;
     },
     elTagType() {
       if (this.isNativeType) return this.type;
@@ -101651,8 +101670,8 @@ const EXTENDED_TYPES = ['blue', 'navy', 'sky', 'default', 'slate', 'charcoal', '
 ;
 var ByTag_component = normalizeComponent(
   by_tag_ByTagvue_type_script_lang_js,
-  ByTagvue_type_template_id_91c49304_render,
-  ByTagvue_type_template_id_91c49304_staticRenderFns,
+  ByTagvue_type_template_id_021fe5fe_render,
+  ByTagvue_type_template_id_021fe5fe_staticRenderFns,
   false,
   null,
   null,

package/lib/by-components.umd.js

@@ -101536,8 +101536,8 @@ var ByGridLayout_component = normalizeComponent(
 )
 
 /* harmony default export */ var ByGridLayout = (ByGridLayout_component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"185687ec-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/by-tag/ByTag.vue?vue&type=template&id=91c49304
-var ByTagvue_type_template_id_91c49304_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"185687ec-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/by-tag/ByTag.vue?vue&type=template&id=021fe5fe
+var ByTagvue_type_template_id_021fe5fe_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-tag', _vm._g(_vm._b({
@@ -101546,18 +101546,21 @@ var ByTagvue_type_template_id_91c49304_render = function render() {
       "type": _vm.elTagType,
       "color": _vm.elTagColor
     }
-  }, 'el-tag', _vm.tagAttrs, false), _vm.$listeners), [_vm.hasIcon ? _c('span', {
+  }, 'el-tag', _vm.tagAttrs, false), _vm.$listeners), [_vm.hasProvidedIconSlot ? _c('span', {
     staticClass: "by-tag__icon",
     attrs: {
       "aria-hidden": "true"
     }
-  }, [_vm._t("icon", function () {
-    return [_vm.icon ? _c('i', {
-      class: _vm.icon
-    }) : _vm._e()];
-  })], 2) : _vm._e(), _vm._t("default")], 2);
+  }, [_vm._t("icon")], 2) : _vm.icon ? _c('span', {
+    staticClass: "by-tag__icon",
+    attrs: {
+      "aria-hidden": "true"
+    }
+  }, [_c('i', {
+    class: _vm.icon
+  })]) : _vm._e(), _vm._t("default")], 2);
 };
-var ByTagvue_type_template_id_91c49304_staticRenderFns = [];
+var ByTagvue_type_template_id_021fe5fe_staticRenderFns = [];
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/by-tag/ByTag.vue?vue&type=script&lang=js
 
@@ -101568,6 +101571,11 @@ var ByTagvue_type_template_id_91c49304_staticRenderFns = [];
  */
 const NATIVE_TYPES = ['primary', 'success', 'info', 'warning', 'danger'];
 const EXTENDED_TYPES = ['blue', 'navy', 'sky', 'default', 'slate', 'charcoal', 'purple', 'violet', 'lavender', 'indigo', 'cyan', 'teal', 'aqua', 'ink', 'mint', 'lime', 'forest', 'olive', 'sage', 'crimson', 'rose', 'pink', 'blossom', 'magenta', 'scarlet', 'orange', 'coral', 'brick', 'amber', 'gold', 'lemon', 'brown', 'sand', 'beige', 'wine', 'silver', 'copper'];
+function slotHasContent(nodes) {
+  if (!nodes) return false;
+  if (Array.isArray(nodes)) return nodes.length > 0;
+  return true;
+}
 /* harmony default export */ var ByTagvue_type_script_lang_js = ({
   name: 'ByTag',
   inheritAttrs: false,
@@ -101603,11 +101611,22 @@ const EXTENDED_TYPES = ['blue', 'navy', 'sky', 'default', 'slate', 'charcoal', '
     isExtendedType() {
       return this.type && EXTENDED_TYPES.includes(this.type);
     },
-    hasIconSlot() {
-      return Boolean(this.$scopedSlots && this.$scopedSlots.icon || this.$slots && this.$slots.icon);
+    /**
+     * 是否真正传入了 #icon 插槽（需有内容）。
+     * 不能只用 !!$scopedSlots.icon：lib 打包 + 嵌套 scopedSlot 场景下可能存在空函数。
+     */
+    hasProvidedIconSlot() {
+      if (slotHasContent(this.$slots && this.$slots.icon)) {
+        return true;
+      }
+      const scopedIcon = this.$scopedSlots && this.$scopedSlots.icon;
+      if (typeof scopedIcon !== 'function') {
+        return false;
+      }
+      return slotHasContent(scopedIcon({}));
     },
     hasIcon() {
-      return Boolean(this.icon) || this.hasIconSlot;
+      return Boolean(this.icon) || this.hasProvidedIconSlot;
     },
     elTagType() {
       if (this.isNativeType) return this.type;
@@ -101661,8 +101680,8 @@ const EXTENDED_TYPES = ['blue', 'navy', 'sky', 'default', 'slate', 'charcoal', '
 ;
 var ByTag_component = normalizeComponent(
   by_tag_ByTagvue_type_script_lang_js,
-  ByTagvue_type_template_id_91c49304_render,
-  ByTagvue_type_template_id_91c49304_staticRenderFns,
+  ByTagvue_type_template_id_021fe5fe_render,
+  ByTagvue_type_template_id_021fe5fe_staticRenderFns,
   false,
   null,
   null,