gd-sprest-bs 10.5.5 → 10.5.7

package/build/webparts/base/wpSpfx.js

@@ -21,9 +21,9 @@ var _SPFxWebPart = /** @class */ (function () {
     /** The configuration modal. */
     // Constructor
     function _SPFxWebPart(props) {
-        var _this = this;
-        this._cfg = null;
         this._props = null;
+        /** The webpart configuration */
+        this._cfg = null;
         /** The configuration form. */
         this._form = null;
         /** The configuration modal. */
@@ -46,37 +46,6 @@ var _SPFxWebPart = /** @class */ (function () {
             }
             catch (_a) { }
         }
-        // Set the webpart properties pane to trigger the modal from displaying
-        var propertyPageConfig = this._props.spfx.getPropertyPaneConfiguration;
-        this._props.spfx.getPropertyPaneConfiguration = function () {
-            // Get the original configuration
-            var config = propertyPageConfig ? propertyPageConfig() : null;
-            // Update the configuration w/ a button
-            config = config || {};
-            config.pages = config.pages || [];
-            config.pages.push({
-                header: {
-                    description: "Configuration"
-                },
-                groups: [
-                    {
-                        groupFields: [{
-                                targetProperty: "configuration",
-                                type: gd_sprest_1.SPTypes.PropertyPaneType.Button,
-                                properties: {
-                                    text: "Configuration",
-                                    onClick: function () {
-                                        // Show the modal
-                                        _this.showEditModal();
-                                    }
-                                }
-                            }]
-                    }
-                ]
-            });
-            // Call the configuration
-            return config;
-        };
         // See if this is the workbench
         if (window.location.pathname.indexOf("workbench.aspx") > 0) {
             // Render the configuration button
@@ -105,6 +74,12 @@ var _SPFxWebPart = /** @class */ (function () {
             }
         }
     }
+    Object.defineProperty(_SPFxWebPart.prototype, "Configuration", {
+        get: function () { return this._cfg; },
+        enumerable: false,
+        configurable: true
+    });
+    ;
     Object.defineProperty(_SPFxWebPart.prototype, "Form", {
         get: function () { return this._form; },
         enumerable: false,
@@ -149,6 +124,37 @@ var _SPFxWebPart = /** @class */ (function () {
             // Do nothing
             return;
         }
+        // Set the webpart properties pane to trigger the modal from displaying
+        var propertyPageConfig = this._props.spfx.getPropertyPaneConfiguration;
+        this._props.spfx.getPropertyPaneConfiguration = function () {
+            // Get the original configuration
+            var config = propertyPageConfig ? propertyPageConfig() : null;
+            // Update the configuration w/ a button
+            config = config || {};
+            config.pages = config.pages || [];
+            config.pages.push({
+                header: {
+                    description: "Configuration"
+                },
+                groups: [
+                    {
+                        groupFields: [{
+                                targetProperty: "configuration",
+                                type: gd_sprest_1.SPTypes.PropertyPaneType.Button,
+                                properties: {
+                                    text: "Configuration",
+                                    onClick: function () {
+                                        // Show the modal
+                                        _this.showEditModal();
+                                    }
+                                }
+                            }]
+                    }
+                ]
+            });
+            // Call the configuration
+            return config;
+        };
         // Render the edit button
         gd_bs_1.Components.Button({
             el: elWPConfig,
@@ -202,6 +208,8 @@ var _SPFxWebPart = /** @class */ (function () {
                                         _this._props.spfx.properties.configuration = wpCfg;
                                         // Call the saved event
                                         _this._props.onConfigSaved ? _this._props.onConfigSaved(cfg) : null;
+                                        // Close the modal
+                                        _this._modal.hide();
                                     }
                                 }
                             }

package/build/webparts/list/wpSpfx.js

@@ -18,7 +18,7 @@ var base_1 = require("../base");
 /**
  * SPFx List WebPart
  */
-var SPFxListWebPart = function (props) {
+var SPFxListWebPart = function (wpProps) {
     var _ddl = null;
     var _loadFl = false;
     // Load the lists
@@ -41,7 +41,8 @@ var SPFxListWebPart = function (props) {
                 lists.push({
                     data: list,
                     text: list.Title,
-                    value: list.Id
+                    value: list.Id,
+                    isSelected: wp.Configuration ? wp.Configuration.ListId == list.Id : false
                 });
             }
             // Set the dropdown
@@ -60,13 +61,15 @@ var SPFxListWebPart = function (props) {
                     name: "WebUrl",
                     label: "Web Url",
                     type: gd_bs_1.Components.FormControlTypes.TextField,
-                    description: "The relative url to the site containing the target list."
+                    description: "The relative url to the site containing the target list.",
+                    value: wp.Configuration ? wp.Configuration.WebUrl : null
                 },
                 {
-                    name: "ListId",
+                    name: "List",
                     label: "List",
                     type: gd_bs_1.Components.FormControlTypes.Dropdown,
                     required: true,
+                    value: wp.Configuration ? wp.Configuration.ListId : null,
                     onControlRendered: function (ctrl) {
                         // Set the dropdown
                         _ddl = ctrl.dropdown;
@@ -97,10 +100,22 @@ var SPFxListWebPart = function (props) {
                 // Load the lists
                 loadLists();
             }
+        },
+        // 
+        onConfigSaving: function (cfg) {
+            // Get the form values
+            var values = wp.Form.getValues();
+            // Set the configuration
+            var listItem = values["List"];
+            cfg.ListId = listItem ? listItem.value : null;
+            cfg.ListName = listItem ? listItem.text : null;
+            cfg.WebUrl = values["WebUrl"];
+            // Return the configuration
+            return cfg;
         }
     };
     // Return the webpart
-    var wp = (0, base_1.SPFxWebPart)(__assign(__assign({}, props), baseProps));
+    var wp = (0, base_1.SPFxWebPart)(__assign(__assign({}, wpProps), baseProps));
     return wp;
 };
 exports.SPFxListWebPart = SPFxListWebPart;