zmdms-webui 1.2.6 → 1.2.8
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/es/container/index.css +1 -1
- package/dist/es/login/forget-password.js +0 -1
- package/dist/es/table/components/EnhanceBodyCell.js +1 -1
- package/dist/es/table/useTableValidate.js +6 -1
- package/dist/es/title/index.css +1 -1
- package/dist/index.dark.css +1 -1
- package/dist/index.default.css +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
.ztxk-container{min-height:100px;overflow:auto;position:relative}.ztxk-container .ztxk-container__loading{align-items:center;background-color:#bbc7d366;bottom:0;display:flex;flex-direction:column;justify-content:center;left:0;min-height:100px;position:absolute;right:0;text-align:center;top:0;z-index:10000}.ztxk-container .ztxk-container__content{background-color:#fff;margin:10px;overflow-y:auto;padding:10px}.ztxk-container .ztxk-container__content.ztxk-container__content--flex{display:flex;flex-direction:column}.ztxk-container .ztxk-container__content.ztxk-container__content--title{padding:0!important}.ztxk-container .ztxk-container__content.ztxk-container__content--title .ztxk-container__content--main{
|
|
1
|
+
.ztxk-container{min-height:100px;overflow:auto;position:relative}.ztxk-container .ztxk-container__loading{align-items:center;background-color:#bbc7d366;bottom:0;display:flex;flex-direction:column;justify-content:center;left:0;min-height:100px;position:absolute;right:0;text-align:center;top:0;z-index:10000}.ztxk-container .ztxk-container__content{background-color:#fff;margin:10px;overflow-y:auto;padding:10px}.ztxk-container .ztxk-container__content.ztxk-container__content--flex{display:flex;flex-direction:column}.ztxk-container .ztxk-container__content.ztxk-container__content--title{display:flex;flex-direction:column;padding:0!important}.ztxk-container .ztxk-container__content.ztxk-container__content--title .ztxk-container__content--main{flex-grow:1;overflow-y:auto;padding:10px}.ztxk-container--btn-wrap.btn-wrap--margin-top{margin-top:10px}.ztxk-container--btn-wrap>button{margin-bottom:10px;margin-right:10px}.ztxk-container--scroll-wrap{overflow-y:auto}.ztxk-container--scroll-wrap.scroll-wrap--margin-top{margin-top:10px}
|
|
@@ -148,7 +148,7 @@ var EnhanceCell = function (props) {
|
|
|
148
148
|
: val, _a)), index, dataIndex);
|
|
149
149
|
};
|
|
150
150
|
// 如果开启编辑 那么内部直接代理
|
|
151
|
-
if (typeof editable === "function" ? editable(newRecord) : editable) {
|
|
151
|
+
if (typeof editable === "function" ? editable(newRecord, index) : editable) {
|
|
152
152
|
var _g = editableConfig || {
|
|
153
153
|
type: "input",
|
|
154
154
|
}, type = _g.type, max = _g.max, min = _g.min, maxHandle = _g.maxHandle, minHandle = _g.minHandle, disabled = _g.disabled, disabledHandle = _g.disabledHandle, resetEditableConfigProps = __rest(_g, ["type", "max", "min", "maxHandle", "minHandle", "disabled", "disabledHandle"]);
|
|
@@ -73,8 +73,12 @@ function tableValidate(dataSource, columns, restParams) {
|
|
|
73
73
|
columns.forEach(function (column, index) {
|
|
74
74
|
var _a, _b;
|
|
75
75
|
if (!isMerge) {
|
|
76
|
+
// 这里判断需要改动，只需要有rowSpan属性或者colSpan属性就有合并
|
|
76
77
|
var mergeColumn = (_a = column === null || column === void 0 ? void 0 : column.onCell) === null || _a === void 0 ? void 0 : _a.call(column, {}, 1);
|
|
77
|
-
if (mergeColumn && (mergeColumn
|
|
78
|
+
// if (mergeColumn && (mergeColumn?.rowSpan || mergeColumn?.colSpan)) {
|
|
79
|
+
if (mergeColumn &&
|
|
80
|
+
(Reflect.has(mergeColumn, "rowSpan") ||
|
|
81
|
+
Reflect.has(mergeColumn, "colSpan"))) {
|
|
78
82
|
isMerge = true;
|
|
79
83
|
}
|
|
80
84
|
}
|
|
@@ -96,6 +100,7 @@ function tableValidate(dataSource, columns, restParams) {
|
|
|
96
100
|
column.__title ||
|
|
97
101
|
column.title,
|
|
98
102
|
validate: column.validate,
|
|
103
|
+
// 错误发生的列
|
|
99
104
|
index: childrenLen + (rowSelection ? 1 : 0) + (expandable ? 1 : 0),
|
|
100
105
|
});
|
|
101
106
|
}
|
package/dist/es/title/index.css
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
.ztxk-title{align-items:center;display:flex;
|
|
1
|
+
.ztxk-title{align-items:center;display:flex;justify-content:space-between;width:100%}.ztxk-title.ztxk-title--paddingSide{padding:5px 10px}.ztxk-title.ztxk-title--sticky{position:sticky;top:0}.ztxk-title .ztxk-title--title{color:#333;font-size:18px;font-weight:600}.ztxk-title .ztxk-title--title>*{font-size:inherit}.ztxk-title .ztxk-title--extra{color:#333;font-size:13px}.ztxk-title.ztxk-title--bordered{border-bottom:1px solid #dde8f5}.ztxk-title.ztxk-title--all-bordered{border:1px solid #dde8f5}.ztxk-title.ztxk-title--background{background-color:#eff5fe}.ztxk-title.ztxk-title--bg-white{background-color:#fff}.ztxk-title.ztxk-title--marginTop{margin-top:10px}.ztxk-title.ztxk-title--marginBottom{margin-bottom:10px}.ztxk-title.ztxk-title--paddingTop{padding-top:10px}.ztxk-title.ztxk-title--paddingBottom{padding-bottom:10px}
|