Parcourir la source

:art: Supports multiple views for the database https://github.com/siyuan-note/siyuan/issues/9751

Daniel il y a 1 an
Parent
commit
3f5e49cec6

+ 1 - 0
kernel/av/av.go

@@ -546,6 +546,7 @@ type ValueCheckbox struct {
 // View 描述了视图的结构。
 // View 描述了视图的结构。
 type View struct {
 type View struct {
 	ID   string `json:"id"`   // 视图 ID
 	ID   string `json:"id"`   // 视图 ID
+	Icon string `json:"icon"` // 视图图标
 	Name string `json:"name"` // 视图名称
 	Name string `json:"name"` // 视图名称
 
 
 	LayoutType LayoutType   `json:"type"`            // 当前布局类型
 	LayoutType LayoutType   `json:"type"`            // 当前布局类型

+ 1 - 0
kernel/av/table.go

@@ -572,6 +572,7 @@ func (value *Value) CompareOperator(other *Value, operator FilterOperator) bool
 // Table 描述了表格实例的结构。
 // Table 描述了表格实例的结构。
 type Table struct {
 type Table struct {
 	ID      string         `json:"id"`      // 表格布局 ID
 	ID      string         `json:"id"`      // 表格布局 ID
+	Icon    string         `json:icon`      // 表格图标
 	Name    string         `json:"name"`    // 表格名称
 	Name    string         `json:"name"`    // 表格名称
 	Filters []*ViewFilter  `json:"filters"` // 过滤规则
 	Filters []*ViewFilter  `json:"filters"` // 过滤规则
 	Sorts   []*ViewSort    `json:"sorts"`   // 排序规则
 	Sorts   []*ViewSort    `json:"sorts"`   // 排序规则

+ 82 - 0
kernel/model/attribute_view.go

@@ -443,6 +443,7 @@ func renderTemplateCol(ial map[string]string, tplContent string, rowValues []*av
 func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *av.Table, err error) {
 func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *av.Table, err error) {
 	ret = &av.Table{
 	ret = &av.Table{
 		ID:      view.ID,
 		ID:      view.ID,
+		Icon:    view.Icon,
 		Name:    view.Name,
 		Name:    view.Name,
 		Columns: []*av.TableColumn{},
 		Columns: []*av.TableColumn{},
 		Rows:    []*av.TableRow{},
 		Rows:    []*av.TableRow{},
@@ -657,6 +658,63 @@ func (tx *Transaction) doRemoveAttrViewView(operation *Operation) (ret *TxErr) {
 	return
 	return
 }
 }
 
 
+func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr) {
+	var err error
+	avID := operation.AvID
+	attrView, err := av.ParseAttributeView(avID)
+	if nil != err {
+		logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
+		return &TxErr{code: TxErrWriteAttributeView, id: avID}
+	}
+
+	masterView := attrView.GetView(operation.PreviousID)
+	if nil == masterView {
+		logging.LogErrorf("get master view failed: %s", avID)
+		return &TxErr{code: TxErrWriteAttributeView, id: avID}
+	}
+
+	view := av.NewTableView()
+	view.ID = operation.ID
+	attrView.Views = append(attrView.Views, view)
+	attrView.ViewID = view.ID
+
+	view.Icon = masterView.Icon
+	view.Name = masterView.Name
+	view.LayoutType = masterView.LayoutType
+
+	for _, col := range masterView.Table.Columns {
+		view.Table.Columns = append(view.Table.Columns, &av.ViewTableColumn{
+			ID:     col.ID,
+			Wrap:   col.Wrap,
+			Hidden: col.Hidden,
+			Pin:    col.Pin,
+			Width:  col.Width,
+			Calc:   col.Calc,
+		})
+	}
+
+	for _, filter := range masterView.Table.Filters {
+		view.Table.Filters = append(view.Table.Filters, &av.ViewFilter{
+			Column:   filter.Column,
+			Operator: filter.Operator,
+			Value:    filter.Value,
+		})
+	}
+
+	for _, s := range masterView.Table.Sorts {
+		view.Table.Sorts = append(view.Table.Sorts, &av.ViewSort{
+			Column: s.Column,
+			Order:  s.Order,
+		})
+	}
+
+	if err = av.SaveAttributeView(attrView); nil != err {
+		logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
+		return &TxErr{code: TxErrWriteAttributeView, msg: err.Error(), id: avID}
+	}
+	return
+}
+
 func (tx *Transaction) doAddAttrViewView(operation *Operation) (ret *TxErr) {
 func (tx *Transaction) doAddAttrViewView(operation *Operation) (ret *TxErr) {
 	var err error
 	var err error
 	avID := operation.AvID
 	avID := operation.AvID
@@ -712,6 +770,30 @@ func (tx *Transaction) doSetAttrViewViewName(operation *Operation) (ret *TxErr)
 	return
 	return
 }
 }
 
 
+func (tx *Transaction) doSetAttrViewViewIcon(operation *Operation) (ret *TxErr) {
+	var err error
+	avID := operation.AvID
+	attrView, err := av.ParseAttributeView(avID)
+	if nil != err {
+		logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
+		return &TxErr{code: TxErrWriteAttributeView, id: avID}
+	}
+
+	viewID := operation.ID
+	view := attrView.GetView(viewID)
+	if nil == view {
+		logging.LogErrorf("get view [%s] failed: %s", viewID, err)
+		return &TxErr{code: TxErrWriteAttributeView, id: viewID}
+	}
+
+	view.Icon = operation.Data.(string)
+	if err = av.SaveAttributeView(attrView); nil != err {
+		logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
+		return &TxErr{code: TxErrWriteAttributeView, msg: err.Error(), id: avID}
+	}
+	return
+}
+
 func (tx *Transaction) doSetAttrViewName(operation *Operation) (ret *TxErr) {
 func (tx *Transaction) doSetAttrViewName(operation *Operation) (ret *TxErr) {
 	err := setAttributeViewName(operation)
 	err := setAttributeViewName(operation)
 	if nil != err {
 	if nil != err {

+ 4 - 0
kernel/model/transaction.go

@@ -248,6 +248,10 @@ func performTx(tx *Transaction) (ret *TxErr) {
 			ret = tx.doRemoveAttrViewView(op)
 			ret = tx.doRemoveAttrViewView(op)
 		case "setAttrViewViewName":
 		case "setAttrViewViewName":
 			ret = tx.doSetAttrViewViewName(op)
 			ret = tx.doSetAttrViewViewName(op)
+		case "setAttrViewViewIcon":
+			ret = tx.doSetAttrViewViewIcon(op)
+		case "duplicateAttrViewView":
+			ret = tx.doDuplicateAttrViewView(op)
 		}
 		}
 
 
 		if nil != ret {
 		if nil != ret {

+ 1 - 0
kernel/treenode/node.go

@@ -560,6 +560,7 @@ func getAttributeViewContent(avID string) (content string) {
 func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *av.Table, err error) {
 func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *av.Table, err error) {
 	ret = &av.Table{
 	ret = &av.Table{
 		ID:      view.ID,
 		ID:      view.ID,
+		Icon:    view.Icon,
 		Name:    view.Name,
 		Name:    view.Name,
 		Columns: []*av.TableColumn{},
 		Columns: []*av.TableColumn{},
 		Rows:    []*av.TableRow{},
 		Rows:    []*av.TableRow{},