From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 二月 2025 21:11:56 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/menu/components/table/edit-table/columns/editColumn/index.jsx | 5 +++--
1 files changed, 3 insertions(+), 2 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 4a6a3b5..bec94a9 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/index.jsx
@@ -83,7 +83,7 @@
} else if (this.record.editType === 'popSelect') {
_options.push('required', 'enter', 'linkSubField', 'columns', 'dataSource', 'primaryKey', 'order', 'showField', 'controlField', 'searchKey', 'popWidth', 'laypage', 'cache', 'onload')
} else if (this.record.editType === 'select') {
- _options.push('required', 'enter', 'resourceType', 'linkSubField', 'dropdown')
+ _options.push('required', 'enter', 'resourceType', 'linkSubField', 'dropdown', 'showValue')
if (this.record.resourceType === '0') {
_options.push('options')
@@ -461,6 +461,7 @@
extra = <span className="add-resource-empty" onClick={this.handleEmpty}>绌�</span>
}
if (item.placeholder) {
+ className = 'show-public-var'
extra = <><span className="resource-public-var">{item.placeholder}</span>{extra}</>
}
@@ -701,7 +702,7 @@
title="鏄剧ず鍒楃紪杈�"
wrapClassName="mk-scroll-modal"
visible={visible}
- width={900}
+ width={950}
maskClosable={false}
onOk={this.handleSubmit}
onCancel={this.editModalCancel}
--
Gitblit v1.8.0