File tree Expand file tree Collapse file tree
openblocks-design/src/components Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -110,6 +110,9 @@ export const QueryConfigItemWrapper = styled.div<{ direction?: "row" | "column"
110110type TutorialStyle = "dropdownRight" | "begin" ;
111111
112112const TutorialButtonWrapper = styled . div < { styleName : TutorialStyle } > `
113+ height: 100%;
114+ display: flex;
115+ align-items: center;
113116 ${ ( props ) => {
114117 if ( props . styleName === "dropdownRight" ) {
115118 return css `
Original file line number Diff line number Diff line change @@ -53,6 +53,7 @@ const DataResponderItemCompBase = new MultiCompBuilder(
5353 label : trans ( "dataResponder.data" ) ,
5454 tooltip : trans ( "dataResponder.dataTooltip" ) ,
5555 placement : "bottom" ,
56+ placeholder : "{{anyDependencies}}" ,
5657 extraChildren : QueryTutorials . dataResponder && (
5758 < DocLink style = { { marginTop : 8 } } href = { QueryTutorials . dataResponder } >
5859 { trans ( "dataResponder.docLink" ) }
@@ -133,6 +134,6 @@ export const DataChangeResponderListComp = bottomResListComp(
133134 DataChangeResponderItemComp ,
134135 DataResponderCompType ,
135136 {
136- data : JSON . stringify ( { } ) ,
137+ data : "" ,
137138 }
138139) ;
Original file line number Diff line number Diff line change @@ -56,11 +56,15 @@ export class ExecuteQueryAction extends ExecuteQueryTmpAction {
5656 } ) )
5757 . filter (
5858 // Filter out the current query under query
59- ( option ) =>
60- placement !== "query" ||
61- ( placement === "query" &&
62- editorState . selectedBottomResType === BottomResTypeEnum . Query &&
63- option . value !== editorState . selectedBottomResName )
59+ ( option ) => {
60+ if (
61+ placement === "query" &&
62+ editorState . selectedBottomResType === BottomResTypeEnum . Query
63+ ) {
64+ return option . value !== editorState . selectedBottomResName ;
65+ }
66+ return true ;
67+ }
6468 ) || [ ] ;
6569
6670 // input queries
Original file line number Diff line number Diff line change @@ -139,7 +139,22 @@ export class EditorState {
139139 const queryComInfoList = this . queryCompInfoList ( ) ;
140140 const stateComInfoList = this . getTempStateCompInfoList ( ) ;
141141 const transformerComInfoList = this . getTransformerCompInfoList ( ) ;
142- return [ ...queryComInfoList , ...stateComInfoList , ...transformerComInfoList ] ;
142+ const dataResponderInfoList = this . getDataResponderInfoList ( ) ;
143+ return [
144+ ...queryComInfoList ,
145+ ...stateComInfoList ,
146+ ...transformerComInfoList ,
147+ ...dataResponderInfoList ,
148+ ] ;
149+ }
150+
151+ getDataResponderInfoList ( ) : Array < CompInfo > {
152+ const listComp = this . getDataRespondersComp ( ) ;
153+ const exposingInfo = listComp . nameAndExposingInfo ( ) ;
154+ return listComp . getView ( ) . map ( ( item ) => {
155+ const name = item . children . name . getView ( ) ;
156+ return this . getCompInfo ( exposingInfo , name , BottomResTypeEnum . DateResponder ) ;
157+ } ) ;
143158 }
144159
145160 getTempStateCompInfoList ( ) : Array < CompInfo > {
Original file line number Diff line number Diff line change @@ -1496,8 +1496,7 @@ export const en = {
14961496 dataResponder : {
14971497 data : "Data" ,
14981498 dataDesc : "Data of current data responder" ,
1499- dataTooltip :
1500- "The dependent data that it's change will trigger the actions of current responder" ,
1499+ dataTooltip : "When this data is changed, it will trigger subsequent actions." ,
15011500 docLink : "About the Data responder" ,
15021501 deleteMessage : "The data responder is deleted successfully. You can use {undoKey} to undo." ,
15031502 } ,
Original file line number Diff line number Diff line change @@ -42,6 +42,14 @@ export function SettingHome() {
4242 key : SettingPageEnum . Organization ,
4343 label : trans ( "settings.organization" ) ,
4444 } ,
45+ ...( isEE ( ) && currentOrgAdmin ( user ) && ( isSelfDomain ( config ) || isEnterpriseMode ( config ) )
46+ ? [
47+ {
48+ key : SettingPageEnum . IdSource ,
49+ label : trans ( "settings.idSource" ) ,
50+ } ,
51+ ]
52+ : [ ] ) ,
4553 ...( showAuditLog ( config ) && currentOrgAdmin ( user )
4654 ? [
4755 {
@@ -70,14 +78,6 @@ export function SettingHome() {
7078 key : SettingPageEnum . Advanced ,
7179 label : trans ( "settings.advanced" ) ,
7280 } ,
73- ...( isEE ( ) && currentOrgAdmin ( user ) && ( isSelfDomain ( config ) || isEnterpriseMode ( config ) )
74- ? [
75- {
76- key : SettingPageEnum . IdSource ,
77- label : trans ( "settings.idSource" ) ,
78- } ,
79- ]
80- : [ ] ) ,
8181 ] ;
8282
8383 return (
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ export function isSelfDomain(config?: SystemConfig) {
3030}
3131
3232export function showAuditLog ( config ?: SystemConfig ) {
33- return config ?. featureFlag . enableAuditLog ;
33+ return config ?. featureFlag ? .enableAuditLog ;
3434}
3535
3636export function useCloudHosting ( ) {
You can’t perform that action at this time.
0 commit comments