From f5dba9a88d7eee27028e0a439cd99dd50bb8e313 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 31 三月 2025 15:07:50 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/table/edit-table/columns/tableIn/index.jsx | 6 +++---
src/menu/components/card/balcony/options.jsx | 10 ----------
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/card/balcony/options.jsx b/src/menu/components/card/balcony/options.jsx
index 36a2a1e..d7445e0 100644
--- a/src/menu/components/card/balcony/options.jsx
+++ b/src/menu/components/card/balcony/options.jsx
@@ -142,16 +142,6 @@
forbid: isprint
},
{
- type: 'cascader',
- field: 'syncModule',
- label: '鍚屾缁勪欢',
- initval: wrap.syncModule || '',
- tooltip: '褰撳悓姝ョ粍浠朵笉瀛樺湪鎴栨病鏈夋潈闄愭椂锛屽綋鍓嶇粍浠朵笉鏄剧ず銆�',
- required: true,
- options: modules,
- forbid: isprint
- },
- {
type: 'radio',
field: 'checkAll',
label: '鍏ㄩ��',
diff --git a/src/menu/components/table/edit-table/columns/tableIn/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
index 9dead8d..96952f9 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
@@ -534,9 +534,9 @@
let _backCustomScript = '' // 榛樿sql鍚庢墽琛岃剼鏈�
let isDM = sessionStorage.getItem('dataM') === 'true'
let regs = [
- {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: ` #${sheet} `},
- {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: ` #${sheet}(`},
- {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: ` #${sheet})`},
+ // {reg: new RegExp('(^|\\s)@' + sheet + '(\\s|$)', 'ig'), value: ` #${sheet} `},
+ // {reg: new RegExp('(^|\\s)@' + sheet + '\\(', 'ig'), value: ` #${sheet}(`},
+ // {reg: new RegExp('(^|\\s)@' + sheet + '\\)', 'ig'), value: ` #${sheet})`},
{reg: /@typename@/ig, value: `'admin'`},
{reg: /\$@/ig, value: isDM ? '/*' : ''},
{reg: /@\$/ig, value: isDM ? '*/' : ''},
--
Gitblit v1.8.0