diff --git a/api/v1/category.pb.go b/api/v1/category.pb.go index 22827f8..0d6f335 100644 --- a/api/v1/category.pb.go +++ b/api/v1/category.pb.go @@ -47,7 +47,6 @@ type Category struct { Icon string `protobuf:"bytes,10,opt,name=icon,proto3" json:"icon,omitempty"` Description string `protobuf:"bytes,11,opt,name=description,proto3" json:"description,omitempty"` ShowDescription bool `protobuf:"varint,12,opt,name=show_description,json=showDescription,proto3" json:"show_description,omitempty"` - ShowOnNav bool `protobuf:"varint,13,opt,name=show_on_nav,json=showOnNav,proto3" json:"show_on_nav,omitempty"` } func (m *Category) Reset() { *m = Category{} } @@ -167,13 +166,6 @@ func (m *Category) GetShowDescription() bool { return false } -func (m *Category) GetShowOnNav() bool { - if m != nil { - return m.ShowOnNav - } - return false -} - // 分类列表请求 type ListCategoryRequest struct { Page int64 `protobuf:"varint,1,opt,name=page,proto3" json:"page,omitempty"` @@ -413,52 +405,51 @@ func init() { func init() { proto.RegisterFile("api/v1/category.proto", fileDescriptor_1f1bb9165c79c987) } var fileDescriptor_1f1bb9165c79c987 = []byte{ - // 708 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcd, 0x4e, 0xdb, 0x4a, - 0x14, 0xc6, 0x36, 0xc9, 0x4d, 0x26, 0xdc, 0x5c, 0x18, 0x08, 0xcc, 0x75, 0x2e, 0xc1, 0xb2, 0xae, - 0xd4, 0x14, 0xb5, 0xb6, 0xa0, 0xea, 0x86, 0x2e, 0x2a, 0x7e, 0xaa, 0x0a, 0xa9, 0x6a, 0x91, 0x55, - 0x84, 0xd4, 0x4d, 0x34, 0x78, 0x86, 0x74, 0x24, 0xc7, 0x63, 0xec, 0x89, 0x11, 0x5d, 0xf6, 0x09, - 0x90, 0xba, 0xe9, 0x23, 0xb1, 0x44, 0xea, 0xa6, 0xab, 0x16, 0x41, 0x9f, 0xa0, 0x4f, 0x50, 0xcd, - 0xd8, 0x46, 0xce, 0x0f, 0x52, 0xd5, 0xdd, 0x99, 0xe3, 0xef, 0x7c, 0xe7, 0xe7, 0x3b, 0xc7, 0xa0, - 0x85, 0x23, 0xe6, 0xa6, 0x1b, 0xae, 0x8f, 0x05, 0xed, 0xf3, 0xf8, 0xdc, 0x89, 0x62, 0x2e, 0x38, - 0xac, 0xe2, 0x88, 0x39, 0xe9, 0x86, 0xb9, 0xd6, 0xe7, 0xbc, 0x1f, 0x50, 0x57, 0x79, 0x8f, 0x87, - 0x27, 0xae, 0x60, 0x03, 0x9a, 0x08, 0x3c, 0x88, 0x32, 0xa0, 0xb9, 0xd4, 0xe7, 0x7d, 0xae, 0x4c, - 0x57, 0x5a, 0xb9, 0xf7, 0xbf, 0x3c, 0x4c, 0x92, 0xe3, 0x30, 0xe4, 0x02, 0x0b, 0xc6, 0xc3, 0x24, - 0xff, 0xda, 0x1e, 0x27, 0xa5, 0x83, 0x48, 0xe4, 0x99, 0xed, 0x4b, 0x03, 0xd4, 0x76, 0xf3, 0x62, - 0x60, 0x13, 0xe8, 0x8c, 0x20, 0xcd, 0xd2, 0xba, 0x15, 0x4f, 0x67, 0x04, 0xb6, 0x41, 0x3d, 0xc2, - 0x31, 0x0d, 0x45, 0x8f, 0x11, 0xa4, 0x2b, 0x77, 0x2d, 0x73, 0xec, 0x13, 0xf8, 0x18, 0x54, 0x04, - 0x13, 0x01, 0x45, 0x86, 0xa5, 0x75, 0xeb, 0x3b, 0x2b, 0x3f, 0xbf, 0xad, 0x2d, 0xa6, 0x38, 0x60, - 0x04, 0x0b, 0xba, 0x65, 0xc7, 0xf4, 0x74, 0xc8, 0x62, 0x4a, 0x6c, 0x2f, 0x43, 0x49, 0x2e, 0xc2, - 0xfd, 0x9e, 0xcf, 0x87, 0xa1, 0x40, 0xb3, 0x19, 0x17, 0xe1, 0xfe, 0xae, 0x7c, 0x43, 0x08, 0x66, - 0x13, 0x1e, 0x0b, 0x54, 0x51, 0x7e, 0x65, 0xc3, 0x65, 0x50, 0xa5, 0x21, 0x3e, 0x0e, 0x28, 0xaa, - 0x5a, 0x5a, 0xb7, 0xe6, 0xe5, 0x2f, 0xb8, 0x04, 0x2a, 0x3e, 0x4f, 0x69, 0x8c, 0xea, 0x32, 0xaf, - 0x97, 0x3d, 0xe0, 0x73, 0x00, 0xfc, 0x98, 0x62, 0x41, 0x49, 0x0f, 0x0b, 0xf4, 0x97, 0xa5, 0x75, - 0x1b, 0x9b, 0xa6, 0x93, 0x75, 0xee, 0x14, 0x9d, 0x3b, 0x6f, 0x8b, 0x71, 0xee, 0xcc, 0x5e, 0x7c, - 0x5f, 0xd3, 0xbc, 0x7a, 0x1e, 0xb3, 0x2d, 0x24, 0xc1, 0x30, 0x22, 0x05, 0x41, 0xed, 0x77, 0x09, - 0xf2, 0x98, 0x6d, 0xd5, 0x03, 0xf3, 0x79, 0x88, 0x80, 0x2a, 0x4b, 0xd9, 0xd0, 0x02, 0x0d, 0x42, - 0x13, 0x3f, 0x66, 0x91, 0x14, 0x04, 0x35, 0xd4, 0xa7, 0xb2, 0x0b, 0x3e, 0x04, 0xf3, 0xc9, 0x7b, - 0x7e, 0xd6, 0x2b, 0xc3, 0xe6, 0x54, 0xbf, 0xff, 0x48, 0xff, 0x5e, 0x09, 0xda, 0x01, 0x0d, 0x05, - 0xe5, 0x61, 0x2f, 0xc4, 0x29, 0xfa, 0x5b, 0xa1, 0xea, 0xd2, 0xf5, 0x26, 0x7c, 0x8d, 0x53, 0xfb, - 0xb3, 0x06, 0x16, 0x5f, 0xb1, 0x44, 0x14, 0x72, 0x7a, 0xf4, 0x74, 0x48, 0x13, 0x55, 0x58, 0x84, - 0xfb, 0x54, 0xe9, 0x6a, 0x78, 0xca, 0x56, 0x03, 0x67, 0x1f, 0xa8, 0x12, 0xd5, 0xf0, 0x94, 0x3d, - 0xaa, 0xb6, 0x61, 0x19, 0x5d, 0xa3, 0xa4, 0x76, 0x13, 0xe8, 0x67, 0x44, 0xe9, 0x56, 0xf7, 0xf4, - 0x33, 0x52, 0x52, 0xa7, 0x62, 0x19, 0xa3, 0xea, 0x9c, 0x30, 0x1a, 0x10, 0x54, 0xb5, 0x0c, 0xa9, - 0x8e, 0x7a, 0xd8, 0x47, 0x60, 0x61, 0xb4, 0xb2, 0x28, 0x38, 0x97, 0x50, 0xc1, 0x05, 0x0e, 0xf2, - 0xc2, 0xb2, 0x07, 0x7c, 0x04, 0x6a, 0xc5, 0x71, 0x20, 0xdd, 0x32, 0xba, 0x8d, 0xcd, 0x79, 0x27, - 0xbb, 0x0e, 0xe7, 0x2e, 0xfc, 0x0e, 0x61, 0x3f, 0x00, 0xad, 0x3d, 0x1a, 0x50, 0x41, 0xc7, 0x9b, - 0x2e, 0x56, 0x59, 0x76, 0xa1, 0x33, 0x62, 0xff, 0x0f, 0xe0, 0x4b, 0x2a, 0xee, 0x43, 0x69, 0x19, - 0x6a, 0xf3, 0xda, 0x00, 0x8d, 0x02, 0xb3, 0x7d, 0xb0, 0x0f, 0x8f, 0x40, 0x73, 0x57, 0x6d, 0xc8, - 0xdd, 0x89, 0x4c, 0x14, 0x63, 0x2e, 0x4f, 0x2c, 0xc9, 0x0b, 0x79, 0x5f, 0x76, 0xfb, 0xe3, 0x97, - 0x1f, 0x9f, 0xf4, 0x96, 0x3d, 0xef, 0x8e, 0xdd, 0xfc, 0x96, 0xb6, 0x2e, 0x89, 0x0f, 0xd5, 0xe6, - 0xfc, 0x39, 0xb1, 0x39, 0x95, 0x18, 0x83, 0xe6, 0xe8, 0x40, 0xe0, 0x6a, 0x41, 0x3c, 0x75, 0x50, - 0xf7, 0x66, 0x41, 0x2a, 0x0b, 0x5c, 0x9f, 0xc8, 0x02, 0x0f, 0x41, 0xa3, 0x34, 0x4a, 0x68, 0x16, - 0xfc, 0x93, 0xf3, 0x35, 0x27, 0x9a, 0x2a, 0x68, 0xe1, 0x24, 0x2d, 0x05, 0x73, 0xe5, 0x1d, 0x81, - 0xed, 0x22, 0x76, 0xca, 0x4e, 0x9b, 0xff, 0x4e, 0xff, 0x18, 0x05, 0xe7, 0xf6, 0xaa, 0xca, 0xb0, - 0x02, 0x5b, 0xe3, 0x19, 0xdc, 0x80, 0x25, 0x62, 0xe7, 0xe9, 0xe5, 0x4d, 0x47, 0xbb, 0xba, 0xe9, - 0x68, 0xd7, 0x37, 0x1d, 0xed, 0xe2, 0xb6, 0x33, 0x73, 0x75, 0xdb, 0x99, 0xf9, 0x7a, 0xdb, 0x99, - 0x01, 0xf9, 0x4f, 0xf8, 0x40, 0x7b, 0xb7, 0x30, 0xe0, 0x31, 0x25, 0xdc, 0xcf, 0x19, 0x9e, 0xa5, - 0x1b, 0xc7, 0x55, 0x35, 0x9e, 0x27, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x29, 0x47, 0xe2, 0xd2, - 0xc1, 0x05, 0x00, 0x00, + // 690 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcf, 0x6e, 0xd3, 0x4e, + 0x10, 0xae, 0xed, 0x26, 0xbf, 0x64, 0x53, 0xe5, 0xd7, 0x6e, 0x9b, 0xd6, 0x38, 0x34, 0xb5, 0x2c, + 0x24, 0x42, 0x05, 0xb6, 0x5a, 0xc4, 0xa5, 0x1c, 0x50, 0xff, 0x20, 0x54, 0x89, 0x43, 0x65, 0x51, + 0x55, 0xe2, 0x12, 0x6d, 0xbd, 0xd3, 0xb0, 0x92, 0xe3, 0x75, 0xed, 0x4d, 0xaa, 0x72, 0xe4, 0x09, + 0x2a, 0x71, 0xe1, 0x11, 0x78, 0x14, 0x8e, 0x95, 0xb8, 0x70, 0x82, 0xaa, 0xe5, 0x09, 0x78, 0x02, + 0xb4, 0x6b, 0xbb, 0xe4, 0x5f, 0x25, 0xc4, 0x6d, 0x66, 0x3c, 0xf3, 0xcd, 0xcc, 0x37, 0xdf, 0x1a, + 0x35, 0x48, 0xcc, 0xbc, 0xc1, 0x86, 0x17, 0x10, 0x01, 0x5d, 0x9e, 0x9c, 0xbb, 0x71, 0xc2, 0x05, + 0xc7, 0x65, 0x12, 0x33, 0x77, 0xb0, 0x61, 0xad, 0x75, 0x39, 0xef, 0x86, 0xe0, 0xa9, 0xe8, 0x71, + 0xff, 0xc4, 0x13, 0xac, 0x07, 0xa9, 0x20, 0xbd, 0x38, 0x4b, 0xb4, 0x96, 0xba, 0xbc, 0xcb, 0x95, + 0xe9, 0x49, 0x2b, 0x8f, 0xde, 0xcf, 0xcb, 0x24, 0x38, 0x89, 0x22, 0x2e, 0x88, 0x60, 0x3c, 0x4a, + 0xf3, 0xaf, 0xcd, 0x71, 0x50, 0xe8, 0xc5, 0x22, 0xef, 0xec, 0x7c, 0x36, 0x50, 0x65, 0x37, 0x1f, + 0x06, 0xd7, 0x91, 0xce, 0xa8, 0xa9, 0xd9, 0x5a, 0xbb, 0xe4, 0xeb, 0x8c, 0xe2, 0x26, 0xaa, 0xc6, + 0x24, 0x81, 0x48, 0x74, 0x18, 0x35, 0x75, 0x15, 0xae, 0x64, 0x81, 0x7d, 0x8a, 0x9f, 0xa0, 0x92, + 0x60, 0x22, 0x04, 0xd3, 0xb0, 0xb5, 0x76, 0x75, 0x67, 0xe5, 0xd7, 0xf7, 0xb5, 0xc5, 0x01, 0x09, + 0x19, 0x25, 0x02, 0xb6, 0x9c, 0x04, 0x4e, 0xfb, 0x2c, 0x01, 0xea, 0xf8, 0x59, 0x96, 0xc4, 0xa2, + 0x3c, 0xe8, 0x04, 0xbc, 0x1f, 0x09, 0x73, 0x36, 0xc3, 0xa2, 0x3c, 0xd8, 0x95, 0x3e, 0xc6, 0x68, + 0x36, 0xe5, 0x89, 0x30, 0x4b, 0x2a, 0xae, 0x6c, 0xbc, 0x8c, 0xca, 0x10, 0x91, 0xe3, 0x10, 0xcc, + 0xb2, 0xad, 0xb5, 0x2b, 0x7e, 0xee, 0xe1, 0x25, 0x54, 0x0a, 0xf8, 0x00, 0x12, 0xb3, 0x2a, 0xfb, + 0xfa, 0x99, 0x83, 0x5f, 0x20, 0x14, 0x24, 0x40, 0x04, 0xd0, 0x0e, 0x11, 0xe6, 0x7f, 0xb6, 0xd6, + 0xae, 0x6d, 0x5a, 0x6e, 0xb6, 0xb9, 0x5b, 0x6c, 0xee, 0xbe, 0x29, 0xe8, 0xdc, 0x99, 0xbd, 0xf8, + 0xb1, 0xa6, 0xf9, 0xd5, 0xbc, 0x66, 0x5b, 0x48, 0x80, 0x7e, 0x4c, 0x0b, 0x80, 0xca, 0xdf, 0x02, + 0xe4, 0x35, 0xdb, 0x6a, 0x07, 0x16, 0xf0, 0xc8, 0x44, 0x6a, 0x2c, 0x65, 0x63, 0x1b, 0xd5, 0x28, + 0xa4, 0x41, 0xc2, 0x62, 0x79, 0x10, 0xb3, 0xa6, 0x3e, 0x0d, 0x87, 0xf0, 0x23, 0x34, 0x9f, 0xbe, + 0xe3, 0x67, 0x9d, 0xe1, 0xb4, 0x39, 0xb5, 0xef, 0xff, 0x32, 0xbe, 0xf7, 0x27, 0xec, 0x7c, 0xd2, + 0xd0, 0xe2, 0x6b, 0x96, 0x8a, 0xe2, 0x5c, 0x3e, 0x9c, 0xf6, 0x21, 0x55, 0x8d, 0x63, 0xd2, 0x05, + 0x75, 0x37, 0xc3, 0x57, 0xb6, 0x22, 0x94, 0xbd, 0x07, 0x75, 0x34, 0xc3, 0x57, 0xf6, 0xe8, 0x35, + 0x0d, 0xdb, 0x68, 0x1b, 0x43, 0xd7, 0xac, 0x23, 0xfd, 0x8c, 0xaa, 0xbb, 0x54, 0x7d, 0xfd, 0x8c, + 0x0e, 0xb1, 0x5f, 0xb2, 0x8d, 0x51, 0xf6, 0x4f, 0x18, 0x84, 0xd4, 0x2c, 0xdb, 0x86, 0x64, 0x5f, + 0x39, 0xce, 0x11, 0x5a, 0x18, 0x9d, 0x2c, 0x0e, 0xcf, 0x65, 0xaa, 0xe0, 0x82, 0x84, 0xf9, 0x60, + 0x99, 0x83, 0x1f, 0xa3, 0x4a, 0x21, 0x7e, 0x53, 0xb7, 0x8d, 0x76, 0x6d, 0x73, 0xde, 0xcd, 0xd4, + 0xef, 0xde, 0x96, 0xdf, 0x66, 0x38, 0x0f, 0x51, 0x63, 0x0f, 0x42, 0x10, 0x30, 0xbe, 0x74, 0x21, + 0x55, 0xb9, 0x85, 0xce, 0xa8, 0xf3, 0x00, 0xe1, 0x57, 0x20, 0xee, 0xca, 0xd2, 0xb2, 0xac, 0xcd, + 0x2b, 0x03, 0xd5, 0x8a, 0x9c, 0xed, 0x83, 0x7d, 0x7c, 0x84, 0xea, 0xbb, 0x4a, 0x01, 0xb7, 0x4f, + 0x60, 0x62, 0x18, 0x6b, 0x79, 0x42, 0x04, 0x2f, 0xe5, 0xfb, 0x71, 0x9a, 0x1f, 0xbe, 0xfe, 0xfc, + 0xa8, 0x37, 0x9c, 0x79, 0x6f, 0xec, 0x4d, 0x6f, 0x69, 0xeb, 0x12, 0xf8, 0x50, 0x29, 0xe3, 0xdf, + 0x81, 0xad, 0xa9, 0xc0, 0x04, 0xd5, 0x47, 0x09, 0xc1, 0xab, 0x05, 0xf0, 0x54, 0xa2, 0xee, 0xec, + 0x62, 0xaa, 0x2e, 0x78, 0x7d, 0xa2, 0x0b, 0x3e, 0x44, 0xb5, 0x21, 0x2a, 0xb1, 0x55, 0xe0, 0x4f, + 0xf2, 0x6b, 0x4d, 0x2c, 0x55, 0xc0, 0xe2, 0x49, 0x58, 0x40, 0x73, 0xc3, 0x1a, 0xc1, 0xcd, 0xa2, + 0x76, 0x8a, 0xa6, 0xad, 0x7b, 0xd3, 0x3f, 0xc6, 0xe1, 0xb9, 0xb3, 0xaa, 0x3a, 0xac, 0xe0, 0xc6, + 0x78, 0x07, 0x2f, 0x64, 0xa9, 0xd8, 0x79, 0xf6, 0xe5, 0xba, 0xa5, 0x5d, 0x5e, 0xb7, 0xb4, 0xab, + 0xeb, 0x96, 0x76, 0x71, 0xd3, 0x9a, 0xb9, 0xbc, 0x69, 0xcd, 0x7c, 0xbb, 0x69, 0xcd, 0xa0, 0xfc, + 0x27, 0x7b, 0xa0, 0xbd, 0x5d, 0xe8, 0xf1, 0x04, 0x28, 0x0f, 0x72, 0x84, 0xe7, 0x83, 0x8d, 0xe3, + 0xb2, 0xa2, 0xe7, 0xe9, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x08, 0xb7, 0x49, 0x9f, 0xa1, 0x05, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -715,16 +706,6 @@ func (m *Category) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.ShowOnNav { - i-- - if m.ShowOnNav { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x68 - } if m.ShowDescription { i-- if m.ShowDescription { @@ -1068,9 +1049,6 @@ func (m *Category) Size() (n int) { if m.ShowDescription { n += 2 } - if m.ShowOnNav { - n += 2 - } return n } @@ -1506,26 +1484,6 @@ func (m *Category) Unmarshal(dAtA []byte) error { } } m.ShowDescription = bool(v != 0) - case 13: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ShowOnNav", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCategory - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.ShowOnNav = bool(v != 0) default: iNdEx = preIndex skippy, err := skipCategory(dAtA[iNdEx:]) diff --git a/api/v1/category.proto b/api/v1/category.proto index c901c48..dbb9eba 100644 --- a/api/v1/category.proto +++ b/api/v1/category.proto @@ -29,7 +29,6 @@ message Category { string icon = 10; // 分类图标 string description = 11; // 分类描述 bool show_description = 12; // 是否在分类筛选文档列表处显示分类描述 - bool show_on_nav = 13; // 是否在导航中显示 } // 分类列表请求 diff --git a/model/category.go b/model/category.go index 39564a6..b282973 100644 --- a/model/category.go +++ b/model/category.go @@ -18,7 +18,6 @@ type Category struct { Enable bool `form:"enable" json:"enable,omitempty" gorm:"column:enable;type:tinyint(1);size:1;index:idx_enable;default:1;"` Description string `form:"description" json:"description,omitempty" gorm:"column:description;type:text;comment:分类描述;"` ShowDescription bool `form:"show_description" json:"show_description,omitempty" gorm:"column:show_description;type:tinyint(1);size:1;default:0;comment:是否显示描述;"` - ShowOnNav bool `form:"show_on_nav" json:"show_on_nav,omitempty" gorm:"column:show_on_nav;type:tinyint(1);size:1;default:0;comment:是否显示在导航;"` CreatedAt *time.Time `form:"created_at" json:"created_at,omitempty" gorm:"column:created_at;type:datetime;comment:创建时间;"` UpdatedAt *time.Time `form:"updated_at" json:"updated_at,omitempty" gorm:"column:updated_at;type:datetime;comment:更新时间;"` } diff --git a/web/components/FormCategory.vue b/web/components/FormCategory.vue index cf65551..ae561a8 100644 --- a/web/components/FormCategory.vue +++ b/web/components/FormCategory.vue @@ -101,7 +101,7 @@ > - + - - - - - - + + +
+ {{ breadcrumbs[breadcrumbs.length - 1].description }} +
分类
@@ -444,7 +453,15 @@ export default { margin-bottom: -20px; } } - + .category-description { + border: 1px dashed #ddd; + margin-bottom: 20px; + padding: 15px; + border-radius: 4px; + font-size: 14px; + color: #888; + line-height: 180%; + } .doc-list-data { min-height: 200px; .no-data { diff --git a/web/store/module/category.js b/web/store/module/category.js index c1115e4..974489f 100644 --- a/web/store/module/category.js +++ b/web/store/module/category.js @@ -33,6 +33,8 @@ export const category = { 'cover', 'doc_count', 'enable', + 'description', + 'show_description', ], }) if (res.status === 200) {