From 256878280129753b95f7a2c89a236f0ebcf616b1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 28 十月 2023 18:29:52 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/edit-table/columns/editColumn/index.jsx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/editColumn/index.jsx b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
index baca4f6..25e6c22 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
@@ -76,7 +76,7 @@
} else if (this.record.editType === 'date') {
_options.push('required', 'precision', 'enter', 'declareType')
} else if (this.record.editType === 'popSelect') {
- _options.push('required', 'enter', 'linkSubField', 'columns', 'dataSource', 'primaryKey', 'order', 'showField', 'controlField', 'searchKey', 'popWidth')
+ _options.push('required', 'enter', 'linkSubField', 'columns', 'dataSource', 'primaryKey', 'order', 'showField', 'controlField', 'searchKey', 'popWidth', 'laypage', 'onload')
} else if (this.record.editType === 'select') {
_options.push('required', 'enter', 'resourceType', 'linkSubField', 'dropdown')
--
Gitblit v1.8.0