3h1-ui 2.15.12 → 2.15.14
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/es/index.js +3 -3
- package/lib/index.js +3 -3
- package/package.json +3 -3
package/es/index.js
CHANGED
|
@@ -15668,7 +15668,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
|
|
|
15668
15668
|
return;
|
|
15669
15669
|
let paddingHeight = propsRef.value.useTableWrapper ? 20 : 10;
|
|
15670
15670
|
let paginationHeight = 10;
|
|
15671
|
-
if (!!isBoolean(pagination) && tableData.length !== 0) {
|
|
15671
|
+
if ((!!isBoolean(pagination) || Object.keys(pagination).length) && tableData.length !== 0) {
|
|
15672
15672
|
paginationEl = tableEl.querySelector(".ant-pagination");
|
|
15673
15673
|
if (paginationEl) {
|
|
15674
15674
|
const offsetHeight = paginationEl.offsetHeight;
|
|
@@ -17322,12 +17322,12 @@ function useTableForm(propsRef, slots, fetch, getLoading) {
|
|
|
17322
17322
|
});
|
|
17323
17323
|
return temp;
|
|
17324
17324
|
});
|
|
17325
|
-
const { config } = useGlobalConfig("
|
|
17325
|
+
const { config } = useGlobalConfig("table");
|
|
17326
17326
|
const getFormProps = computed(() => {
|
|
17327
17327
|
const { formConfig } = unref(propsRef);
|
|
17328
17328
|
const { submitButtonOptions } = formConfig || {};
|
|
17329
17329
|
return {
|
|
17330
|
-
...config.formConfig,
|
|
17330
|
+
...config == null ? void 0 : config.formConfig,
|
|
17331
17331
|
showAdvancedButton: true,
|
|
17332
17332
|
rowProps: { gutter: 20 },
|
|
17333
17333
|
...getFormConfig.value,
|
package/lib/index.js
CHANGED
|
@@ -15692,7 +15692,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
|
|
|
15692
15692
|
return;
|
|
15693
15693
|
let paddingHeight = propsRef.value.useTableWrapper ? 20 : 10;
|
|
15694
15694
|
let paginationHeight = 10;
|
|
15695
|
-
if (!!utils.isBoolean(pagination) && tableData.length !== 0) {
|
|
15695
|
+
if ((!!utils.isBoolean(pagination) || Object.keys(pagination).length) && tableData.length !== 0) {
|
|
15696
15696
|
paginationEl = tableEl.querySelector(".ant-pagination");
|
|
15697
15697
|
if (paginationEl) {
|
|
15698
15698
|
const offsetHeight = paginationEl.offsetHeight;
|
|
@@ -17346,12 +17346,12 @@ function useTableForm(propsRef, slots, fetch, getLoading) {
|
|
|
17346
17346
|
});
|
|
17347
17347
|
return temp;
|
|
17348
17348
|
});
|
|
17349
|
-
const { config } = useGlobalConfig("
|
|
17349
|
+
const { config } = useGlobalConfig("table");
|
|
17350
17350
|
const getFormProps = vue.computed(() => {
|
|
17351
17351
|
const { formConfig } = vue.unref(propsRef);
|
|
17352
17352
|
const { submitButtonOptions } = formConfig || {};
|
|
17353
17353
|
return {
|
|
17354
|
-
...config.formConfig,
|
|
17354
|
+
...config == null ? void 0 : config.formConfig,
|
|
17355
17355
|
showAdvancedButton: true,
|
|
17356
17356
|
rowProps: { gutter: 20 },
|
|
17357
17357
|
...getFormConfig.value,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "3h1-ui",
|
|
3
|
-
"version": "2.15.
|
|
3
|
+
"version": "2.15.14",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "es/index.js",
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
"vue-json-pretty": "^2.2.3",
|
|
30
30
|
"vxe-table": "^4.3.6",
|
|
31
31
|
"xe-utils": "^3.5.7",
|
|
32
|
-
"@shy-plugins/use": "1.0.9",
|
|
33
32
|
"@shy-plugins/utils": "1.1.1",
|
|
34
|
-
"@shy-plugins/tinymce": "^1.0.6"
|
|
33
|
+
"@shy-plugins/tinymce": "^1.0.6",
|
|
34
|
+
"@shy-plugins/use": "1.0.9"
|
|
35
35
|
},
|
|
36
36
|
"types": "es/ui/index.d.ts",
|
|
37
37
|
"devDependencies": {
|