Optimization and modification

src/class/plugin/custommoduleplugin.cpp

 #include "custommoduleplugin.h"
 #include "sysusermgt/sysusermgt.h"
-//#include "sysmainwindow/msysmainwindow.h"
 
 QStringList TopSysPlugin::getClassList()
 {    
-    return QStringList()<< QStringLiteral("Musermgt");
+    return QStringList()<< QStringLiteral("SysUserMgt");
 }
 
 TopClassAbs *TopSysPlugin::newClass(const QString &iClassName,
                                           const QString &iModuleName,
                                           const QVariantMap &iUrlPars)
 {
-    if (iClassName == QStringLiteral("Musermgt")) {
-        return new Musermgt(iModuleName, iUrlPars, nullptr);
+    if (iClassName == QStringLiteral("SysUserMgt")) {
+        return new SysUserMgt(iModuleName, iUrlPars, nullptr);
     }
     return nullptr;
 }

src/class/plugin/sysusermgt/sysusermgt.h

-#ifndef MUSERMGT
-#define MUSERMGT
+#ifndef SYSUSERMGT
+#define SYSUSERMGT
 
 #include <topcore/topclassabs.h>
 #include <tdatabaseutil/tsqlselectorv2.h>
@@ -12,22 +12,14 @@ class TSearchEntry;
 class TPageTool;
 class TSplitter;
 
-class Musermgt : public TopClassAbs
+class SysUserMgt : public TopClassAbs
 {
     Q_OBJECT
 public:
-    explicit Musermgt(const QString &iModuleNameStr = QString(""),
-                            const QVariantMap &iUrlPars = QVariantMap(),
-                            QWidget *iParent = nullptr);
-    enum class NaviType {
-        None,
-        CategoryTreeView,
-        UiLoader,
-        AdvancedQuery,
-        NaviFilter,
-        CategoryTreeViewAndAdvancedQuery
-    };
-    ~Musermgt();
+    explicit SysUserMgt(const QString &iModuleNameStr = QString(""),
+                        const QVariantMap &iUrlPars = QVariantMap(),
+                        QWidget *iParent = nullptr);
+    ~SysUserMgt();
 public slots:
     void refresh(bool iResetPageBol = true);                //刷新表格信息
     void refreshDetail(const QString &iUid);                //刷新右侧详细信息
@@ -53,12 +45,7 @@ signals:
     void detailSaved(const QVariant &iUid);                  //当详细表单数据保存时发送
     void selectionChanged();                                //左侧表单选中条目变化时发送该信号
 private:
-    void initAdvanceCfgMap();
     void initTableView();                                   //初始化界面
-
-    Musermgt::NaviType str2NaviType(const QString &iType);
-    QVariantList parseCategoryConfig();
-    QVariantMap getDefaultQueryDataFromCfgMap();
 private:
     TSplitter *mBodySplitter = nullptr;
     TSplitter *mBodyWidget = nullptr;
@@ -69,12 +56,9 @@ private:
     QWidget *mBodyWgt = nullptr;
     QString mLastDetailUid;
     QString mDetailUid;
-    NaviType mNaviType = NaviType::CategoryTreeView;
-    QWidget *mNaviView = nullptr;
-    QVariantMap mAdvancedQueryCfgMap;
     bool IsDetailchange = false;
     TopClassTableConf mTableConf;
     QVariantList mSelectedItems;
 };
 
-#endif //MUSERMGT
+#endif //SYSUSERMGT

src/module/DEMO/Module_summary/module.conf

 # 模块标题
-sys_title: "Module Menu"
-sys_title_en: ""
-sys_title_zhcn: "模块菜单"
+sys_title: "User Management Module"
+sys_title_en: "User Management Module"
+sys_title_zhcn: "用户管理模块"
 sys_title_zhtw: ""
 
 # 模块图标(普通图标在font awesome中找 http://fontawesome.io/icons/)
@@ -63,7 +63,7 @@ desktop: {
 					"title_en": "Custom module",
 					"title_zhcn": "自定义模块",
 					"title_zhtw": "自定义模块",
-					"url_address": "Custom_module"
+					"url_address": "user management-custom_module"
 				},
 				{
 					"route_type": "module",
@@ -72,7 +72,7 @@ desktop: {
 					"title_en": "Module configuration module",
 					"title_zhcn": "模板配置模块",
 					"title_zhtw": "模板配置模块",
-					"url_address": "Module_configuration_module"
+					"url_address": "user management-module_configuration_module"
 				},
 			]
 		},

src/module/MODULELIST/Custom_module/detail.ui.js → src/module/MODULELIST/user management-custom_module/detail.ui.js

@@ -61,9 +61,9 @@
                         name: "attr_data.age",
                         type: "IntLineEdit",
                         title: self.ttr("Age"),
-                        validate: function (obj, val, title, moment, self) {
-                        if (!val.match(new RegExp('^[0-9_]+$'))) {
-                            return [title + self.ttr(" can only contain [0-9]!"), 'Error'];
+                        validate:function(obj, val, title, moment, self){
+                            if (isNaN(val)) {
+                                return [title + self.ttr(" can only contain [0-9]!"), 'Error'];
                             } else if (parseInt(val) >= 100 || parseInt(val) <= 0) {
                                 return [title + self.ttr("Are you sure you are a hundred years old?"), 'Error'];
                             }

src/module/MODULELIST/Custom_module/module.conf → src/module/MODULELIST/user management-custom_module/module.conf

 # 模块标题
-sys_title: "Custom module"
-sys_title_en: "Custom module"
-sys_title_zhcn: "自定义模块"
+sys_title: "User management-Custom module"
+sys_title_en: "User management-Custom module"
+sys_title_zhcn: "用户管理-自定义模块"
 sys_title_zhtw: ""
 # 模块图标
 sys_icon: "wpforms"
 # 模块对应的插件DLL名称
 sys_plugin: "topikm6-custommodule-plugin"
 # 模块对应的类名
-sys_class: "Musermgt"
+sys_class: "SysUserMgt"
 # 许可证验证键
 sys_license_key: ""
 # 打开模块的权限
@@ -28,8 +28,7 @@ default_value : {
 # 主表格
 view {
   # 数据项， 默认包含表头中配置的数据项
-  data_keys: ["id","username","fullname","status",
-            "attr_data"]
+  data_keys: ["id", "username", "fullname", "status", "attr_data"]
   # 主键
   primary_key: "id"
   # 水平表头
@@ -54,8 +53,8 @@ view {
         "search": "string"
     },
     {
-        "name": "status",
-        "display": "status",
+        "name": "Status",
+        "display": "Status",
         "displayRole": "$status.text",
         "size": 100,
         "format": "enum(tpm-machine-maintenance-plan-status)"
@@ -78,8 +77,9 @@ view {
   sort_by: "id DESC"
   # 数据集
   data_set {
-    # 数据库表名
-    db_table_name: "sys_user"
-    db_filter: ""
+  # 数据库表名
+  db_table_name: "sys_user"
+  db_filter: ""
+  db_sql: ""
   }
 }

src/module/MODULELIST/Module_configuration_module/actions/refresh_detail.js → src/module/MODULELIST/user management-module_configuration_module/actions/refresh_detail.js

 try {
-  this.reload();
+  this.reloadItem();
 } catch(e) {
   print(e);
 }
@@ -18,5 +18,5 @@ STYLE: "button_style=icon"
 LANG: "JavaScript"
 STATUS: "Release"
 VERSION: "1"
-STATEHOOK: "return this.DetailModified() ? 'hide' : 'enable';"
+STATEHOOK: "return this.isDetailModified() ? 'hide' : 'enable';"
 ---ACTION---*/
\ No newline at end of file

src/module/MODULELIST/Module_configuration_module/detail.ui.js → src/module/MODULELIST/user management-module_configuration_module/detail.ui.js

@@ -61,10 +61,10 @@
                         name: "attr_data.age",
                         type: "IntLineEdit",
                         title: self.ttr("Age"),
-                        validate: function (obj, val, title, moment, self) {
-                        if (!val.match(new RegExp('^[0-9_]+$'))) {
-                            return [title + self.ttr(" can only contain [0-9]!"), 'Error'];
-                            } else if (parseInt(val) >= 100 || parseInt(val) <= 0) {
+                        validate:function(obj, val, title, moment, self){
+                            if (isNaN(val)) {
+                                return [title + self.ttr(" can only contain [0-9]!"), 'Error'];
+                            } else if ((parseInt(val) >= 100) || (parseInt(val) <= 0)) {
                                 return [title + self.ttr("Are you sure you are a hundred years old?"), 'Error'];
                             }
                         },

src/module/MODULELIST/Module_configuration_module/module.conf → src/module/MODULELIST/user management-module_configuration_module/module.conf

 # 模块标题
-sys_title: "Module configuration module"
-sys_title_en: "Module configuration module"
-sys_title_zhcn: "模板配置模块"
+sys_title: "User management-Module configuration module"
+sys_title_en: "User management-Module configuration module"
+sys_title_zhcn: "用户管理-模板配置模块"
 sys_title_zhtw: ""
 # 模块图标
 sys_icon: "wpforms"
@@ -27,13 +27,12 @@ navi: {
 }
 
 default_value : {
-	password: "123456"，
+	password: "123456",
 }
 # 主表格
 view {
   # 数据项， 默认包含表头中配置的数据项
-  data_keys: ["id","username","fullname","status",
-            "attr_data"]
+  data_keys: ["id", "username", "fullname", "status", "attr_data"]
   # 主键
   primary_key: "id"
   # 水平表头
@@ -58,8 +57,8 @@ view {
         "search": "string"
     },
     {
-        "name": "status",
-        "display": "status",
+        "name": "Status",
+        "display": "Status",
         "displayRole": "$status.text",
         "size": 100,
         "format": "enum(tpm-machine-maintenance-plan-status)"
@@ -85,5 +84,6 @@ view {
     # 数据库表名
     db_table_name: "sys_user"
     db_filter: ""
+    db_sql: ""
   }
 }