@weitutech/by-components 1.2.19 → 1.2.21

package/lib/by-components.common.js

@@ -92423,13 +92423,22 @@ var BatchQuerySelector_component = normalizeComponent(
 )
 
 /* harmony default export */ var BatchQuerySelector = (BatchQuerySelector_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/common-input/ByCommonInput.vue?vue&type=template&id=71d628fa
-var ByCommonInputvue_type_template_id_71d628fa_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/common-input/ByCommonInput.vue?vue&type=template&id=5ab04f01
+var ByCommonInputvue_type_template_id_5ab04f01_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
-    staticClass: "by-common-input-container"
+    staticClass: "by-common-input-container",
+    class: {
+      'has-batch-suffix': _vm.showBatchInput,
+      'is-clearable': _vm.showBatchInput && _vm.isClearable
+    }
+  }, [_c('div', {
+    staticClass: "input-wrap"
   }, [_c('el-input', _vm._b({
+    class: {
+      'has-batch-suffix': _vm.showBatchInput
+    },
     attrs: {
       "value": _vm.localValue,
       "size": _vm.actualSize
@@ -92440,7 +92449,9 @@ var ByCommonInputvue_type_template_id_71d628fa_render = function render() {
       "blur": _vm.handleBlur,
       "focus": _vm.handleFocus
     }
-  }, 'el-input', _vm.$attrs, false)), _vm.showBatchInput ? _c('el-popover', {
+  }, 'el-input', _vm.$attrs, false)), _vm.showBatchInput ? _c('div', {
+    staticClass: "batch-input-suffix"
+  }, [_c('el-popover', {
     attrs: {
       "placement": "bottom-end",
       "width": _vm.batchInputPopoverWidth,
@@ -92490,24 +92501,26 @@ var ByCommonInputvue_type_template_id_71d628fa_render = function render() {
       "click": _vm.handleBatchInputConfirm
     }
   }, [_vm._v("确定")])], 1)], 1), _c('el-button', {
-    staticClass: "batch-input-btn",
+    staticClass: "batch-input-btn batch-input-btn--inner",
+    class: `batch-input-btn--${_vm.actualSize}`,
     attrs: {
       "slot": "reference",
+      "type": "text",
+      "disabled": _vm.isDisabled,
       "size": _vm.actualSize
     },
     on: {
-      "click": _vm.handleOpenBatchInput
+      "click": function ($event) {
+        $event.stopPropagation();
+        return _vm.handleOpenBatchInput.apply(null, arguments);
+      }
     },
     slot: "reference"
   }, [_c('i', {
-    staticClass: "el-icon-edit-outline",
-    staticStyle: {
-      "transform": "scale(2)",
-      "display": "inline-block"
-    }
-  })])], 1) : _vm._e()], 1);
+    staticClass: "el-icon-edit-outline"
+  })])], 1)], 1) : _vm._e()], 1)]);
 };
-var ByCommonInputvue_type_template_id_71d628fa_staticRenderFns = [];
+var ByCommonInputvue_type_template_id_5ab04f01_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/common-input/ByCommonInput.vue?vue&type=script&lang=js
 
@@ -92572,6 +92585,14 @@ var ByCommonInputvue_type_template_id_71d628fa_staticRenderFns = [];
     // 获取实际的 size 值，优先使用 $attrs 中的 size
     actualSize() {
       return this.$attrs.size || this.size;
+    },
+    isClearable() {
+      const val = this.$attrs.clearable;
+      return val === '' || val === true || val === 'true';
+    },
+    isDisabled() {
+      const val = this.$attrs.disabled;
+      return val === '' || val === true || val === 'true';
     }
   },
   watch: {
@@ -92668,8 +92689,8 @@ var ByCommonInputvue_type_template_id_71d628fa_staticRenderFns = [];
 ;
 var ByCommonInput_component = normalizeComponent(
   common_input_ByCommonInputvue_type_script_lang_js,
-  ByCommonInputvue_type_template_id_71d628fa_render,
-  ByCommonInputvue_type_template_id_71d628fa_staticRenderFns,
+  ByCommonInputvue_type_template_id_5ab04f01_render,
+  ByCommonInputvue_type_template_id_5ab04f01_staticRenderFns,
   false,
   null,
   null,
@@ -101526,8 +101547,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=275b5251
-var ByTagvue_type_template_id_275b5251_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=246a25ba
+var ByTagvue_type_template_id_246a25ba_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-tag', _vm._g(_vm._b({
@@ -101536,18 +101557,21 @@ var ByTagvue_type_template_id_275b5251_render = function render() {
       "type": _vm.elTagType,
       "color": _vm.elTagColor
     }
-  }, 'el-tag', _vm.tagAttrs, false), _vm.$listeners), [_vm.icon || _vm.$scopedSlots.icon || _vm.$slots.icon ? _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: ['by-tag__icon-inner', _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_275b5251_staticRenderFns = [];
+var ByTagvue_type_template_id_246a25ba_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 +101582,11 @@ var ByTagvue_type_template_id_275b5251_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,8 +101622,22 @@ const EXTENDED_TYPES = ['blue', 'navy', 'sky', 'default', 'slate', 'charcoal', '
     isExtendedType() {
       return this.type && EXTENDED_TYPES.includes(this.type);
     },
+    /**
+     * 是否真正传入了 #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.$scopedSlots && this.$scopedSlots.icon || this.$slots && this.$slots.icon);
+      return Boolean(this.icon) || this.hasProvidedIconSlot;
     },
     elTagType() {
       if (this.isNativeType) return this.type;
@@ -101632,8 +101675,6 @@ const EXTENDED_TYPES = ['blue', 'navy', 'sky', 'default', 'slate', 'charcoal', '
       if (this.isExtendedType) {
         delete attrs.color;
       }
-      // 防御：避免 icon 被透传到 el-tag DOM（旧构建/异常透传时）
-      delete attrs.icon;
       return attrs;
     }
   }
@@ -101650,8 +101691,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_275b5251_render,
-  ByTagvue_type_template_id_275b5251_staticRenderFns,
+  ByTagvue_type_template_id_246a25ba_render,
+  ByTagvue_type_template_id_246a25ba_staticRenderFns,
   false,
   null,
   null,

package/lib/by-components.umd.js

@@ -92433,13 +92433,22 @@ var BatchQuerySelector_component = normalizeComponent(
 )
 
 /* harmony default export */ var BatchQuerySelector = (BatchQuerySelector_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/common-input/ByCommonInput.vue?vue&type=template&id=71d628fa
-var ByCommonInputvue_type_template_id_71d628fa_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/common-input/ByCommonInput.vue?vue&type=template&id=5ab04f01
+var ByCommonInputvue_type_template_id_5ab04f01_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
-    staticClass: "by-common-input-container"
+    staticClass: "by-common-input-container",
+    class: {
+      'has-batch-suffix': _vm.showBatchInput,
+      'is-clearable': _vm.showBatchInput && _vm.isClearable
+    }
+  }, [_c('div', {
+    staticClass: "input-wrap"
   }, [_c('el-input', _vm._b({
+    class: {
+      'has-batch-suffix': _vm.showBatchInput
+    },
     attrs: {
       "value": _vm.localValue,
       "size": _vm.actualSize
@@ -92450,7 +92459,9 @@ var ByCommonInputvue_type_template_id_71d628fa_render = function render() {
       "blur": _vm.handleBlur,
       "focus": _vm.handleFocus
     }
-  }, 'el-input', _vm.$attrs, false)), _vm.showBatchInput ? _c('el-popover', {
+  }, 'el-input', _vm.$attrs, false)), _vm.showBatchInput ? _c('div', {
+    staticClass: "batch-input-suffix"
+  }, [_c('el-popover', {
     attrs: {
       "placement": "bottom-end",
       "width": _vm.batchInputPopoverWidth,
@@ -92500,24 +92511,26 @@ var ByCommonInputvue_type_template_id_71d628fa_render = function render() {
       "click": _vm.handleBatchInputConfirm
     }
   }, [_vm._v("确定")])], 1)], 1), _c('el-button', {
-    staticClass: "batch-input-btn",
+    staticClass: "batch-input-btn batch-input-btn--inner",
+    class: `batch-input-btn--${_vm.actualSize}`,
     attrs: {
       "slot": "reference",
+      "type": "text",
+      "disabled": _vm.isDisabled,
       "size": _vm.actualSize
     },
     on: {
-      "click": _vm.handleOpenBatchInput
+      "click": function ($event) {
+        $event.stopPropagation();
+        return _vm.handleOpenBatchInput.apply(null, arguments);
+      }
     },
     slot: "reference"
   }, [_c('i', {
-    staticClass: "el-icon-edit-outline",
-    staticStyle: {
-      "transform": "scale(2)",
-      "display": "inline-block"
-    }
-  })])], 1) : _vm._e()], 1);
+    staticClass: "el-icon-edit-outline"
+  })])], 1)], 1) : _vm._e()], 1)]);
 };
-var ByCommonInputvue_type_template_id_71d628fa_staticRenderFns = [];
+var ByCommonInputvue_type_template_id_5ab04f01_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/common-input/ByCommonInput.vue?vue&type=script&lang=js
 
@@ -92582,6 +92595,14 @@ var ByCommonInputvue_type_template_id_71d628fa_staticRenderFns = [];
     // 获取实际的 size 值，优先使用 $attrs 中的 size
     actualSize() {
       return this.$attrs.size || this.size;
+    },
+    isClearable() {
+      const val = this.$attrs.clearable;
+      return val === '' || val === true || val === 'true';
+    },
+    isDisabled() {
+      const val = this.$attrs.disabled;
+      return val === '' || val === true || val === 'true';
     }
   },
   watch: {
@@ -92678,8 +92699,8 @@ var ByCommonInputvue_type_template_id_71d628fa_staticRenderFns = [];
 ;
 var ByCommonInput_component = normalizeComponent(
   common_input_ByCommonInputvue_type_script_lang_js,
-  ByCommonInputvue_type_template_id_71d628fa_render,
-  ByCommonInputvue_type_template_id_71d628fa_staticRenderFns,
+  ByCommonInputvue_type_template_id_5ab04f01_render,
+  ByCommonInputvue_type_template_id_5ab04f01_staticRenderFns,
   false,
   null,
   null,
@@ -101536,8 +101557,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=275b5251
-var ByTagvue_type_template_id_275b5251_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=246a25ba
+var ByTagvue_type_template_id_246a25ba_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('el-tag', _vm._g(_vm._b({
@@ -101546,18 +101567,21 @@ var ByTagvue_type_template_id_275b5251_render = function render() {
       "type": _vm.elTagType,
       "color": _vm.elTagColor
     }
-  }, 'el-tag', _vm.tagAttrs, false), _vm.$listeners), [_vm.icon || _vm.$scopedSlots.icon || _vm.$slots.icon ? _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: ['by-tag__icon-inner', _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_275b5251_staticRenderFns = [];
+var ByTagvue_type_template_id_246a25ba_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 +101592,11 @@ var ByTagvue_type_template_id_275b5251_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,8 +101632,22 @@ const EXTENDED_TYPES = ['blue', 'navy', 'sky', 'default', 'slate', 'charcoal', '
     isExtendedType() {
       return this.type && EXTENDED_TYPES.includes(this.type);
     },
+    /**
+     * 是否真正传入了 #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.$scopedSlots && this.$scopedSlots.icon || this.$slots && this.$slots.icon);
+      return Boolean(this.icon) || this.hasProvidedIconSlot;
     },
     elTagType() {
       if (this.isNativeType) return this.type;
@@ -101642,8 +101685,6 @@ const EXTENDED_TYPES = ['blue', 'navy', 'sky', 'default', 'slate', 'charcoal', '
       if (this.isExtendedType) {
         delete attrs.color;
       }
-      // 防御：避免 icon 被透传到 el-tag DOM（旧构建/异常透传时）
-      delete attrs.icon;
       return attrs;
     }
   }
@@ -101660,8 +101701,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_275b5251_render,
-  ByTagvue_type_template_id_275b5251_staticRenderFns,
+  ByTagvue_type_template_id_246a25ba_render,
+  ByTagvue_type_template_id_246a25ba_staticRenderFns,
   false,
   null,
   null,