@byteluck-fe/model-driven-controls 6.2.0-1-beta.3 → 6.2.0-1-beta.7

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.
@@ -80,11 +80,17 @@ var ColControlProperty = /*#__PURE__*/ function(LayoutControlProperty) {
80
80
  var _this;
81
81
  _this = _call_super(this, ColControlProperty, [
82
82
  props
83
- ]), _define_property(_this, "span", void 0), _define_property(_this, "offset", void 0);
83
+ ]), _define_property(_this, "span", void 0), _define_property(_this, "offset", void 0), // 在表格布局中的合并单元格数量
84
+ _define_property(_this, "tableLayoutColSpan", void 0), // full 占满整行,'' 没有合并单元格,custom 自定义合并格数
85
+ _define_property(_this, "tableLayoutColSpanType", void 0);
84
86
  var _props_span;
85
87
  _this.span = (_props_span = props === null || props === void 0 ? void 0 : props.span) !== null && _props_span !== void 0 ? _props_span : BASE_SPAN;
86
88
  var _props_offset;
87
89
  _this.offset = (_props_offset = props === null || props === void 0 ? void 0 : props.offset) !== null && _props_offset !== void 0 ? _props_offset : 0;
90
+ var _props_tableLayoutColSpan;
91
+ _this.tableLayoutColSpan = (_props_tableLayoutColSpan = props === null || props === void 0 ? void 0 : props.tableLayoutColSpan) !== null && _props_tableLayoutColSpan !== void 0 ? _props_tableLayoutColSpan : 0;
92
+ var _props_tableLayoutColSpanType;
93
+ _this.tableLayoutColSpanType = (_props_tableLayoutColSpanType = props === null || props === void 0 ? void 0 : props.tableLayoutColSpanType) !== null && _props_tableLayoutColSpanType !== void 0 ? _props_tableLayoutColSpanType : '';
88
94
  return _this;
89
95
  }
90
96
  return ColControlProperty;
@@ -82,7 +82,8 @@ var TableLayoutControlProperty = /*#__PURE__*/ function(LayoutControlProperty) {
82
82
  ]), _define_property(_this, "rowCount", void 0 //行数
83
83
  ), _define_property(_this, "colCount", void 0 //列数
84
84
  ), _define_property(_this, "labelPosition", void 0 //标题布局
85
- ), _define_property(_this, "colWidth", void 0 //列宽分配, average 平均分配,12:12等为自定义分配
85
+ ), _define_property(_this, "colWidthType", void 0 //列宽分配, average 平均分配,custom为自定义分配
86
+ ), _define_property(_this, "colWidth", void 0 //列宽分配以冒号分割, 12:12为自定义分配
86
87
  ), _define_property(_this, "labelWidth", void 0 // label宽度
87
88
  );
88
89
  var _props_rowCount;
@@ -91,8 +92,10 @@ var TableLayoutControlProperty = /*#__PURE__*/ function(LayoutControlProperty) {
91
92
  _this.colCount = (_props_colCount = props === null || props === void 0 ? void 0 : props.colCount) !== null && _props_colCount !== void 0 ? _props_colCount : 2;
92
93
  var _props_labelPosition;
93
94
  _this.labelPosition = (_props_labelPosition = props === null || props === void 0 ? void 0 : props.labelPosition) !== null && _props_labelPosition !== void 0 ? _props_labelPosition : 'left';
95
+ var _props_colWidthType;
96
+ _this.colWidthType = (_props_colWidthType = props === null || props === void 0 ? void 0 : props.colWidthType) !== null && _props_colWidthType !== void 0 ? _props_colWidthType : 'average';
94
97
  var _props_colWidth;
95
- _this.colWidth = (_props_colWidth = props === null || props === void 0 ? void 0 : props.colWidth) !== null && _props_colWidth !== void 0 ? _props_colWidth : 'average';
98
+ _this.colWidth = (_props_colWidth = props === null || props === void 0 ? void 0 : props.colWidth) !== null && _props_colWidth !== void 0 ? _props_colWidth : '12:12';
96
99
  var _props_labelWidth;
97
100
  _this.labelWidth = (_props_labelWidth = props === null || props === void 0 ? void 0 : props.labelWidth) !== null && _props_labelWidth !== void 0 ? _props_labelWidth : '';
98
101
  return _this;