mirror of
https://gitee.com/jmix/cuba.git
synced 2024-12-05 04:38:10 +08:00
Explicit spacing for layout in editors #PL-2619
This commit is contained in:
parent
57a0807dc2
commit
42af42a8af
@ -18,7 +18,7 @@
|
||||
<datasource id="fileDs" class="com.haulmont.cuba.core.entity.FileDescriptor" view="browse"/>
|
||||
</dsContext>
|
||||
|
||||
<layout expand="windowActions">
|
||||
<layout expand="windowActions" spacing="true">
|
||||
<upload id="uploadField"/>
|
||||
<grid spacing="true">
|
||||
<columns>
|
||||
|
@ -19,7 +19,7 @@
|
||||
<assign name="width" value="560"/>
|
||||
<assign name="height" value="300"/>
|
||||
|
||||
<layout expand="windowActions">
|
||||
<layout expand="windowActions" spacing="true">
|
||||
<hbox height="30" spacing="true">
|
||||
<multiUpload id="multiUpload" width="90px"/>
|
||||
<button action="uploadsTable.remove" icon="icons/remove.png"/>
|
||||
|
@ -14,29 +14,27 @@
|
||||
<datasource id="constraint" class="com.haulmont.cuba.security.entity.Constraint" view="edit"/>
|
||||
</dsContext>
|
||||
|
||||
<layout expand="windowActions">
|
||||
<vbox margin="true">
|
||||
<grid id="grid" margin="true" spacing="true">
|
||||
<columns count="2"/>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="msg://entityName"/>
|
||||
<lookupField id="entityName" datasource="constraint" property="entityName"
|
||||
width="500px"/>
|
||||
</row>
|
||||
<row>
|
||||
<label value="msg://joinClause"/>
|
||||
<autoCompleteTextField id="joinClause" datasource="constraint" property="joinClause"
|
||||
width="500px" rows="3"/>
|
||||
</row>
|
||||
<row>
|
||||
<label value="msg://whereClause"/>
|
||||
<autoCompleteTextField id="whereClause" datasource="constraint" property="whereClause"
|
||||
width="500px" rows="3"/>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
</vbox>
|
||||
<layout expand="windowActions" spacing="true">
|
||||
<grid id="grid" spacing="true">
|
||||
<columns count="2"/>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="msg://entityName"/>
|
||||
<lookupField id="entityName" datasource="constraint" property="entityName"
|
||||
width="500px"/>
|
||||
</row>
|
||||
<row>
|
||||
<label value="msg://joinClause"/>
|
||||
<autoCompleteTextField id="joinClause" datasource="constraint" property="joinClause"
|
||||
width="500px" rows="3"/>
|
||||
</row>
|
||||
<row>
|
||||
<label value="msg://whereClause"/>
|
||||
<autoCompleteTextField id="whereClause" datasource="constraint" property="whereClause"
|
||||
width="500px" rows="3"/>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<iframe id="windowActions" src="/com/haulmont/cuba/gui/edit-window.actions.xml"/>
|
||||
</layout>
|
||||
</window>
|
@ -14,7 +14,7 @@
|
||||
<datasource id="group" class="com.haulmont.cuba.security.entity.Group" view="group.browse"/>
|
||||
</dsContext>
|
||||
|
||||
<layout expand="windowActions">
|
||||
<layout expand="windowActions" spacing="true">
|
||||
<fieldGroup id="fieldGroup" datasource="group">
|
||||
<field id="name" required="true" requiredMessage="msg://nameMsg" width="300px"/>
|
||||
</fieldGroup>
|
||||
|
@ -15,7 +15,7 @@
|
||||
<datasource id="attribute" class="com.haulmont.cuba.security.entity.SessionAttribute" view="edit"/>
|
||||
</dsContext>
|
||||
|
||||
<layout expand="windowActions">
|
||||
<layout expand="windowActions" spacing="true">
|
||||
<fieldGroup id="fields" width="100%" datasource="attribute">
|
||||
<column width="250px">
|
||||
<field id="name" required="true" requiredMessage="msg://nameMsg"/>
|
||||
@ -25,5 +25,4 @@
|
||||
</fieldGroup>
|
||||
<iframe id="windowActions" src="/com/haulmont/cuba/gui/edit-window.actions.xml"/>
|
||||
</layout>
|
||||
|
||||
</window>
|
@ -28,33 +28,33 @@
|
||||
</collectionDatasource>
|
||||
</dsContext>
|
||||
|
||||
<layout expand="windowActions">
|
||||
<grid spacing="true">
|
||||
<columns>
|
||||
<column flex="1"/>
|
||||
<column flex="1"/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="msg://user"/>
|
||||
<textField id="user" datasource="subst" property="user"
|
||||
required="true" editable="false" requiredMessage="msg://userMsg" width="250"/>
|
||||
</row>
|
||||
<row>
|
||||
<label value="msg://substUser"/>
|
||||
<lookupField id="substUser" datasource="subst" property="substitutedUser"
|
||||
required="true" optionsDatasource="users" requiredMessage="msg://substUserMsg" width="250"/>
|
||||
</row>
|
||||
<row id="startDateRow">
|
||||
<label value="msg://startDate"/>
|
||||
<dateField id="startDate" datasource="subst" property="startDate" resolution="DAY"/>
|
||||
</row>
|
||||
<row id="endDateRow">
|
||||
<label value="msg://endDate"/>
|
||||
<dateField id="endDate" datasource="subst" property="endDate" resolution="DAY"/>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<layout expand="windowActions" spacing="true">
|
||||
<grid spacing="true">
|
||||
<columns>
|
||||
<column flex="1"/>
|
||||
<column flex="1"/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<label value="msg://user"/>
|
||||
<textField id="user" datasource="subst" property="user"
|
||||
required="true" editable="false" requiredMessage="msg://userMsg" width="250"/>
|
||||
</row>
|
||||
<row>
|
||||
<label value="msg://substUser"/>
|
||||
<lookupField id="substUser" datasource="subst" property="substitutedUser"
|
||||
required="true" optionsDatasource="users" requiredMessage="msg://substUserMsg" width="250"/>
|
||||
</row>
|
||||
<row id="startDateRow">
|
||||
<label value="msg://startDate"/>
|
||||
<dateField id="startDate" datasource="subst" property="startDate" resolution="DAY"/>
|
||||
</row>
|
||||
<row id="endDateRow">
|
||||
<label value="msg://endDate"/>
|
||||
<dateField id="endDate" datasource="subst" property="endDate" resolution="DAY"/>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<iframe id="windowActions" src="/com/haulmont/cuba/gui/edit-window.actions.xml"/>
|
||||
</layout>
|
||||
</window>
|
@ -16,7 +16,7 @@
|
||||
>
|
||||
</datasource>
|
||||
</dsContext>
|
||||
<layout>
|
||||
<layout spacing="true">
|
||||
<vbox id="attributeProperties" spacing="true" width="100%">
|
||||
</vbox>
|
||||
<iframe id="buttons" src="/com/haulmont/cuba/gui/edit-window.actions.xml"/>
|
||||
|
Loading…
Reference in New Issue
Block a user