Merge branch 'feature/source_hide_430' into debug

controllers/data_manage/edb_info.go

@@ -5775,6 +5775,9 @@ func (this *EdbInfoController) EdbChartList() {
 				//	v.IsRelation = true
 				//}
 
+				if relationMap[v.EdbInfoId] != nil && relationMap[v.EdbInfoId].RelationNum > 0 {
+					v.IsRelation = true
+				}
 			}
 		}
 		page = paging.GetPaging(currentIndex, pageSize, int(dataCount))

controllers/sys_role.go

@@ -755,8 +755,11 @@ func (this *SysRoleController) SystemConfig() {
 	}, system.BusinessConf{
 		ConfKey: models.KnowledgeBaseName,
 		ConfVal: conf[models.KnowledgeBaseName],
+	}, system.BusinessConf{
+		ConfKey: models.BusinessConfHideSourceFormSMM,
+		ConfVal: conf[models.BusinessConfHideSourceFormSMM],
 	})
-		
+
 	osc := system.BusinessConf{
 		ConfKey: "ObjectStorageClient",
 		ConfVal: utils.ObjectStorageClient,

models/business_conf.go

@@ -16,38 +16,38 @@ var (
 )
 
 const (
-	BusinessConfUseXf                        = "UseXf"
-	BusinessConfXfAppid                      = "XfAppid"
-	BusinessConfXfApiKey                     = "XfApiKey"
-	BusinessConfXfApiSecret                  = "XfApiSecret"
-	BusinessConfXfVcn                        = "XfVcn"
-	BusinessConfEnPptCoverImgs               = "EnPptCoverImgs"
-	BusinessConfIsReportApprove              = "IsReportApprove"
-	BusinessConfReportApproveType            = "ReportApproveType"
-	BusinessConfCompanyName                  = "CompanyName"
-	BusinessConfCompanyWatermark             = "CompanyWatermark"
-	BusinessConfWatermarkChart               = "WatermarkChart"
-	BusinessConfLoginSmsTpId                 = "LoginSmsTpId"
-	BusinessConfLoginSmsGjTpId               = "LoginSmsGjTpId"
-	BusinessConfSmsJhgnAppKey                = "SmsJhgnAppKey"
-	BusinessConfSmsJhgjAppKey                = "SmsJhgjAppKey"
-	BusinessConfLdapHost                     = "LdapHost"
-	BusinessConfLdapBase                     = "LdapBase"
-	BusinessConfLdapPort                     = "LdapPort"
-	BusinessConfEmailClient                  = "EmailClient"
-	BusinessConfEmailServerHost              = "EmailServerHost"
-	BusinessConfEmailServerPort              = "EmailServerPort"
-	BusinessConfEmailSender                  = "EmailSender"
-	BusinessConfEmailSenderUserName          = "EmailSenderUserName"
-	BusinessConfEmailSenderPassword          = "EmailSenderPassword"
-	BusinessConfSmsClient                    = "SmsClient"
-	BusinessConfNanHuaSmsAppKey              = "NanHuaSmsAppKey"
-	BusinessConfNanHuaSmsAppSecret           = "NanHuaSmsAppSecret"
-	BusinessConfNanHuaSmsApiHost             = "NanHuaSmsApiHost"
-	BusinessConfLoginSmsTplContent           = "LoginSmsTplContent"
-	BusinessConfLoginEmailTemplateSubject    = "LoginEmailTemplateSubject"
-	BusinessConfLoginEmailTemplateContent    = "LoginEmailTemplateContent"
-	BusinessConfLdapBindUserSuffix           = "LdapBindUserSuffix"
+	BusinessConfUseXf                     = "UseXf"
+	BusinessConfXfAppid                   = "XfAppid"
+	BusinessConfXfApiKey                  = "XfApiKey"
+	BusinessConfXfApiSecret               = "XfApiSecret"
+	BusinessConfXfVcn                     = "XfVcn"
+	BusinessConfEnPptCoverImgs            = "EnPptCoverImgs"
+	BusinessConfIsReportApprove           = "IsReportApprove"
+	BusinessConfReportApproveType         = "ReportApproveType"
+	BusinessConfCompanyName               = "CompanyName"
+	BusinessConfCompanyWatermark          = "CompanyWatermark"
+	BusinessConfWatermarkChart            = "WatermarkChart"
+	BusinessConfLoginSmsTpId              = "LoginSmsTpId"
+	BusinessConfLoginSmsGjTpId            = "LoginSmsGjTpId"
+	BusinessConfSmsJhgnAppKey             = "SmsJhgnAppKey"
+	BusinessConfSmsJhgjAppKey             = "SmsJhgjAppKey"
+	BusinessConfLdapHost                  = "LdapHost"
+	BusinessConfLdapBase                  = "LdapBase"
+	BusinessConfLdapPort                  = "LdapPort"
+	BusinessConfEmailClient               = "EmailClient"
+	BusinessConfEmailServerHost           = "EmailServerHost"
+	BusinessConfEmailServerPort           = "EmailServerPort"
+	BusinessConfEmailSender               = "EmailSender"
+	BusinessConfEmailSenderUserName       = "EmailSenderUserName"
+	BusinessConfEmailSenderPassword       = "EmailSenderPassword"
+	BusinessConfSmsClient                 = "SmsClient"
+	BusinessConfNanHuaSmsAppKey           = "NanHuaSmsAppKey"
+	BusinessConfNanHuaSmsAppSecret        = "NanHuaSmsAppSecret"
+	BusinessConfNanHuaSmsApiHost          = "NanHuaSmsApiHost"
+	BusinessConfLoginSmsTplContent        = "LoginSmsTplContent"
+	BusinessConfLoginEmailTemplateSubject = "LoginEmailTemplateSubject"
+	BusinessConfLoginEmailTemplateContent = "LoginEmailTemplateContent"
+	BusinessConfLdapBindUserSuffix        = "LdapBindUserSuffix"
 	BusinessConfLdapUserFilter            = "LdapUserFilter"
 
 	BusinessConfTencentApiSecretId           = "TencentApiSecretId"           // 腾讯云API-密钥对
@@ -61,23 +61,24 @@ const (
 	BusinessConfEsIndexNameDataSource        = "EsIndexNameDataSource"        // ES索引名称-数据源
 
 	// DongWu SMS configuration
-	BusinessConfDongwuSmsAppKey    = "DongWuSmsAppKey"    // 东吴短信AppKey
-	BusinessConfDongwuSmsApiUrl    = "DongWuSmsApiUrl"    // 东吴短信API地址
-
-	LLMInitConfig                            = "llmInitConfig"
-	KnowledgeBaseName                        = "KnowledgeBaseName"                // 摘要库
-	PrivateKnowledgeBaseName                 = "PrivateKnowledgeBaseName"         // 私有摘要库
-	KnowledgeArticleName                     = "KnowledgeArticleName"             // 原文库
-	BusinessConfEsWechatArticle              = "EsIndexNameWechatArticle"         // ES索引名称-微信文章
-	BusinessConfEsWechatArticleAbstract      = "EsIndexNameWechatArticleAbstract" // ES索引名称-微信文章摘要
-	BusinessConfEsRagQuestion                = "EsIndexNameRagQuestion"           // ES索引名称-知识库问题
-	BusinessConfEsRagEtaReportAbstract       = "EsIndexNameRagEtaReportAbstract"  // ES索引名称-eta报告摘要
-	BusinessConfIsOpenChartExpired           = "IsOpenChartExpired"               // 是否开启图表有效期鉴权/报告禁止复制
-	BusinessConfReportChartExpiredTime       = "ReportChartExpiredTime"           // 图表有效期鉴权时间，单位：分钟
-	BusinessConfOssUrlReplace                = "OssUrlReplace"                    // OSS地址替换-兼容内网客户用
-	BusinessConfFeCalendarAiArticlePromote   = "FeCalendarAiArticlePromote"       // 事件日历上创建数据点评的提示词
-	BusinessConfEdbNoUpdateAutoToNormal     = "EdbNoUpdateAutoToNormal"          // 被禁用的指标一旦被图表引用是否转为启用状态开关：1是， 0否
-	BusinessConfLoginPictureVerifyCode       = "IsLoginPictureVerifyCode"               // OSS地址替换-兼容内网客户用
+	BusinessConfDongwuSmsAppKey = "DongWuSmsAppKey" // 东吴短信AppKey
+	BusinessConfDongwuSmsApiUrl = "DongWuSmsApiUrl" // 东吴短信API地址
+
+	LLMInitConfig                          = "llmInitConfig"
+	KnowledgeBaseName                      = "KnowledgeBaseName"                // 摘要库
+	PrivateKnowledgeBaseName               = "PrivateKnowledgeBaseName"         // 私有摘要库
+	KnowledgeArticleName                   = "KnowledgeArticleName"             // 原文库
+	BusinessConfEsWechatArticle            = "EsIndexNameWechatArticle"         // ES索引名称-微信文章
+	BusinessConfEsWechatArticleAbstract    = "EsIndexNameWechatArticleAbstract" // ES索引名称-微信文章摘要
+	BusinessConfEsRagQuestion              = "EsIndexNameRagQuestion"           // ES索引名称-知识库问题
+	BusinessConfEsRagEtaReportAbstract     = "EsIndexNameRagEtaReportAbstract"  // ES索引名称-eta报告摘要
+	BusinessConfIsOpenChartExpired         = "IsOpenChartExpired"               // 是否开启图表有效期鉴权/报告禁止复制
+	BusinessConfReportChartExpiredTime     = "ReportChartExpiredTime"           // 图表有效期鉴权时间，单位：分钟
+	BusinessConfOssUrlReplace              = "OssUrlReplace"                    // OSS地址替换-兼容内网客户用
+	BusinessConfFeCalendarAiArticlePromote = "FeCalendarAiArticlePromote"       // 事件日历上创建数据点评的提示词
+	BusinessConfEdbNoUpdateAutoToNormal    = "EdbNoUpdateAutoToNormal"          // 被禁用的指标一旦被图表引用是否转为启用状态开关：1是， 0否
+	BusinessConfLoginPictureVerifyCode     = "IsLoginPictureVerifyCode"         // OSS地址替换-兼容内网客户用
+	BusinessConfHideSourceFormSMM          = "HideSourceFormSMM"                // (弘则专用)是否隐藏SMM/彭博/彭博财务
 )
 
 const (