Merge branch 'BI_Dashboard' into dm

controllers/bi_dashboard.go

@@ -1213,6 +1213,7 @@ func (this *BIDaShboardController) HomePageSave() {
 		AdminId:               this.SysUser.AdminId,
 		CreateTime:            time.Now(),
 		ModifyTime:            time.Now(),
+		FromType:              req.FromType,
 	}
 
 	if item.BiDashboardHomePageId > 0 {

models/bi_dashboard/bi_dashboard_home_page.go

@@ -6,11 +6,12 @@ import (
 )
 
 type BiDashboardHomePage struct {
-	BiDashboardHomePageId int `gorm:"primaryKey;autoIncrement;comment:'bi首页看板id'"`
-	BiDashboardId        int `gorm:"type:int(10);default:null;comment:'看板id'"`
-	AdminId               int `gorm:"type:int(10);default:null;comment:'1图表 2表格'"`
+	BiDashboardHomePageId int       `gorm:"primaryKey;autoIncrement;comment:'bi首页看板id'"`
+	BiDashboardId         int       `gorm:"type:int(10);default:null;comment:'看板id'"`
+	AdminId               int       `gorm:"type:int(10);default:null;comment:'1图表 2表格'"`
 	CreateTime            time.Time `gorm:"type:datetime;comment:'创建时间'"`
 	ModifyTime            time.Time `gorm:"type:datetime;comment:'更新时间'"`
+	FromType              int       `gorm:"type:int(10);default:null;comment:'来源，前端跳转用 1我的 2共享 3公共"`
 }
 
 // tableName
@@ -31,4 +32,5 @@ func SaveBiDashboardHomePage(item *BiDashboardHomePage) (err error) {
 
 type SaveHomePageReq struct {
 	BiDashboardId int `description:"看板id"`
-}
+	FromType      int `description:"来源，前端跳转用 1我的 2共享 3公共"`
+}