Skip to content

Commit

Permalink
Merge branch 'development' into MvM-InputWidgets
Browse files Browse the repository at this point in the history
  • Loading branch information
@MarkvanMents
MarkvanMents committed Sep 13, 2019
2 parents ef9eb9c + 1c79ef9 commit ba7eb43
Show file tree
Hide file tree
Showing 57 changed files with 1,229 additions and 337 deletions.
2 changes: 1 addition & 1 deletion content/addons/apm-addon/ig-two.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ To upgrade an APM 2 agent follow these steps
Please read the following steps and apply if needed.

1. In Cloud v3, allow the request handler `/apm`.
2. The agent initiates all communication to the [APM 2 manager](https://apmmanager100.mendixcloud.com) in HTTPS over port 80. So for some on premise installation a firewall might need to be opened.
2. The agent initiates all communication to the [APM 2 manager](https://apmmanager100.mendixcloud.com) in HTTPS over port 443. So for some on premise installation a firewall might need to be opened.
5 changes: 4 additions & 1 deletion content/apidocs-mxsdk/apidocs/pluggable-widgets.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,4 +261,7 @@ Here is how a caption and description look in Studio Pro:

## 8 Read More

* [Build a Text Box Pluggable Widget: Part 1](/howto/extensibility/create-a-pluggable-widget-one)
* [Client APIs Available to Pluggable Widgets](client-apis-for-pluggable-widgets)
* [Pluggable Widget Property Types](property-types-pluggable-widgets)
* [How to Build Pluggable Widgets](/howto/extensibility/pluggable-widgets)

39 changes: 20 additions & 19 deletions content/apidocs-mxsdk/apidocs/property-types-pluggable-widgets.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ String is represented as a simple text input in Studio Pro. It is passed as a `s
| -------------- | -------- | -------------- | ------------------------------------------------------------ |
| `type` | Yes | String | Must be `string` |
| `key` | Yes | String | See [key](#key) |
| `defaultValue` | No | String | Default value for the property. |
| `multiline` | No | Boolean | `true` to enable multiline input in the Studio, `false` otherwise. |
| `required` | No | Boolean | Whether the property must be specified by the user. `true` by default |
| `defaultValue` | No | String | Default value for the property |
| `multiline` | No | Boolean | `true` to enable multiline input in the Studio, `false` otherwise |
| `required` | No | Boolean | Whether the property must be specified by the user, `true` by default |


#### 2.1.2 Studio Pro UI
Expand Down Expand Up @@ -107,7 +107,7 @@ Boolean is represented as a toggle in Studio Pro. It is passed as `boolean` prop
| -------------- | -------- | -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `type` | Yes | String | Must be `boolean` |
| `key` | Yes | String | See [key](#key) |
| `defaultValue` | Yes | Boolean | Default value for the property. `true` or `false` |
| `defaultValue` | Yes | Boolean | Default value for the property, `true` or `false` |

#### 2.2.2 Studio Pro UI

Expand All @@ -134,7 +134,7 @@ Integer is represented as a number input in Studio Pro. It is passed as a `numbe
| -------------- | -------- | -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `type` | Yes | String | Must be `integer` |
| `key` | Yes | String | See [key](#key) |
| `defaultValue` | Yes | Integer | Default value for the property. |
| `defaultValue` | Yes | Integer | Default value for the property |

#### 2.3.2 Studio Pro UI

Expand All @@ -161,7 +161,7 @@ Enumeration allows a user to select one out of multiple options defined in the X
| -------------- | -------- | -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `type` | Yes | String | Must be `enumeration` |
| `key` | Yes | String | See [key](#key) |
| `defaultValue` | Yes | Integer | Default value for the property. |
| `defaultValue` | Yes | Integer | Default value for the property |

#### 2.4.2 XML Elements

Expand Down Expand Up @@ -208,8 +208,8 @@ This property type was introduced in Mendix 8.1.
| Attribute | Required | Attribute Type | Description |
| ---------- | -------- | -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `type` | Yes | String | Must be `icon` |
| `key` | Yes | String |See [key](#key) |
| `required` | No | Boolean | Whether the property must be specified by the user. `true` by default |
| `key` | Yes | String | See [key](#key) |
| `required` | No | Boolean | Whether the property must be specified by the user, `true` by default |
#### 3.1.2 Studio Pro UI

When the component is defined as follows:
Expand Down Expand Up @@ -239,7 +239,7 @@ This property type was introduced in Mendix 8.1.
| ---------- | -------- | -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `type` | Yes | String | Must be `image` |
| `key` | Yes | String | See [key](#key) |
| `required` | No | Boolean | Whether the property must be specified by the user. `true` by default |
| `required` | No | Boolean | Whether the property must be specified by the user, `true` by default |
#### 3.2.2 Studio Pro UI

When the component is defined as follows:
Expand Down Expand Up @@ -267,8 +267,8 @@ Expression allows a user to configure an [expression](/refguide/expressions), th
| -------------- | -------- | ------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `type` | Yes | String | Must be `expression` |
| `key` | Yes | String | See [key](#key) |
| `defaultValue` | No | String (Expression) | Default value for the property. |
| `required` | No | Boolean | Whether the property must be specified by the user. `true` by default |
| `defaultValue` | No | String (Expression) | Default value for the property |
| `required` | No | Boolean | Whether the property must be specified by the user, `true` by default |

#### 4.1.2 XML Elements

Expand Down Expand Up @@ -309,7 +309,7 @@ Then the Studio Pro UI for the property appears like this:
| `type` | Yes | String | Must be `textTemplate` |
| `key` | Yes | String | See [key](#key) |
| `multiline` | No | Boolean | `true` to enable multiline input in the Studio, `false` otherwise. |
| `required` | No | Boolean | Whether the property must be specified by the user. `true` by default |
| `required` | No | Boolean | Whether the property must be specified by the user, `true` by default |


#### 4.4.2 XML Elements
Expand Down Expand Up @@ -346,7 +346,7 @@ The action property allows a user to configure an action to do things like calli
| ---------- | -------- | -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `type` | Yes | String | Must be `action` |
| `key` | Yes | String | See [key](#key) |
| `required` | No | Boolean | Whether the property must be specified by the user. `true` by default |
| `required` | No | Boolean | Whether the property must be specified by the user, `true` by default |
#### 4.5.2 Studio Pro UI

When the property is defined as follows:
Expand All @@ -372,8 +372,8 @@ The attribute property allows a widget to work directly with entities' attribute
| ---------- | -------- | -------------- | ------------------------------------------------------------ |
| `type` | Yes | String | Must be `attribute` |
| `key` | Yes | String | See [key](#key) |
| `onChange` | No | Property Path | This path to an Action property that will be executed by Mendix platform when value is changed by the widget. |
| `required` | No | Boolean | This decides if the property must be specified by the user (`true` by default). |
| `onChange` | No | Property Path | The path to an Action property that will be executed by Mendix platform when value is changed by the widget |
| `required` | No | Boolean | This decides if the property must be specified by the user, `true` by default |

#### 4.6.2 XML Elements

Expand Down Expand Up @@ -425,10 +425,11 @@ The object property allows to create an arbitrary list of properties.
#### 4.7.1 XML Attributes

| Attribute | Required | Attribute Type | Description |
| --------- | -------- | -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `type` | Yes | String | Must be `object` |
| `key` | Yes | String | See [key](#key) |
| `isList` | Yes | Boolean | Must be `true` |
| ---------- | -------- | -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| `type` | Yes | String | Must be `object` |
| `key` | Yes | String | See [key](#key) |
| `isList` | Yes | Boolean | Must be `true` |
| `required` | No | Boolean | This decides if the is user is required to specified items in the list, `true` by default |

#### 4.7.2 XML Elements

Expand Down
Loading

0 comments on commit ba7eb43

Please sign in to comment.