File tree Expand file tree Collapse file tree
contributes/meta3d-ui-control-textcolored
platform/frontend/src/external_layer/ui/app/assemble_space/components/element_assemble/store Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11{
22 "name" : " meta3d-ui-control-textcolored" ,
3- "version" : " 1.3.3 " ,
3+ "version" : " 1.3.4 " ,
44 "displayName" : " 带颜色的文字" ,
55 "publisher" : " meta3d" ,
66 "description" : " " ,
1919 "dependencies" : {
2020 "meta3d-editor-whole-protocol" : " ^1.3.0" ,
2121 "meta3d-type" : " ^1.3.0" ,
22- "meta3d-ui-control-textcolored-protocol" : " ^1.3.0 "
22+ "meta3d-ui-control-textcolored-protocol" : " ^1.3.1 "
2323 },
2424 "devDependencies" : {
2525 "clean-webpack-plugin" : " ^4.0.0" ,
Original file line number Diff line number Diff line change @@ -715,7 +715,8 @@ TODO run test
715715 extract id
716716
717717
718- TODO fix: after auto upgrade, color change back
718+ # TODO fix: after auto upgrade, specific shouldn't be reset if not change
719+ TODO fix: after auto upgrade, specific shouldn't be reset if protocol version not change
719720
720721
721722TODO handle all bookmarks
Original file line number Diff line number Diff line change @@ -323,7 +323,8 @@ let reducer = (state, action) => {
323323 dragId ,
324324 dropId ,
325325 dropPosition ,
326- ) => ! dropToGap &&
326+ ) =>
327+ ! dropToGap &&
327328 ! hasChildren (.
328329 serializeUIControlProtocolConfigLib (.
329330 (
@@ -448,6 +449,7 @@ let reducer = (state, action) => {
448449 }
449450 }
450451 }
452+
451453 | SetSpecificData (id , specific ) =>
452454 _setUIControlInspectorData (
453455 state ,
@@ -731,12 +733,17 @@ let reducer = (state, action) => {
731733 })
732734
733735 state -> _updateAllUIControlInspectorData (data => {
734- let name = (
736+ let selectedUIControlData =
735737 _findSelectUIControlById (state , data .id )-> Meta3dCommonlib .OptionSt .getExn
736- ).data .contributePackageData .name
738+ let name = selectedUIControlData .data .contributePackageData .name
739+ let protocolVersion = selectedUIControlData .data .contributePackageData .protocol .version
737740
738741 switch selectedUIControls -> Meta3dCommonlib .ListSt .find (({data }) => {
739- data .contributePackageData .name == name
742+ data .contributePackageData .name == name &&
743+ Meta3d .Semver .gt (
744+ Meta3d .Semver .minVersion (data .contributePackageData .protocol .version ),
745+ Meta3d .Semver .minVersion (protocolVersion ),
746+ )
740747 }) {
741748 | Some ({protocolConfigStr }) => {
742749 ... data ,
You can’t perform that action at this time.
0 commit comments