|
@@ -727,7 +727,7 @@ pub struct Field {
|
|
|
pub frozen: bool,
|
|
|
pub visibility: bool,
|
|
|
pub width: i32,
|
|
|
- pub type_options: ::protobuf::SingularPtrField<AnyData>,
|
|
|
+ pub type_options: ::std::string::String,
|
|
|
// special fields
|
|
|
pub unknown_fields: ::protobuf::UnknownFields,
|
|
|
pub cached_size: ::protobuf::CachedSize,
|
|
@@ -882,47 +882,35 @@ impl Field {
|
|
|
self.width = v;
|
|
|
}
|
|
|
|
|
|
- // .AnyData type_options = 8;
|
|
|
+ // string type_options = 8;
|
|
|
|
|
|
|
|
|
- pub fn get_type_options(&self) -> &AnyData {
|
|
|
- self.type_options.as_ref().unwrap_or_else(|| <AnyData as ::protobuf::Message>::default_instance())
|
|
|
+ pub fn get_type_options(&self) -> &str {
|
|
|
+ &self.type_options
|
|
|
}
|
|
|
pub fn clear_type_options(&mut self) {
|
|
|
self.type_options.clear();
|
|
|
}
|
|
|
|
|
|
- pub fn has_type_options(&self) -> bool {
|
|
|
- self.type_options.is_some()
|
|
|
- }
|
|
|
-
|
|
|
// Param is passed by value, moved
|
|
|
- pub fn set_type_options(&mut self, v: AnyData) {
|
|
|
- self.type_options = ::protobuf::SingularPtrField::some(v);
|
|
|
+ pub fn set_type_options(&mut self, v: ::std::string::String) {
|
|
|
+ self.type_options = v;
|
|
|
}
|
|
|
|
|
|
// Mutable pointer to the field.
|
|
|
// If field is not initialized, it is initialized with default value first.
|
|
|
- pub fn mut_type_options(&mut self) -> &mut AnyData {
|
|
|
- if self.type_options.is_none() {
|
|
|
- self.type_options.set_default();
|
|
|
- }
|
|
|
- self.type_options.as_mut().unwrap()
|
|
|
+ pub fn mut_type_options(&mut self) -> &mut ::std::string::String {
|
|
|
+ &mut self.type_options
|
|
|
}
|
|
|
|
|
|
// Take field
|
|
|
- pub fn take_type_options(&mut self) -> AnyData {
|
|
|
- self.type_options.take().unwrap_or_else(|| AnyData::new())
|
|
|
+ pub fn take_type_options(&mut self) -> ::std::string::String {
|
|
|
+ ::std::mem::replace(&mut self.type_options, ::std::string::String::new())
|
|
|
}
|
|
|
}
|
|
|
|
|
|
impl ::protobuf::Message for Field {
|
|
|
fn is_initialized(&self) -> bool {
|
|
|
- for v in &self.type_options {
|
|
|
- if !v.is_initialized() {
|
|
|
- return false;
|
|
|
- }
|
|
|
- };
|
|
|
true
|
|
|
}
|
|
|
|
|
@@ -964,7 +952,7 @@ impl ::protobuf::Message for Field {
|
|
|
self.width = tmp;
|
|
|
},
|
|
|
8 => {
|
|
|
- ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.type_options)?;
|
|
|
+ ::protobuf::rt::read_singular_proto3_string_into(wire_type, is, &mut self.type_options)?;
|
|
|
},
|
|
|
_ => {
|
|
|
::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?;
|
|
@@ -999,9 +987,8 @@ impl ::protobuf::Message for Field {
|
|
|
if self.width != 0 {
|
|
|
my_size += ::protobuf::rt::value_size(7, self.width, ::protobuf::wire_format::WireTypeVarint);
|
|
|
}
|
|
|
- if let Some(ref v) = self.type_options.as_ref() {
|
|
|
- let len = v.compute_size();
|
|
|
- my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len;
|
|
|
+ if !self.type_options.is_empty() {
|
|
|
+ my_size += ::protobuf::rt::string_size(8, &self.type_options);
|
|
|
}
|
|
|
my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields());
|
|
|
self.cached_size.set(my_size);
|
|
@@ -1030,10 +1017,8 @@ impl ::protobuf::Message for Field {
|
|
|
if self.width != 0 {
|
|
|
os.write_int32(7, self.width)?;
|
|
|
}
|
|
|
- if let Some(ref v) = self.type_options.as_ref() {
|
|
|
- os.write_tag(8, ::protobuf::wire_format::WireTypeLengthDelimited)?;
|
|
|
- os.write_raw_varint32(v.get_cached_size())?;
|
|
|
- v.write_to_with_cached_sizes(os)?;
|
|
|
+ if !self.type_options.is_empty() {
|
|
|
+ os.write_string(8, &self.type_options)?;
|
|
|
}
|
|
|
os.write_unknown_fields(self.get_unknown_fields())?;
|
|
|
::std::result::Result::Ok(())
|
|
@@ -1108,7 +1093,7 @@ impl ::protobuf::Message for Field {
|
|
|
|m: &Field| { &m.width },
|
|
|
|m: &mut Field| { &mut m.width },
|
|
|
));
|
|
|
- fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage<AnyData>>(
|
|
|
+ fields.push(::protobuf::reflect::accessor::make_simple_field_accessor::<_, ::protobuf::types::ProtobufTypeString>(
|
|
|
"type_options",
|
|
|
|m: &Field| { &m.type_options },
|
|
|
|m: &mut Field| { &mut m.type_options },
|
|
@@ -1208,7 +1193,7 @@ pub enum FieldChangeset_oneof_one_of_width {
|
|
|
|
|
|
#[derive(Clone,PartialEq,Debug)]
|
|
|
pub enum FieldChangeset_oneof_one_of_type_options {
|
|
|
- type_options(AnyData),
|
|
|
+ type_options(::std::string::String),
|
|
|
}
|
|
|
|
|
|
impl FieldChangeset {
|
|
@@ -1440,13 +1425,13 @@ impl FieldChangeset {
|
|
|
self.one_of_width = ::std::option::Option::Some(FieldChangeset_oneof_one_of_width::width(v))
|
|
|
}
|
|
|
|
|
|
- // .AnyData type_options = 8;
|
|
|
+ // string type_options = 8;
|
|
|
|
|
|
|
|
|
- pub fn get_type_options(&self) -> &AnyData {
|
|
|
+ pub fn get_type_options(&self) -> &str {
|
|
|
match self.one_of_type_options {
|
|
|
::std::option::Option::Some(FieldChangeset_oneof_one_of_type_options::type_options(ref v)) => v,
|
|
|
- _ => <AnyData as ::protobuf::Message>::default_instance(),
|
|
|
+ _ => "",
|
|
|
}
|
|
|
}
|
|
|
pub fn clear_type_options(&mut self) {
|
|
@@ -1461,15 +1446,15 @@ impl FieldChangeset {
|
|
|
}
|
|
|
|
|
|
// Param is passed by value, moved
|
|
|
- pub fn set_type_options(&mut self, v: AnyData) {
|
|
|
+ pub fn set_type_options(&mut self, v: ::std::string::String) {
|
|
|
self.one_of_type_options = ::std::option::Option::Some(FieldChangeset_oneof_one_of_type_options::type_options(v))
|
|
|
}
|
|
|
|
|
|
// Mutable pointer to the field.
|
|
|
- pub fn mut_type_options(&mut self) -> &mut AnyData {
|
|
|
+ pub fn mut_type_options(&mut self) -> &mut ::std::string::String {
|
|
|
if let ::std::option::Option::Some(FieldChangeset_oneof_one_of_type_options::type_options(_)) = self.one_of_type_options {
|
|
|
} else {
|
|
|
- self.one_of_type_options = ::std::option::Option::Some(FieldChangeset_oneof_one_of_type_options::type_options(AnyData::new()));
|
|
|
+ self.one_of_type_options = ::std::option::Option::Some(FieldChangeset_oneof_one_of_type_options::type_options(::std::string::String::new()));
|
|
|
}
|
|
|
match self.one_of_type_options {
|
|
|
::std::option::Option::Some(FieldChangeset_oneof_one_of_type_options::type_options(ref mut v)) => v,
|
|
@@ -1478,25 +1463,20 @@ impl FieldChangeset {
|
|
|
}
|
|
|
|
|
|
// Take field
|
|
|
- pub fn take_type_options(&mut self) -> AnyData {
|
|
|
+ pub fn take_type_options(&mut self) -> ::std::string::String {
|
|
|
if self.has_type_options() {
|
|
|
match self.one_of_type_options.take() {
|
|
|
::std::option::Option::Some(FieldChangeset_oneof_one_of_type_options::type_options(v)) => v,
|
|
|
_ => panic!(),
|
|
|
}
|
|
|
} else {
|
|
|
- AnyData::new()
|
|
|
+ ::std::string::String::new()
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
impl ::protobuf::Message for FieldChangeset {
|
|
|
fn is_initialized(&self) -> bool {
|
|
|
- if let Some(FieldChangeset_oneof_one_of_type_options::type_options(ref v)) = self.one_of_type_options {
|
|
|
- if !v.is_initialized() {
|
|
|
- return false;
|
|
|
- }
|
|
|
- }
|
|
|
true
|
|
|
}
|
|
|
|
|
@@ -1547,7 +1527,7 @@ impl ::protobuf::Message for FieldChangeset {
|
|
|
if wire_type != ::protobuf::wire_format::WireTypeLengthDelimited {
|
|
|
return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type));
|
|
|
}
|
|
|
- self.one_of_type_options = ::std::option::Option::Some(FieldChangeset_oneof_one_of_type_options::type_options(is.read_message()?));
|
|
|
+ self.one_of_type_options = ::std::option::Option::Some(FieldChangeset_oneof_one_of_type_options::type_options(is.read_string()?));
|
|
|
},
|
|
|
_ => {
|
|
|
::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?;
|
|
@@ -1609,8 +1589,7 @@ impl ::protobuf::Message for FieldChangeset {
|
|
|
if let ::std::option::Option::Some(ref v) = self.one_of_type_options {
|
|
|
match v {
|
|
|
&FieldChangeset_oneof_one_of_type_options::type_options(ref v) => {
|
|
|
- let len = v.compute_size();
|
|
|
- my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len;
|
|
|
+ my_size += ::protobuf::rt::string_size(8, &v);
|
|
|
},
|
|
|
};
|
|
|
}
|
|
@@ -1668,9 +1647,7 @@ impl ::protobuf::Message for FieldChangeset {
|
|
|
if let ::std::option::Option::Some(ref v) = self.one_of_type_options {
|
|
|
match v {
|
|
|
&FieldChangeset_oneof_one_of_type_options::type_options(ref v) => {
|
|
|
- os.write_tag(8, ::protobuf::wire_format::WireTypeLengthDelimited)?;
|
|
|
- os.write_raw_varint32(v.get_cached_size())?;
|
|
|
- v.write_to_with_cached_sizes(os)?;
|
|
|
+ os.write_string(8, v)?;
|
|
|
},
|
|
|
};
|
|
|
}
|
|
@@ -1747,7 +1724,7 @@ impl ::protobuf::Message for FieldChangeset {
|
|
|
FieldChangeset::has_width,
|
|
|
FieldChangeset::get_width,
|
|
|
));
|
|
|
- fields.push(::protobuf::reflect::accessor::make_singular_message_accessor::<_, AnyData>(
|
|
|
+ fields.push(::protobuf::reflect::accessor::make_singular_string_accessor::<_>(
|
|
|
"type_options",
|
|
|
FieldChangeset::has_type_options,
|
|
|
FieldChangeset::get_type_options,
|
|
@@ -3183,46 +3160,45 @@ static file_descriptor_proto_data: &'static [u8] = b"\
|
|
|
ndex\x18\x02\x20\x01(\x05R\rstartRowIndex\x12\x1b\n\trow_count\x18\x03\
|
|
|
\x20\x01(\x05R\x08rowCount\"H\n\rGridBlockMeta\x12\x19\n\x08block_id\x18\
|
|
|
\x01\x20\x01(\tR\x07blockId\x12\x1c\n\x04rows\x18\x02\x20\x03(\x0b2\x08.\
|
|
|
- RowMetaR\x04rows\"\xe5\x01\n\x05Field\x12\x0e\n\x02id\x18\x01\x20\x01(\t\
|
|
|
+ RowMetaR\x04rows\"\xdb\x01\n\x05Field\x12\x0e\n\x02id\x18\x01\x20\x01(\t\
|
|
|
R\x02id\x12\x12\n\x04name\x18\x02\x20\x01(\tR\x04name\x12\x12\n\x04desc\
|
|
|
\x18\x03\x20\x01(\tR\x04desc\x12)\n\nfield_type\x18\x04\x20\x01(\x0e2\n.\
|
|
|
FieldTypeR\tfieldType\x12\x16\n\x06frozen\x18\x05\x20\x01(\x08R\x06froze\
|
|
|
n\x12\x1e\n\nvisibility\x18\x06\x20\x01(\x08R\nvisibility\x12\x14\n\x05w\
|
|
|
- idth\x18\x07\x20\x01(\x05R\x05width\x12+\n\x0ctype_options\x18\x08\x20\
|
|
|
- \x01(\x0b2\x08.AnyDataR\x0btypeOptions\"\x87\x03\n\x0eFieldChangeset\x12\
|
|
|
- \x19\n\x08field_id\x18\x01\x20\x01(\tR\x07fieldId\x12\x14\n\x04name\x18\
|
|
|
- \x02\x20\x01(\tH\0R\x04name\x12\x14\n\x04desc\x18\x03\x20\x01(\tH\x01R\
|
|
|
- \x04desc\x12+\n\nfield_type\x18\x04\x20\x01(\x0e2\n.FieldTypeH\x02R\tfie\
|
|
|
- ldType\x12\x18\n\x06frozen\x18\x05\x20\x01(\x08H\x03R\x06frozen\x12\x20\
|
|
|
- \n\nvisibility\x18\x06\x20\x01(\x08H\x04R\nvisibility\x12\x16\n\x05width\
|
|
|
- \x18\x07\x20\x01(\x05H\x05R\x05width\x12-\n\x0ctype_options\x18\x08\x20\
|
|
|
- \x01(\x0b2\x08.AnyDataH\x06R\x0btypeOptionsB\r\n\x0bone_of_nameB\r\n\x0b\
|
|
|
- one_of_descB\x13\n\x11one_of_field_typeB\x0f\n\rone_of_frozenB\x13\n\x11\
|
|
|
- one_of_visibilityB\x0e\n\x0cone_of_widthB\x15\n\x13one_of_type_options\"\
|
|
|
- -\n\rRepeatedField\x12\x1c\n\x05items\x18\x01\x20\x03(\x0b2\x06.FieldR\
|
|
|
- \x05items\"8\n\x07AnyData\x12\x17\n\x07type_id\x18\x01\x20\x01(\tR\x06ty\
|
|
|
- peId\x12\x14\n\x05value\x18\x02\x20\x01(\x0cR\x05value\"\xff\x01\n\x07Ro\
|
|
|
- wMeta\x12\x0e\n\x02id\x18\x01\x20\x01(\tR\x02id\x12\x19\n\x08block_id\
|
|
|
- \x18\x02\x20\x01(\tR\x07blockId\x12D\n\x10cell_by_field_id\x18\x03\x20\
|
|
|
- \x03(\x0b2\x1b.RowMeta.CellByFieldIdEntryR\rcellByFieldId\x12\x16\n\x06h\
|
|
|
- eight\x18\x04\x20\x01(\x05R\x06height\x12\x1e\n\nvisibility\x18\x05\x20\
|
|
|
- \x01(\x08R\nvisibility\x1aK\n\x12CellByFieldIdEntry\x12\x10\n\x03key\x18\
|
|
|
- \x01\x20\x01(\tR\x03key\x12\x1f\n\x05value\x18\x02\x20\x01(\x0b2\t.CellM\
|
|
|
- etaR\x05value:\x028\x01\"\xa7\x02\n\x10RowMetaChangeset\x12\x15\n\x06row\
|
|
|
- _id\x18\x01\x20\x01(\tR\x05rowId\x12\x18\n\x06height\x18\x02\x20\x01(\
|
|
|
- \x05H\0R\x06height\x12\x20\n\nvisibility\x18\x03\x20\x01(\x08H\x01R\nvis\
|
|
|
- ibility\x12M\n\x10cell_by_field_id\x18\x04\x20\x03(\x0b2$.RowMetaChanges\
|
|
|
- et.CellByFieldIdEntryR\rcellByFieldId\x1aK\n\x12CellByFieldIdEntry\x12\
|
|
|
- \x10\n\x03key\x18\x01\x20\x01(\tR\x03key\x12\x1f\n\x05value\x18\x02\x20\
|
|
|
- \x01(\x0b2\t.CellMetaR\x05value:\x028\x01B\x0f\n\rone_of_heightB\x13\n\
|
|
|
- \x11one_of_visibility\"\x82\x01\n\x08CellMeta\x12\x0e\n\x02id\x18\x01\
|
|
|
- \x20\x01(\tR\x02id\x12\x15\n\x06row_id\x18\x02\x20\x01(\tR\x05rowId\x12\
|
|
|
- \x19\n\x08field_id\x18\x03\x20\x01(\tR\x07fieldId\x12\x1c\n\x04data\x18\
|
|
|
- \x04\x20\x01(\x0b2\x08.AnyDataR\x04data\x12\x16\n\x06height\x18\x05\x20\
|
|
|
- \x01(\x05R\x06height*d\n\tFieldType\x12\x0c\n\x08RichText\x10\0\x12\n\n\
|
|
|
- \x06Number\x10\x01\x12\x0c\n\x08DateTime\x10\x02\x12\x10\n\x0cSingleSele\
|
|
|
- ct\x10\x03\x12\x0f\n\x0bMultiSelect\x10\x04\x12\x0c\n\x08Checkbox\x10\
|
|
|
- \x05b\x06proto3\
|
|
|
+ idth\x18\x07\x20\x01(\x05R\x05width\x12!\n\x0ctype_options\x18\x08\x20\
|
|
|
+ \x01(\tR\x0btypeOptions\"\xfd\x02\n\x0eFieldChangeset\x12\x19\n\x08field\
|
|
|
+ _id\x18\x01\x20\x01(\tR\x07fieldId\x12\x14\n\x04name\x18\x02\x20\x01(\tH\
|
|
|
+ \0R\x04name\x12\x14\n\x04desc\x18\x03\x20\x01(\tH\x01R\x04desc\x12+\n\nf\
|
|
|
+ ield_type\x18\x04\x20\x01(\x0e2\n.FieldTypeH\x02R\tfieldType\x12\x18\n\
|
|
|
+ \x06frozen\x18\x05\x20\x01(\x08H\x03R\x06frozen\x12\x20\n\nvisibility\
|
|
|
+ \x18\x06\x20\x01(\x08H\x04R\nvisibility\x12\x16\n\x05width\x18\x07\x20\
|
|
|
+ \x01(\x05H\x05R\x05width\x12#\n\x0ctype_options\x18\x08\x20\x01(\tH\x06R\
|
|
|
+ \x0btypeOptionsB\r\n\x0bone_of_nameB\r\n\x0bone_of_descB\x13\n\x11one_of\
|
|
|
+ _field_typeB\x0f\n\rone_of_frozenB\x13\n\x11one_of_visibilityB\x0e\n\x0c\
|
|
|
+ one_of_widthB\x15\n\x13one_of_type_options\"-\n\rRepeatedField\x12\x1c\n\
|
|
|
+ \x05items\x18\x01\x20\x03(\x0b2\x06.FieldR\x05items\"8\n\x07AnyData\x12\
|
|
|
+ \x17\n\x07type_id\x18\x01\x20\x01(\tR\x06typeId\x12\x14\n\x05value\x18\
|
|
|
+ \x02\x20\x01(\x0cR\x05value\"\xff\x01\n\x07RowMeta\x12\x0e\n\x02id\x18\
|
|
|
+ \x01\x20\x01(\tR\x02id\x12\x19\n\x08block_id\x18\x02\x20\x01(\tR\x07bloc\
|
|
|
+ kId\x12D\n\x10cell_by_field_id\x18\x03\x20\x03(\x0b2\x1b.RowMeta.CellByF\
|
|
|
+ ieldIdEntryR\rcellByFieldId\x12\x16\n\x06height\x18\x04\x20\x01(\x05R\
|
|
|
+ \x06height\x12\x1e\n\nvisibility\x18\x05\x20\x01(\x08R\nvisibility\x1aK\
|
|
|
+ \n\x12CellByFieldIdEntry\x12\x10\n\x03key\x18\x01\x20\x01(\tR\x03key\x12\
|
|
|
+ \x1f\n\x05value\x18\x02\x20\x01(\x0b2\t.CellMetaR\x05value:\x028\x01\"\
|
|
|
+ \xa7\x02\n\x10RowMetaChangeset\x12\x15\n\x06row_id\x18\x01\x20\x01(\tR\
|
|
|
+ \x05rowId\x12\x18\n\x06height\x18\x02\x20\x01(\x05H\0R\x06height\x12\x20\
|
|
|
+ \n\nvisibility\x18\x03\x20\x01(\x08H\x01R\nvisibility\x12M\n\x10cell_by_\
|
|
|
+ field_id\x18\x04\x20\x03(\x0b2$.RowMetaChangeset.CellByFieldIdEntryR\rce\
|
|
|
+ llByFieldId\x1aK\n\x12CellByFieldIdEntry\x12\x10\n\x03key\x18\x01\x20\
|
|
|
+ \x01(\tR\x03key\x12\x1f\n\x05value\x18\x02\x20\x01(\x0b2\t.CellMetaR\x05\
|
|
|
+ value:\x028\x01B\x0f\n\rone_of_heightB\x13\n\x11one_of_visibility\"\x82\
|
|
|
+ \x01\n\x08CellMeta\x12\x0e\n\x02id\x18\x01\x20\x01(\tR\x02id\x12\x15\n\
|
|
|
+ \x06row_id\x18\x02\x20\x01(\tR\x05rowId\x12\x19\n\x08field_id\x18\x03\
|
|
|
+ \x20\x01(\tR\x07fieldId\x12\x1c\n\x04data\x18\x04\x20\x01(\x0b2\x08.AnyD\
|
|
|
+ ataR\x04data\x12\x16\n\x06height\x18\x05\x20\x01(\x05R\x06height*d\n\tFi\
|
|
|
+ eldType\x12\x0c\n\x08RichText\x10\0\x12\n\n\x06Number\x10\x01\x12\x0c\n\
|
|
|
+ \x08DateTime\x10\x02\x12\x10\n\x0cSingleSelect\x10\x03\x12\x0f\n\x0bMult\
|
|
|
+ iSelect\x10\x04\x12\x0c\n\x08Checkbox\x10\x05b\x06proto3\
|
|
|
";
|
|
|
|
|
|
static file_descriptor_proto_lazy: ::protobuf::rt::LazyV2<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::rt::LazyV2::INIT;
|