@ezuikit/player-theme 3.1.0-beta.4 → 3.1.1-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/constant.js CHANGED
@@ -1,6 +1,6 @@
1
1
  /*
2
- * @ezuikit/player-theme v3.1.0-beta.4
3
- * Copyright (c) 2026-07-06 Ezviz-OpenBiz
2
+ * @ezuikit/player-theme v3.1.1-beta.1
3
+ * Copyright (c) 2026-07-30 11:17:11 Ezviz-OpenBiz
4
4
  * Released under the MIT License.
5
5
  */
6
6
  /**
package/dist/index.cjs CHANGED
@@ -1,6 +1,6 @@
1
1
  /*
2
- * @ezuikit/player-theme v3.1.0-beta.4
3
- * Copyright (c) 2026-07-06 Ezviz-OpenBiz
2
+ * @ezuikit/player-theme v3.1.1-beta.1
3
+ * Copyright (c) 2026-07-30 11:17:11 Ezviz-OpenBiz
4
4
  * Released under the MIT License.
5
5
  */
6
6
  'use strict';
@@ -954,7 +954,11 @@ var MESSAGE_DEFAULT_OPTIONS = {};
954
954
  if (duration === void 0) duration = 2;
955
955
  this._toast(msg, 'warn', duration);
956
956
  };
957
- _proto.toastError = function toastError(msg, duration) {
957
+ /**
958
+ * toast 错误消息(渲染在 rootContainer 上的浮层)
959
+ * @param {string} msg 消息内容
960
+ * @param {number} duration 自动关闭延时,单位秒, 默认 2s 后关闭
961
+ */ _proto.toastError = function toastError(msg, duration) {
958
962
  if (duration === void 0) duration = 2;
959
963
  this._toast(msg, 'error', duration);
960
964
  };
@@ -1794,7 +1798,7 @@ var VOLUME_DEFAULT_OPTIONS = {
1794
1798
  tagName: 'span',
1795
1799
  classNameSuffix: 'volume',
1796
1800
  controlType: 'button'
1797
- })) || this, _this._muted = false, _this._volume = 0, /** 用来记录静音前的音量 */ _this._lastVolume = 0, _this._progress = null;
1801
+ })) || this, _this._muted = false, _this._volume = 0, /** 用来记录静音前的音量 */ _this._lastVolume = 0, /** 音量进度条实例 @private */ _this._progress = null;
1798
1802
  _this._options = deepmerge(VOLUME_DEFAULT_OPTIONS, options, {
1799
1803
  clone: false
1800
1804
  });
@@ -2496,7 +2500,7 @@ function _set_prototype_of$s(o, p) {
2496
2500
  tagName: 'span',
2497
2501
  classNameSuffix: 'fullscreen',
2498
2502
  controlType: 'button'
2499
- }, options)) || this, _this.isCurrentFullscreen = false;
2503
+ }, options)) || this, /** 当前是否处于全屏状态 */ _this.isCurrentFullscreen = false;
2500
2504
  _this.options = options;
2501
2505
  _this.isCurrentFullscreen = !!((_options_props = options.props) == null ? void 0 : _options_props.isCurrentFullscreen);
2502
2506
  _this._$rootContainer = (_this_options = _this.options) == null ? void 0 : _this_options.rootContainer;
@@ -2612,14 +2616,19 @@ function _set_prototype_of$r(o, p) {
2612
2616
  return _this;
2613
2617
  }
2614
2618
  var _proto = Rec.prototype;
2615
- _proto.destroy = function destroy() {
2619
+ /**
2620
+ * 销毁
2621
+ */ _proto.destroy = function destroy() {
2616
2622
  var _this__delegation;
2617
2623
  this.$container.removeEventListener('dblclick', this._onDBlClick);
2618
2624
  (_this__delegation = this._delegation) == null ? void 0 : _this__delegation.destroy();
2619
2625
  this._delegation = null;
2620
2626
  Control.prototype.destroy.call(this);
2621
2627
  };
2622
- _proto.addRecType = function addRecType(id) {
2628
+ /**
2629
+ * 添加回放类型图标
2630
+ * @param {string} id 回放类型 'rec' | 'cloudRec' | 'cloudRecord'
2631
+ */ _proto.addRecType = function addRecType(id) {
2623
2632
  var spanIcon = '';
2624
2633
  switch(id){
2625
2634
  case 'rec':
@@ -5121,7 +5130,12 @@ function _ts_generator$6(thisArg, body) {
5121
5130
  };
5122
5131
  }
5123
5132
  }
5124
- function getThemeDataByTemplate(theme, id) {
5133
+ /**
5134
+ * 获取开放平台轻应用模板数据
5135
+ * @param theme
5136
+ * @param id 开放平台轻应用模板id (https://open.ys7.com/console/ezuikit/template.html)
5137
+ * @returns
5138
+ */ function getThemeDataByTemplate(theme, id) {
5125
5139
  return _async_to_generator$6(function() {
5126
5140
  var _theme_options_token_httpToken, _theme_options_token, url;
5127
5141
  return _ts_generator$6(this, function(_state) {
@@ -5430,7 +5444,8 @@ function _filterLeftRightControls(btnList) {
5430
5444
  }
5431
5445
  /**
5432
5446
  * 获取主题数据 (主题优先级: template > themeDate)
5433
- * @param data
5447
+ * @param theme 主题实例
5448
+ * @param data 主题数据或模板id(萤石开放平台轻应用32位模板字符串)或模板名称
5434
5449
  * @returns
5435
5450
  */ function getThemeData(theme, data) {
5436
5451
  return _async_to_generator$5(function() {
@@ -7456,6 +7471,7 @@ function _set_prototype_of$c(o, p) {
7456
7471
  }, options, {
7457
7472
  showEventFilter: false,
7458
7473
  showCardTypeIcon: false,
7474
+ sections: [],
7459
7475
  onCardClick: function(section, index, sections) {
7460
7476
  _this.emit(EVENTS.control.recListCardClick, section, index, sections);
7461
7477
  },
@@ -8609,6 +8625,7 @@ function _set_prototype_of$5(o, p) {
8609
8625
  showCoverFold: (_this__options_showCoverFold = this._options.showCoverFold) != null ? _this__options_showCoverFold : true,
8610
8626
  hoverTipPlacement: 'top'
8611
8627
  }, this._options || {}, {
8628
+ showSectionIcon: false,
8612
8629
  onClickSeek: function(date) {
8613
8630
  if (date == null ? void 0 : date.getTime()) {
8614
8631
  _this._options.onClickSeek == null ? void 0 : _this._options.onClickSeek.call(_this._options, date);
@@ -9720,6 +9737,97 @@ var _renderRecType = function(theme, container, recType, props) {
9720
9737
  if ((_theme_controls1 = theme.controls) == null ? void 0 : _theme_controls1['recControl']) ((_theme_controls2 = theme.controls) == null ? void 0 : _theme_controls2['recControl']).addRecType(recType);
9721
9738
  };
9722
9739
 
9740
+ /**
9741
+ * 布局溢出(More 收纳)与响应式尺寸分档的**纯函数**模块。
9742
+ *
9743
+ * @remarks
9744
+ * 这些函数只做「计算 / 判定」,不含任何 DOM 副作用,因此可以在没有布局引擎的环境(如 jsdom)
9745
+ * 中被完整单元测试。`theme.ts` 中的命令式外壳(读取 `clientWidth`、增删 class、创建 More、
9746
+ * 搬移控件)负责副作用,具体的判定逻辑全部下沉到这里。
9747
+ */ /**
9748
+ * 一次 classList 变更集合:需要添加与需要移除的类名。
9749
+ */ /**
9750
+ * 根据尺寸计算某一维度(宽或高)需要增删的响应式档位类名。
9751
+ *
9752
+ * 档位规则:
9753
+ * - `(280, 375]` → medium
9754
+ * - `(200, 280]` → small
9755
+ * - `<= 200` → mini
9756
+ * - 其它(> 375)→ 无档位(移除全部)
9757
+ *
9758
+ * @param size 尺寸(px)
9759
+ * @param axis `'width'` 或 `'height'`
9760
+ * @param prefix 类名前缀(如 `ezplayer`)
9761
+ */ function computeDimensionClasses(size, axis, prefix) {
9762
+ var medium = prefix + "-medium-" + axis;
9763
+ var small = prefix + "-small-" + axis;
9764
+ var mini = prefix + "-mini-" + axis;
9765
+ var add = [];
9766
+ var remove = [];
9767
+ if (size > 280 && size <= 375) {
9768
+ add.push(medium);
9769
+ remove.push(small, mini);
9770
+ } else if (size > 200 && size <= 280) {
9771
+ add.push(small);
9772
+ remove.push(medium, mini);
9773
+ } else {
9774
+ if (size <= 200) {
9775
+ add.push(mini);
9776
+ } else {
9777
+ remove.push(mini);
9778
+ }
9779
+ remove.push(small, medium);
9780
+ }
9781
+ return {
9782
+ add: add,
9783
+ remove: remove
9784
+ };
9785
+ }
9786
+ /**
9787
+ * 计算宽、高两个维度的响应式档位类名增删集合。
9788
+ * @param width 容器宽度(px)
9789
+ * @param height 容器高度(px)
9790
+ * @param prefix 类名前缀
9791
+ */ function computeSizeClasses(width, height, prefix) {
9792
+ var w = computeDimensionClasses(width, 'width', prefix);
9793
+ var h = computeDimensionClasses(height, 'height', prefix);
9794
+ return {
9795
+ add: [].concat(w.add, h.add),
9796
+ remove: [].concat(w.remove, h.remove)
9797
+ };
9798
+ }
9799
+ /**
9800
+ * header 左右控件宽度之和 + 30 是否超过容器宽度 —— 超过则需要显示 More。
9801
+ */ function shouldShowHeaderMore(width, leftWidth, rightWidth) {
9802
+ return leftWidth + rightWidth + 30 > width;
9803
+ }
9804
+ /**
9805
+ * header 剩余空间是否 > 100 —— 足够则可以移除 More,把控件放回工具栏。
9806
+ */ function shouldRemoveHeaderMore(width, leftWidth, rightWidth) {
9807
+ return width - leftWidth - rightWidth > 100;
9808
+ }
9809
+ /**
9810
+ * footer 剩余空间是否 < 16 —— 不足则需要把控件收拢进 More。
9811
+ */ function shouldCollapseFooter(width, leftWidth, rightWidth) {
9812
+ return width - leftWidth - rightWidth < 16;
9813
+ }
9814
+ /**
9815
+ * footer 从 More 中释放控件时的展开阈值。
9816
+ *
9817
+ * 基准为 50;当 More 中已有控件时,加上首个控件宽度(保持与历史实现一致的运算与兜底:
9818
+ * `50 + firstItemWidth || 0`)。
9819
+ * @param firstItemWidth More 列表中第一个控件的宽度;未提供表示 More 为空。
9820
+ */ function computeFooterExpandOffset(firstItemWidth) {
9821
+ var base = 50;
9822
+ if (firstItemWidth === undefined) return base;
9823
+ return base + firstItemWidth || 0;
9824
+ }
9825
+ /**
9826
+ * footer 剩余空间是否足够把一个控件从 More 释放回工具栏。
9827
+ */ function shouldExpandFooter(width, leftWidth, rightWidth, offset) {
9828
+ return width - leftWidth - rightWidth > offset;
9829
+ }
9830
+
9723
9831
  /* eslint-disable @typescript-eslint/no-non-null-assertion */ function _array_like_to_array(arr, len) {
9724
9832
  if (len == null || len > arr.length) len = arr.length;
9725
9833
  for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
@@ -9973,7 +10081,7 @@ var THEME_DEFAULT_OPTIONS = {
9973
10081
  _inherits(Theme, EventEmitter);
9974
10082
  function Theme(options) {
9975
10083
  var _this;
9976
- var _this_options_volumeOptions, _this_options_volumeOptions1, _this_options_speedOptions, _this_options, _this_options1, _this_options2, _this_options3;
10084
+ var _this_options_volumeOptions, _this_options_volumeOptions1, _this_options_speedOptions, _this_options, _this_options1;
9977
10085
  _this = EventEmitter.call(this) || this, /** 播放器配置项 */ _this.options = THEME_DEFAULT_OPTIONS, _this.staticPath = '', /** 所有控件列表, 所有控件名称规则(`${iconId}Control`), 如音量控件 this.controls["volumeControl"] @since 0.0.1 */ _this.controls = {}, /**
9978
10086
  * @since 0.0.1
9979
10087
  * @private
@@ -10053,16 +10161,31 @@ var THEME_DEFAULT_OPTIONS = {
10053
10161
  _this._headerMoreControlShow = debounce(_this._headerMoreControlShow.bind(_this), 200);
10054
10162
  _this._footerMoreControlShow = debounce(_this._footerMoreControlShow.bind(_this), 200);
10055
10163
  _this.destroyed = false;
10056
- var _this_options_template, _ref3;
10057
- // 标准流暂时仅支持 TEMPLATES 中的配置, 多余的的展示不生效(如电子放大是不支持的等等), 待版本更新才能支持
10058
- // prettier-ignore
10059
- _this._renderTheme(// hls 不支持自定义
10060
- options.type === 'hls' || options.type === 'ezhls' ? hlsLiveTemplate : // flv mp4 支持自定义 themeData
10061
- [
10164
+ // 标准流暂时仅支持 TEMPLATES 中的配置,多余的展示不生效(如电子放大等),待版本更新后才能支持。
10165
+ //
10166
+ // 下面根据播放类型决定初始渲染使用的「主题数据 / 模板」,规则如下:
10167
+ // 关键点:themeData 只要不是 undefined(即便显式传入 null)就以它为准,
10168
+ // 仅当未传(undefined)时才回退到对应的标准模板;
10169
+ // 因此 themeData: null 表示「不展示主题」,而非回退到默认模板。
10170
+ var themeData = (_this_options = _this.options) == null ? void 0 : _this_options.themeData; // IThemeData | null | undefined
10171
+ var template = (_this_options1 = _this.options) == null ? void 0 : _this_options1.template; // ThemeTemplateType | string | undefined
10172
+ var initialThemeData;
10173
+ if (options.type === 'hls' || options.type === 'ezhls') {
10174
+ // hls / ezhls:@3.1.1 起支持自定义 themeData,但不支持标准提供的模板;未传时回退 hlsLiveTemplate
10175
+ // FIXME: 部分控件在 hls 下不生效,开发者需自行斟酌
10176
+ initialThemeData = themeData !== undefined ? themeData : hlsLiveTemplate;
10177
+ } else if ([
10062
10178
  'flv',
10063
10179
  'mp4'
10064
- ].includes(options.type) ? ((_this_options = _this.options) == null ? void 0 : _this_options.themeData) !== undefined ? (_this_options1 = _this.options) == null ? void 0 : _this_options1.themeData : LiveTemplate // 标准流仅支持 null 和 LiveTemplate (支持自定义 2026-01-19)
10065
- : (_ref3 = (_this_options_template = (_this_options2 = _this.options) == null ? void 0 : _this_options2.template) != null ? _this_options_template : (_this_options3 = _this.options) == null ? void 0 : _this_options3.themeData) != null ? _ref3 : null);
10180
+ ].includes(options.type)) {
10181
+ // flv / mp4:支持自定义 themeData,未传时回退到标准直播模板 LiveTemplate(2026-01-19 起支持自定义)
10182
+ initialThemeData = themeData !== undefined ? themeData : LiveTemplate;
10183
+ } else {
10184
+ var _ref3;
10185
+ // 其余类型(如 ezopen 私有流):template 优先级高于 themeData,二者都未设置时为 null
10186
+ initialThemeData = (_ref3 = template != null ? template : themeData) != null ? _ref3 : null;
10187
+ }
10188
+ _this._renderTheme(initialThemeData);
10066
10189
  _this._addEventListener();
10067
10190
  _themeEventemitter(_this);
10068
10191
  return _this;
@@ -10457,6 +10580,7 @@ var THEME_DEFAULT_OPTIONS = {
10457
10580
  this._mobileInnerWidthHeight();
10458
10581
  window.addEventListener('resize', this._throttleMobileInnerWidthHeight);
10459
10582
  // ------------------------------ resize observer ----------------------------
10583
+ // istanbul ignore next -- jsdom has no layout engine; clientWidth/height-driven resize bucketing is not exercisable in unit tests
10460
10584
  // prettier-ignore
10461
10585
  this._cleanUpResizeObserver = Utils.resizeObserver(this.$container, throttle(function() {
10462
10586
  var // 窗口尺寸变化时,设置窗口超出隐藏,防止出现滚动条
@@ -10465,40 +10589,14 @@ var THEME_DEFAULT_OPTIONS = {
10465
10589
  // 这里不要使用 $containerWarp.getBoundingClientRect() 获取宽和高 因为会出现小数导致两次(设置后的值和设置后再次获取的值)的宽高不一致 (因为缩放后取整设置,再次获取还有可能是带小数的然后取整 对比两次不一致,一般在屏幕缩放百分比变化和浏览器页面缩放时出现),致使一直触发 resize 事件
10466
10590
  var width = Math.floor(_this.$container.clientWidth);
10467
10591
  var height = Math.floor(_this.$container.clientHeight);
10468
- if (width > 280 && width <= 375) {
10469
- _this.$container.classList.add("" + PREFIX_CLASS + "-medium-width");
10470
- _this.$container.classList.remove("" + PREFIX_CLASS + "-small-width");
10471
- _this.$container.classList.remove("" + PREFIX_CLASS + "-mini-width");
10472
- } else if (width > 200 && width <= 280) {
10473
- _this.$container.classList.add("" + PREFIX_CLASS + "-small-width");
10474
- _this.$container.classList.remove("" + PREFIX_CLASS + "-medium-width");
10475
- _this.$container.classList.remove("" + PREFIX_CLASS + "-mini-width");
10476
- } else {
10477
- if (width <= 200) {
10478
- _this.$container.classList.add("" + PREFIX_CLASS + "-mini-width");
10479
- } else {
10480
- _this.$container.classList.remove("" + PREFIX_CLASS + "-mini-width");
10481
- }
10482
- _this.$container.classList.remove("" + PREFIX_CLASS + "-small-width");
10483
- _this.$container.classList.remove("" + PREFIX_CLASS + "-medium-width");
10484
- }
10485
- if (height > 280 && height <= 375) {
10486
- _this.$container.classList.add("" + PREFIX_CLASS + "-medium-height");
10487
- _this.$container.classList.remove("" + PREFIX_CLASS + "-small-height");
10488
- _this.$container.classList.remove("" + PREFIX_CLASS + "-mini-height");
10489
- } else if (height > 200 && height <= 280) {
10490
- _this.$container.classList.add("" + PREFIX_CLASS + "-small-height");
10491
- _this.$container.classList.remove("" + PREFIX_CLASS + "-medium-height");
10492
- _this.$container.classList.remove("" + PREFIX_CLASS + "-mini-height");
10493
- } else {
10494
- if (height <= 200) {
10495
- _this.$container.classList.add("" + PREFIX_CLASS + "-mini-height");
10496
- } else {
10497
- _this.$container.classList.remove("" + PREFIX_CLASS + "-mini-height");
10498
- }
10499
- _this.$container.classList.remove("" + PREFIX_CLASS + "-small-height");
10500
- _this.$container.classList.remove("" + PREFIX_CLASS + "-medium-height");
10501
- }
10592
+ // 响应式档位类名(纯逻辑见 ./Theme/overflow computeSizeClasses)
10593
+ var sizeClasses = computeSizeClasses(width, height, PREFIX_CLASS);
10594
+ sizeClasses.add.forEach(function(c) {
10595
+ return _this.$container.classList.add(c);
10596
+ });
10597
+ sizeClasses.remove.forEach(function(c) {
10598
+ return _this.$container.classList.remove(c);
10599
+ });
10502
10600
  //
10503
10601
  if (_this.width !== width || _this.height !== height) {
10504
10602
  var _this_controls;
@@ -10544,7 +10642,7 @@ var THEME_DEFAULT_OPTIONS = {
10544
10642
  /**
10545
10643
  * 窗口尺寸变化判断头部是否需要隐藏控件展示在更多中
10546
10644
  * 尺寸变化结束时 进行判断,为了节省开销
10547
- */ _proto._headerMoreControlShow = function _headerMoreControlShow() {
10645
+ */ /* istanbul ignore next -- jsdom has no layout engine; clientWidth-driven header overflow (More) logic is not exercisable in unit tests */ _proto._headerMoreControlShow = function _headerMoreControlShow() {
10548
10646
  var _this = this;
10549
10647
  if (this._header) {
10550
10648
  var _this__header_$left, _this__header, _this__header_$right, _this__header1;
@@ -10555,7 +10653,7 @@ var THEME_DEFAULT_OPTIONS = {
10555
10653
  var rightWidth = ((_this__header1 = this._header) == null ? void 0 : (_this__header_$right = _this__header1.$right) == null ? void 0 : _this__header_$right.clientWidth) || 0;
10556
10654
  // 当header 中 left 和 right 宽度之和大于 header 宽度,则 header more 显示
10557
10655
  // 如果 header more 存在,则偏移量量宽度为 150,否则为 100, 因为隐藏多个控件时 right 会变短
10558
- var showHeaderMore = leftWidth + rightWidth + 30 > this._width;
10656
+ var showHeaderMore = shouldShowHeaderMore(this._width, leftWidth, rightWidth);
10559
10657
  if (showHeaderMore) {
10560
10658
  var _this_controls;
10561
10659
  if (!this._headerMoreControl && ((_this_controls = this.controls) == null ? void 0 : _this_controls.recControl)) {
@@ -10583,7 +10681,7 @@ var THEME_DEFAULT_OPTIONS = {
10583
10681
  (_this_controls1 = this.controls) == null ? void 0 : (_this_controls_recControl = _this_controls1.recControl) == null ? void 0 : _this_controls_recControl.resetPopupContainer(this._headerMoreControl.$panel);
10584
10682
  }
10585
10683
  this.emit(Theme.EVENTS.control.headerMoreShowControlsChange, showHeaderMore);
10586
- } else if (this._width - leftWidth - rightWidth > 100) {
10684
+ } else if (shouldRemoveHeaderMore(this._width, leftWidth, rightWidth)) {
10587
10685
  var _this_controls2;
10588
10686
  //
10589
10687
  if (this._headerMoreControl && ((_this_controls2 = this.controls) == null ? void 0 : _this_controls2.recControl)) {
@@ -10603,7 +10701,7 @@ var THEME_DEFAULT_OPTIONS = {
10603
10701
  */ _proto._footerMoreControlShow = function _footerMoreControlShow() {
10604
10702
  this._displayMore();
10605
10703
  };
10606
- _proto._displayMore = function _displayMore() {
10704
+ /* istanbul ignore next -- jsdom has no layout engine; clientWidth-driven footer overflow (More) logic is not exercisable in unit tests */ _proto._displayMore = function _displayMore() {
10607
10705
  var _this = this;
10608
10706
  if (this._footer) {
10609
10707
  var _this__footer_$left, _this__footer_$right;
@@ -10611,7 +10709,7 @@ var THEME_DEFAULT_OPTIONS = {
10611
10709
  var leftWidth = ((_this__footer_$left = this._footer.$left) == null ? void 0 : _this__footer_$left.clientWidth) || 0;
10612
10710
  var rightWidth = ((_this__footer_$right = this._footer.$right) == null ? void 0 : _this__footer_$right.clientWidth) || 0;
10613
10711
  // 当footer 中 left 和 right 宽度之和大于 footer 宽度,则 footer more 显示
10614
- var collapseControl = this._width - leftWidth - rightWidth < 16; // 收拢控件到 More 中
10712
+ var collapseControl = shouldCollapseFooter(this._width, leftWidth, rightWidth); // 收拢控件到 More 中
10615
10713
  if (collapseControl) {
10616
10714
  var _this__footer, _this__themeData_footer, _this__themeData, _this__footerMoreControl_list, _this__footerMoreControl, _this__footerMoreControl_list1, _this__footerMoreControl1;
10617
10715
  if (!this._footerMoreControl && ((_this__footer = this._footer) == null ? void 0 : _this__footer.$right)) {
@@ -10691,28 +10789,23 @@ var THEME_DEFAULT_OPTIONS = {
10691
10789
  this._displayMore();
10692
10790
  }
10693
10791
  } else {
10694
- var _this__footerMoreControl_list2, _this__footerMoreControl5, _this__footerMoreControl_list3, _this__footerMoreControl6;
10695
- var offset = 50;
10696
- // if (this._footerMoreControl?.list?.length && this._footerMoreControl?.list?.length > 2) {
10697
- // offset = 16;
10698
- // }
10699
- if ((_this__footerMoreControl5 = this._footerMoreControl) == null ? void 0 : (_this__footerMoreControl_list2 = _this__footerMoreControl5.list) == null ? void 0 : _this__footerMoreControl_list2.length) {
10700
- offset = offset + this._footerMoreControl.list[0].width || 0;
10701
- }
10702
- if (((_this__footerMoreControl6 = this._footerMoreControl) == null ? void 0 : (_this__footerMoreControl_list3 = _this__footerMoreControl6.list) == null ? void 0 : _this__footerMoreControl_list3.length) && this._width - leftWidth - rightWidth > offset) {
10703
- var _this__footerMoreControl7, _this__footerMoreControl_list4, _this__footerMoreControl8, _this__footerMoreControl_list5, _this__footerMoreControl9;
10792
+ var _this__footerMoreControl_list2, _this__footerMoreControl4, _this__footerMoreControl_list3, _this__footerMoreControl5;
10793
+ // 展开阈值(纯逻辑见 ./Theme/overflow computeFooterExpandOffset)
10794
+ var offset = computeFooterExpandOffset(((_this__footerMoreControl4 = this._footerMoreControl) == null ? void 0 : (_this__footerMoreControl_list2 = _this__footerMoreControl4.list) == null ? void 0 : _this__footerMoreControl_list2.length) ? this._footerMoreControl.list[0].width : undefined);
10795
+ if (((_this__footerMoreControl5 = this._footerMoreControl) == null ? void 0 : (_this__footerMoreControl_list3 = _this__footerMoreControl5.list) == null ? void 0 : _this__footerMoreControl_list3.length) && shouldExpandFooter(this._width, leftWidth, rightWidth, offset)) {
10796
+ var _this__footerMoreControl6, _this__footerMoreControl_list4, _this__footerMoreControl7, _this__footerMoreControl_list5, _this__footerMoreControl8;
10704
10797
  // 110 是为了保住个别控件的宽度超出已知的值, 如英文下 按钮的宽度
10705
10798
  // 从 More 中一次移除一个控件到 header/footer 中
10706
10799
  //
10707
- var item2 = (_this__footerMoreControl7 = this._footerMoreControl) == null ? void 0 : _this__footerMoreControl7.list.shift();
10800
+ var item2 = (_this__footerMoreControl6 = this._footerMoreControl) == null ? void 0 : _this__footerMoreControl6.list.shift();
10708
10801
  if (item2) {
10709
- var _this__footerMoreControl10;
10802
+ var _this__footerMoreControl9;
10710
10803
  if (item2.part === 'left') {
10711
10804
  var _item_control_resetPopupContainer, _item_control;
10712
10805
  (_item_control = item2.control) == null ? void 0 : (_item_control_resetPopupContainer = _item_control.resetPopupContainer) == null ? void 0 : _item_control_resetPopupContainer.call(_item_control, this._footer.$left, 'append');
10713
10806
  } else if (item2.part === 'right') {
10714
- var _this__footerMoreControl_list6, _this__footerMoreControl11;
10715
- if (((_this__footerMoreControl11 = this._footerMoreControl) == null ? void 0 : (_this__footerMoreControl_list6 = _this__footerMoreControl11.list) == null ? void 0 : _this__footerMoreControl_list6.length) === 0) {
10807
+ var _this__footerMoreControl_list6, _this__footerMoreControl10;
10808
+ if (((_this__footerMoreControl10 = this._footerMoreControl) == null ? void 0 : (_this__footerMoreControl_list6 = _this__footerMoreControl10.list) == null ? void 0 : _this__footerMoreControl_list6.length) === 0) {
10716
10809
  var _item_control_resetPopupContainer1, _item_control1;
10717
10810
  (_item_control1 = item2.control) == null ? void 0 : (_item_control_resetPopupContainer1 = _item_control1.resetPopupContainer) == null ? void 0 : _item_control_resetPopupContainer1.call(_item_control1, this._footer.$right, 'append');
10718
10811
  } else {
@@ -10720,14 +10813,14 @@ var THEME_DEFAULT_OPTIONS = {
10720
10813
  (_item_control2 = item2.control) == null ? void 0 : (_item_control_resetPopupContainer2 = _item_control2.resetPopupContainer) == null ? void 0 : _item_control_resetPopupContainer2.call(_item_control2, this._footer.$right, 'before', this._footerMoreControl.$container);
10721
10814
  }
10722
10815
  }
10723
- (_this__footerMoreControl10 = this._footerMoreControl) == null ? void 0 : _this__footerMoreControl10.remove(item2.control);
10816
+ (_this__footerMoreControl9 = this._footerMoreControl) == null ? void 0 : _this__footerMoreControl9.remove(item2.control);
10724
10817
  }
10725
- if (((_this__footerMoreControl8 = this._footerMoreControl) == null ? void 0 : (_this__footerMoreControl_list4 = _this__footerMoreControl8.list) == null ? void 0 : _this__footerMoreControl_list4.length) === 1) {
10726
- var _this__footerMoreControl12, _this__footerMoreControl_destroy, _this__footerMoreControl13;
10818
+ if (((_this__footerMoreControl7 = this._footerMoreControl) == null ? void 0 : (_this__footerMoreControl_list4 = _this__footerMoreControl7.list) == null ? void 0 : _this__footerMoreControl_list4.length) === 1) {
10819
+ var _this__footerMoreControl11, _this__footerMoreControl_destroy, _this__footerMoreControl12;
10727
10820
  // 最后一个, 移除 More
10728
- var item11 = (_this__footerMoreControl12 = this._footerMoreControl) == null ? void 0 : _this__footerMoreControl12.list.shift();
10821
+ var item11 = (_this__footerMoreControl11 = this._footerMoreControl) == null ? void 0 : _this__footerMoreControl11.list.shift();
10729
10822
  if (item11) {
10730
- var _this__footerMoreControl14;
10823
+ var _this__footerMoreControl13;
10731
10824
  if (item11.part === 'left') {
10732
10825
  var _item1_control_resetPopupContainer, _item1_control;
10733
10826
  (_item1_control = item11.control) == null ? void 0 : (_item1_control_resetPopupContainer = _item1_control.resetPopupContainer) == null ? void 0 : _item1_control_resetPopupContainer.call(_item1_control, this._footer.$left, 'append');
@@ -10735,13 +10828,13 @@ var THEME_DEFAULT_OPTIONS = {
10735
10828
  var _item1_control_resetPopupContainer1, _item1_control1;
10736
10829
  (_item1_control1 = item11.control) == null ? void 0 : (_item1_control_resetPopupContainer1 = _item1_control1.resetPopupContainer) == null ? void 0 : _item1_control_resetPopupContainer1.call(_item1_control1, this._footer.$right, 'append');
10737
10830
  }
10738
- (_this__footerMoreControl14 = this._footerMoreControl) == null ? void 0 : _this__footerMoreControl14.remove(item11.control);
10831
+ (_this__footerMoreControl13 = this._footerMoreControl) == null ? void 0 : _this__footerMoreControl13.remove(item11.control);
10739
10832
  }
10740
- (_this__footerMoreControl13 = this._footerMoreControl) == null ? void 0 : (_this__footerMoreControl_destroy = _this__footerMoreControl13.destroy) == null ? void 0 : _this__footerMoreControl_destroy.call(_this__footerMoreControl13);
10833
+ (_this__footerMoreControl12 = this._footerMoreControl) == null ? void 0 : (_this__footerMoreControl_destroy = _this__footerMoreControl12.destroy) == null ? void 0 : _this__footerMoreControl_destroy.call(_this__footerMoreControl12);
10741
10834
  this._footerMoreControl = null;
10742
10835
  }
10743
10836
  // prettier-ignore
10744
- this.emit(Theme.EVENTS.control.footerMoreShowControlsChange, !!this._footerMoreControl, (_this__footerMoreControl9 = this._footerMoreControl) == null ? void 0 : (_this__footerMoreControl_list5 = _this__footerMoreControl9.list) == null ? void 0 : _this__footerMoreControl_list5.map(function(item) {
10837
+ this.emit(Theme.EVENTS.control.footerMoreShowControlsChange, !!this._footerMoreControl, (_this__footerMoreControl8 = this._footerMoreControl) == null ? void 0 : (_this__footerMoreControl_list5 = _this__footerMoreControl8.list) == null ? void 0 : _this__footerMoreControl_list5.map(function(item) {
10745
10838
  return item.key;
10746
10839
  }));
10747
10840
  this._displayMore();
@@ -11268,7 +11361,7 @@ var THEME_DEFAULT_OPTIONS = {
11268
11361
  zh: zh,
11269
11362
  en: en
11270
11363
  };
11271
- /** 版本号 @since 0.0.1 */ Theme.THEME_VERSION = '3.1.0-beta.4';
11364
+ /** 版本号 @since 0.0.1 */ Theme.THEME_VERSION = '3.1.1-beta.1';
11272
11365
 
11273
11366
  exports.Control = Control;
11274
11367
  exports.EVENTS = EVENTS;