Skip to content

Commit 721a8d9

Browse files
committed
Merge branch 'master' into delete-and-restore-form-with-list
2 parents 30ad4b2 + 02aedb0 commit 721a8d9

File tree

10 files changed

+29
-32
lines changed

10 files changed

+29
-32
lines changed

powerapps-docs/developer/component-framework/manifest-schema-reference/manifest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Model-driven apps and canvas apps (public preview)
2525

2626
|Element|Description|Occurrences|Available for|
2727
|--|--|--|-------|
28-
|[control](control.md)|[!INCLUDE [control-description](includes/control-description.md)]|1 or more|Model-driven apps and canvas apps (public preview) |
28+
|[control](control.md)|[!INCLUDE [control-description](includes/control-description.md)]|1|Model-driven apps and canvas apps (public preview) |
2929
|[type-group](type-group.md)|[!INCLUDE [type-group-description](includes/type-group-description.md)]|0 or more|Model-driven apps and canvas apps (public preview) |
3030
|[property](property.md)|[!INCLUDE [property-description](includes/property-description.md)]|0 or more|Model-driven apps and canvas apps (public preview) |
3131
|[data-set](data-set.md)|[!INCLUDE [data-set-description](includes/data-set-description.md)]|0 or more|Model-driven apps|
Loading
Loading
Loading
Loading
Loading
Loading
Loading

powerapps-docs/maker/canvas-apps/working-with-cards.md

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: powerapps
77
ms.topic: conceptual
88
ms.custom: canvas
99
ms.reviewer: tapanm
10-
ms.date: 04/26/2016
10+
ms.date: 11/13/2020
1111
ms.author: gregli
1212
search.audienceType:
1313
- maker
@@ -20,59 +20,58 @@ search.app:
2020

2121
You can interact with cards most easily in the right-hand pane after you select a form control in the design workspace. In that pane, you can choose which fields to show, how to show each field, and in what order to show them. This example shows an **Edit form** control in an app built from a SharePoint list that's named **Assets**.
2222

23-
![First screen](./media/working-with-cards/first-screen.png)
23+
![First screen](./media/working-with-cards/first-screen.png "First screen")
2424

25-
To get started with cards, see [add a form](add-form.md) and [understand data forms](working-with-forms.md). The remainder of this topic goes into more detail about how cards work and how you can customize or even create your own.
25+
To get started with cards, see [add a form](add-form.md) and [understand data forms](working-with-forms.md). The remainder of this article goes into more detail about how cards work and how you can customize or even create your own.
2626

2727
## Predefined cards
2828

2929
Power Apps offers a predefined set of cards for strings, numbers, and other data types. In the right-hand pane, you can see the variations available and change the card used for a field:
3030

31-
![](./media/working-with-cards/selected-card.png)
31+
![Selected card](./media/working-with-cards/selected-card.png "Selected card")
3232

3333
In this example, a single-line text card is selected, but the URL's text is longer than can be shown on a single line. Let's change this to a multi-line text card to give our users more room to edit:
3434

35-
![](./media/working-with-cards/multiline-edit.png)
35+
![Multiline edit](./media/working-with-cards/multiline-edit.png "Multiline edit")
3636

3737
Several fields of this data source aren't being shown, but you can show or hide a field by selecting its checkbox. This example illustrates how to show the **SecurityCode** field.
3838

39-
![](./media/working-with-cards/add-security-code.png)
40-
4139
## Customize a card
40+
4241
Cards comprise other controls. In an **Edit form** control, the user enters data in a standard **[Text input](controls/control-text-input.md)** control that you add from the **Insert** tab.
4342

4443
Let's walk through an example of how to change a card's appearance by manipulating controls in it.
4544

4645
1. First, let's return to the card that we inserted most recently, for the **SecurityCode** field. Select this card by clicking or tapping it once:
4746

48-
![](./media/working-with-cards/select-security-code.png)
47+
![Select security code](./media/working-with-cards/select-security-code.png "Select security code")
4948
2. Select the **[Text input](controls/control-text-input.md)** control inside the card by clicking or tapping the input control itself.
5049

51-
![](./media/working-with-cards/select-text-input.png)
50+
![Select text input](./media/working-with-cards/select-text-input.png "Select text input")
5251
3. Move this control within the card by dragging the selection box, and resize the control by dragging the handles along the edge of the selection box:
5352

54-
![](./media/working-with-cards/customize-text-input.png)
53+
![Customize text input](./media/working-with-cards/customize-text-input.png "Customize text input")
5554

5655
You can resize, move, and make other modifications to controls within a card, but you can't delete it without unlocking it first.
5756

5857
## Unlock a card
5958
In addition to containing controls, cards themselves are controls that have properties and formulas just like any other control. When you choose to display a field on a form, the right-hand pane automatically creates the card for you and generates the needed formulas. We can see these formulas in the **Advanced** tab of the right-hand pane:
6059

61-
![](./media/working-with-cards/advanced-locked.png)
60+
![Advanced locked](./media/working-with-cards/advanced-locked.png "Advanced locked")
6261

6362
We immediately see one of the most important properties of the card: the **[DataField](controls/control-card.md)** property. This property indicates which field of the data source the user sees and can edit in this card.
6463

6564
On the **Advanced** tab, the banner at the top indicates that the properties of this card are locked. A lock icon also appears next to the **[DataField](controls/control-card.md)**, **[DisplayName](controls/control-card.md)**, and **[Required](controls/control-card.md)** properties. The right-hand pane created these formulas, and the lock prevents accidental changes to these properties.
6665

67-
![](./media/working-with-cards/lock-icons.png)
66+
![Lock icons](./media/working-with-cards/lock-icons.png "Lock icons")
6867

6968
Click or tap the banner at the top to unlock the card so that you can modify these properties:
7069

71-
![](./media/working-with-cards/unlocked-card.png)
70+
![Unlocked card](./media/working-with-cards/unlocked-card.png "Unlocked card")
7271

7372
Let's modify the **[DisplayName](controls/control-card.md)** to put a space between **Asset** and **ID**. By making this change, we're altering what was generated for us. In the right-hand pane, this card has a different label:
7473

75-
![](./media/working-with-cards/change-display-name.png)
74+
![Change display name](./media/working-with-cards/change-display-name.png "Change display name")
7675

7776
We've now taken control over this card and can modify it further to fit our need. But we've lost the ability to change the card from one representation to another (for example, single-line text to multi-line text) as we did before. We've transformed the predefined card into a "custom card" that we now control.
7877

@@ -81,23 +80,23 @@ We've now taken control over this card and can modify it further to fit our need
8180
8281
You can change the appearance and behavior of an unlocked card in a variety of ways, such as adding and deleting controls within it. For example, you can add a star shape from the **Icons** menu on the **Insert** tab.
8382

84-
![](./media/working-with-cards/add-star.png)
83+
![Add star](./media/working-with-cards/add-star.png "Add star")
8584

8685
The star is now a part of the card and will travel with it if, for example, you reorder the cards within the form.
8786

8887
As another example, unlock the **ImageURL** card, and then add an **Image** control to it from the **Insert** tab:
8988

90-
![](./media/working-with-cards/add-image.png)
89+
![Add image](./media/working-with-cards/add-image.png "Add image")
9190

9291
In the formula bar, set the **Image** property of this control to *TextBox*.**Text**, where *TextBox* is the name of the **Text input** control that holds the URL:
9392

94-
![](./media/working-with-cards/show-image.png)
93+
![Show image](./media/working-with-cards/show-image.png "Show image")
9594

9695
And now we can see the images and edit their URLs. Note that we could have used **Parent.Default** as the **Image** property, but it wouldn't have updated if the user changed the URL.
9796

9897
We can do the same thing on the second screen of this app, where we use a **Display form** control to display the details of a record. In this case, we may want to hide the label (set the **Visible** property of the label, not the card, to **false**) because the user won't edit the URL on that screen:
9998

100-
![](./media/working-with-cards/show-image-display.png)
99+
![Show image display](./media/working-with-cards/show-image-display.png "Show image display")
101100

102101
## Interact with a form
103102
After you unlock a card, you can change how it interacts with the form that contains it.
@@ -128,11 +127,11 @@ If the **[DataField](controls/control-card.md)** property of a card is *blank*,
128127
## Dissecting an example
129128
Let's look at the controls that make up a basic data-entry card. The space between controls has been increased to show each more clearly:
130129

131-
![](./media/working-with-cards/dissect-card1.png)
130+
![Dissect card](./media/working-with-cards/dissect-card1.png "Dissect card")
132131

133132
In this graphic, the controls within the data card have been labeled:
134133

135-
![](./media/working-with-cards/dissect-card2.png)
134+
![Dissect cards](./media/working-with-cards/dissect-card2.png "Dissect cards")
136135

137136
Four controls make this card work:
138137

@@ -143,7 +142,7 @@ Four controls make this card work:
143142
| **InputText** |**Input text** control |Displays the initial value of the field and allows the user to change that value. |
144143
| **TextErrorMessage** |**[Label](controls/control-text-box.md)** control |Displays a user-friendly error message to the user if a problem occurs with validation. Also ensures that the field has a value if one is required. |
145144

146-
To populate these controls with data, their properties can be driven from the properties of the card, through these key formulas. Note that none of these formulas refers to a specific field. Instead, all information comes from the card.
145+
To populate these controls with data, their properties can be driven from the properties of the card, through these key formulas. Note that formulas refer to a specific field. Instead, all information comes from the card.
147146

148147
| Control property | Formula | Description |
149148
| --- | --- | --- |

powerapps-docs/maker/common-data-service/create-edit-entities-solution-explorer.md

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,27 @@ search.app:
2525

2626
[!INCLUDE[cc-data-platform-banner](../../includes/cc-data-platform-banner.md)]
2727

28-
You can easily create a table using the Power Apps portal for most common situations, but not all capabilities are implemented there. When you need to meet the requirements described in [Create and edit tables in Common Data Service](create-edit-entities.md), you can achieve them by creating or editing tables using the Solution Explorer.
28+
You can easily create a table using Power Apps ([make.powerapps.com](https://make.powerapps.com) for most common situations, but not all capabilities are implemented there. When you need to meet the requirements described in [Create and edit tables in Common Data Service](create-edit-entities.md), you can achieve them by creating or editing tables using the Solution Explorer.
2929

3030
## Open solution explorer
3131

32-
Part of the name of any table you create is the customization prefix. This is set based on the solution publisher for the solution you’re working in. If you care about the customization prefix, make sure that you are working in an unmanaged solution where the customization prefix is the one you want for this table. More information: [Change the solution publisher prefix](change-solution-publisher-prefix.md)
32+
The customization prefix is part of the name of any table you create. This is set based on the solution publisher for the solution you’re working in. If you care about the customization prefix, make sure that you are working in an unmanaged solution where the customization prefix is the one you want for this table. More information: [Change the solution publisher prefix](change-solution-publisher-prefix.md)
3333

3434
[!INCLUDE [cc_navigate-solution-from-powerapps-portal](../../includes/cc_navigate-solution-from-powerapps-portal.md)]
3535

3636
## View tables
3737

38-
In the solution explorer **Components** node, select the **Tables** node.
38+
In the solution explorer **Components** node, select the **Entities** node.
3939

4040
![View tables in solution explorer](media/view-entities-solution-explorer.png)
4141

4242
## Create a table
4343

44-
While [viewing tables](#view-tables), select **New** to open the new table form.
44+
While [viewing tables](#view-tables), select **New** to open the form to create tables.
4545

46-
![new table form in solution explorer](media/new-entity-form-solution-explorer.png)
46+
![new entity form in solution explorer](media/new-entity-form-solution-explorer.png)
4747

48-
The new table form has two tabs. The **General** tab is for table options. The **Primary Field** tab is for options about the special single line of text column that each table has that defines the text shown when there is a link to open the table in a lookup column.
48+
The form has two tabs. The **General** tab is for entity options. The **Primary Field** tab is for options about the special single line of text column that each table has that defines the text shown when there is a link to open the table in a lookup column.
4949

5050
For information about each section see the following:
5151
- [Configure the primary column](#configure-the-primary-column)
@@ -118,10 +118,8 @@ You can also make the following changes:
118118
As someone with the system administrator security role, you can delete custom tables that aren’t part of a managed solution.
119119

120120
> [!IMPORTANT]
121-
> When you delete a custom table, the database tables that store data for that table are deleted and all data they contain is lost. Any associated rows that have a parental relationship to the custom table are also deleted. For more information about parental relationships, see [Create and edit relationships between tables](create-edit-entity-relationships.md).
122-
123-
> [!NOTE]
124-
> The only way to recover data from a table that was deleted is to restore the database from a point before the table was deleted. More information: [Backup and restore instances](/dynamics365/customer-engagement/admin/backup-restore-instances)
121+
> - When you delete a custom table, the database tables that store data for that table are deleted and all data they contain is lost. Any associated rows that have a parental relationship to the custom table are also deleted. For more information about parental relationships, see [Create and edit relationships between tables](create-edit-entity-relationships.md).
122+
> - The only way to recover data from a table that was deleted is to restore the database from a point before the table was deleted. More information: [Backup and restore environments](/power-platform/admin/backup-restore-environments)
125123
126124
While [viewing tables](#view-tables), click the ![Delete command](media/delete.gif) command in the toolbar.
127125

0 commit comments

Comments
 (0)