Commit b921bf2b authored by Qiu Chuntao's avatar Qiu Chuntao

Optimize the code

parent 61ba5f15
Pipeline #11834 failed with stage
in 1 minute and 17 seconds
...@@ -74,7 +74,7 @@ SysUserMgt::~SysUserMgt() ...@@ -74,7 +74,7 @@ SysUserMgt::~SysUserMgt()
void SysUserMgt::setData(const QVariantMap &iDataMap) void SysUserMgt::setData(const QVariantMap &iDataMap)
{ {
DetailView->loadValues(iDataMap, false); mDetailView->loadValues(iDataMap, false);
if (iDataMap.contains("username")) { if (iDataMap.contains("username")) {
setTitle(ttr("User-%1").arg(iDataMap.value("username").toString())); setTitle(ttr("User-%1").arg(iDataMap.value("username").toString()));
...@@ -125,13 +125,13 @@ void SysUserMgt::newItem() ...@@ -125,13 +125,13 @@ void SysUserMgt::newItem()
setDetailUid(QString()); setDetailUid(QString());
setIsDetailModified(true); setIsDetailModified(true);
} }
/*!
* 保存详细信息表里的数据信息
/*保存详细信息表里的数据信息*/ */
void SysUserMgt::saveItem() void SysUserMgt::saveItem()
{ {
//验证有效性 //验证有效性
QVariantList errLst = DetailView->validateAll("COMMIT", true, "ERROR"); QVariantList errLst = mDetailView->validateAll("COMMIT", true, "ERROR");
if (!errLst.isEmpty()) { if (!errLst.isEmpty()) {
QStringList errStrLst; QStringList errStrLst;
for (QVariant err : errLst) { for (QVariant err : errLst) {
...@@ -146,7 +146,7 @@ void SysUserMgt::saveItem() ...@@ -146,7 +146,7 @@ void SysUserMgt::saveItem()
insertor.setTable(mTableConf.dbTableName); insertor.setTable(mTableConf.dbTableName);
QVariantMap saveData; QVariantMap saveData;
QMap<QString, QString> updatePolicy; QMap<QString, QString> updatePolicy;
TopClassHelper::fetchSaveFieldsFromUi(DetailView, saveData, updatePolicy); TopClassHelper::fetchSaveFieldsFromUi(mDetailView, saveData, updatePolicy);
insertor.addUniqueField(mTableConf.primaryKey); insertor.addUniqueField(mTableConf.primaryKey);
insertor.setAutoIncrementField(mTableConf.primaryKey); insertor.setAutoIncrementField(mTableConf.primaryKey);
saveData.insert(mTableConf.primaryKey, mDetailUid); saveData.insert(mTableConf.primaryKey, mDetailUid);
...@@ -189,7 +189,9 @@ void SysUserMgt::saveItem() ...@@ -189,7 +189,9 @@ void SysUserMgt::saveItem()
alertOk(ttr("Data saved")); alertOk(ttr("Data saved"));
} }
/*删除用户*/ /*!
* \删除用户
*/
void SysUserMgt::removeUser(const QVariantList &iItems) void SysUserMgt::removeUser(const QVariantList &iItems)
{ {
if (mTableConf.dbDelFlagKey.isEmpty()) { if (mTableConf.dbDelFlagKey.isEmpty()) {
...@@ -267,7 +269,9 @@ void SysUserMgt::onDetailChanged(bool iIsDetailModified) ...@@ -267,7 +269,9 @@ void SysUserMgt::onDetailChanged(bool iIsDetailModified)
refreshActionState(); refreshActionState();
} }
/*刷新表格*/ /*!
* 刷新表格
*/
void SysUserMgt::refresh(bool iResetPage) void SysUserMgt::refresh(bool iResetPage)
{ {
TSqlSelectorV2 selector; TSqlSelectorV2 selector;
...@@ -314,15 +318,17 @@ void SysUserMgt::refresh(bool iResetPage) ...@@ -314,15 +318,17 @@ void SysUserMgt::refresh(bool iResetPage)
} }
} }
/*刷新详细表单*/ /*!
* 刷新详细表单
*/
void SysUserMgt::refreshDetail(const QString &iUid) void SysUserMgt::refreshDetail(const QString &iUid)
{ {
if (iUid.isEmpty()) { if (iUid.isEmpty()) {
DetailView->loadValues(QVariantMap(), true); mDetailView->loadValues(QVariantMap(), true);
} else { } else {
TSqlSelectorV2 selector; TSqlSelectorV2 selector;
if (!mTableConf.dbSql.isEmpty()) { if (!mTableConf.dbSql.isEmpty()) {
selector.setTable(QString("(%1) _TEMP_TABLE_").arg(mTableConf.dbSql)); selector.setTable(mTableConf.dbSql);
} else if (!mTableConf.dbTableName.isEmpty()) { } else if (!mTableConf.dbTableName.isEmpty()) {
selector.setTable(mTableConf.dbTableName); selector.setTable(mTableConf.dbTableName);
} else { } else {
...@@ -340,13 +346,15 @@ void SysUserMgt::refreshDetail(const QString &iUid) ...@@ -340,13 +346,15 @@ void SysUserMgt::refreshDetail(const QString &iUid)
return; return;
} }
QVariantMap dataMap = data.toMap(); QVariantMap dataMap = data.toMap();
DetailView->loadValues(dataMap, true); mDetailView->loadValues(dataMap, true);
} }
alertOk(ttr("Data loaded")); alertOk(ttr("Data loaded"));
setIsDetailModified(false); setIsDetailModified(false);
} }
/*初始化界面*/ /*!
* 初始化界面
*/
void SysUserMgt::initTableView() void SysUserMgt::initTableView()
{ {
mBodySplitter = new TSplitter(this); mBodySplitter = new TSplitter(this);
...@@ -407,14 +415,14 @@ void SysUserMgt::initTableView() ...@@ -407,14 +415,14 @@ void SysUserMgt::initTableView()
if (QToolBar *toolbar = qobject_cast<QToolBar*>(uim()->getWidget("DETAIL_TOOLBAR"))) { if (QToolBar *toolbar = qobject_cast<QToolBar*>(uim()->getWidget("DETAIL_TOOLBAR"))) {
detailLayout->addWidget(toolbar, 0); detailLayout->addWidget(toolbar, 0);
} }
DetailView = new TUiLoader(this); mDetailView = new TUiLoader(this);
connect(DetailView, SIGNAL(dataChanged()), this, SLOT(onDetailDataChanged())); connect(mDetailView, SIGNAL(dataChanged()), this, SLOT(onDetailDataChanged()));
DetailView->setProperty("SS_BG", "PANEL"); mDetailView->setProperty("SS_BG", "PANEL");
DetailView->setSelf(this); mDetailView->setSelf(this);
DetailView->setScriptEngine(APP->scriptEngine()); mDetailView->setScriptEngine(APP->scriptEngine());
DetailView->setUiStr(ui("detail").toString()); mDetailView->setUiStr(ui("detail").toString());
detailLayout->addWidget(DetailView); detailLayout->addWidget(mDetailView);
if (!ui("detail").isNull()) { if (!ui("detail").isNull()) {
mBodySplitter->addWidget(detailWgt); mBodySplitter->addWidget(detailWgt);
......
...@@ -52,7 +52,7 @@ private: ...@@ -52,7 +52,7 @@ private:
TTableView* mTableView = nullptr; TTableView* mTableView = nullptr;
TSearchEntry* mSearchEntry = nullptr; TSearchEntry* mSearchEntry = nullptr;
TPageTool* mPageTool = nullptr; TPageTool* mPageTool = nullptr;
TUiLoader *DetailView; TUiLoader *mDetailView;
QWidget *mBodyWgt = nullptr; QWidget *mBodyWgt = nullptr;
QString mLastDetailUid; QString mLastDetailUid;
QString mDetailUid; QString mDetailUid;
......
...@@ -59,20 +59,20 @@ desktop: { ...@@ -59,20 +59,20 @@ desktop: {
{ {
"route_type": "module", "route_type": "module",
"icon": "user-o", "icon": "user-o",
"title": "Custom module", "title": "User Management-Custom Module",
"title_en": "Custom module", "title_en": "User Management-Custom Module",
"title_zhcn": "自定义模块", "title_zhcn": "用户管理-自定义模块",
"title_zhtw": "自定义模块", "title_zhtw": "用户管理-自定义模块",
"url_address": "user management-custom_module" "url_address": "user-management-custom-module"
}, },
{ {
"route_type": "module", "route_type": "module",
"icon": "users", "icon": "users",
"title": "Module configuration module", "title": "User Management-Module Configuration Module",
"title_en": "Module configuration module", "title_en": "User Management-Module Configuration Module",
"title_zhcn": "模板配置模块", "title_zhcn": "用户管理-模板配置模块",
"title_zhtw": "模板配置模块", "title_zhtw": "用户管理-模板配置模块",
"url_address": "user management-module_configuration_module" "url_address": "user-management-module-configuration-module"
}, },
] ]
}, },
......
# 模块标题 # 模块标题
sys_title: "User management-Custom module" sys_title: "User Management-Custom Module"
sys_title_en: "User management-Custom module" sys_title_en: "User Management-Custom Module"
sys_title_zhcn: "用户管理-自定义模块" sys_title_zhcn: "用户管理-自定义模块"
sys_title_zhtw: "" sys_title_zhtw: ""
# 模块图标 # 模块图标
...@@ -80,6 +80,6 @@ view { ...@@ -80,6 +80,6 @@ view {
# 数据库表名 # 数据库表名
db_table_name: "sys_user" db_table_name: "sys_user"
db_filter: "" db_filter: ""
db_sql: "" db_sql: "(SELECT * FROM sys_user) AS usertb"
} }
} }
# 模块标题 # 模块标题
sys_title: "User management-Module configuration module" sys_title: "User Management-Module Configuration Module"
sys_title_en: "User management-Module configuration module" sys_title_en: "User Management-Module Configuration Module"
sys_title_zhcn: "用户管理-模板配置模块" sys_title_zhcn: "用户管理-模板配置模块"
sys_title_zhtw: "" sys_title_zhtw: ""
# 模块图标 # 模块图标
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment