From d1d9dc29318cb2a9a466246adff7b78fe36cf623 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 11 三月 2023 17:51:29 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/form/step-form/index.jsx | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/tabviews/custom/components/form/step-form/index.jsx b/src/tabviews/custom/components/form/step-form/index.jsx
index f3711b3..83349ad 100644
--- a/src/tabviews/custom/components/form/step-form/index.jsx
+++ b/src/tabviews/custom/components/form/step-form/index.jsx
@@ -62,6 +62,7 @@
_data = _data[0] || {$$empty: true}
}
_sync = false
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
}
} else {
_data = {$$empty: true}
@@ -168,6 +169,8 @@
_data = _data[0] || {$$empty: true}
}
}
+
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
if (config.wrap.statusControl && _data[config.wrap.statusControl]) {
let _status = _data[config.wrap.statusControl]
@@ -304,6 +307,8 @@
let _data = result.data && result.data[0] ? result.data[0] : {$$empty: true}
let _group = this.state.group
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+
if (type === 'refresh') {
_group = config.subcards[0]
}
@@ -391,6 +396,7 @@
const { config, loading, BID, BData, data, group, dict, step } = this.state
if (config.wrap.empty === 'hidden' && (!data || data.$$empty)) return null
+ if (config.idCtrl && (!data || data.$$empty)) return null
return (
<div className="custom-normal-form-box" id={'anchor' + config.uuid} style={{...config.style}}>
--
Gitblit v1.8.0