tg-controls_cli 0.0.24 → 0.0.26

package/dist/myLib.common.js

@@ -24144,13 +24144,6 @@ module.exports = JSON.parse("{\"code\":\"pl\",\"messages\":{\"alpha\":\"Pole {_f
 
 /***/ }),
 
-/***/ "992b":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "9bf2":
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -24201,17 +24194,6 @@ exports.f = DESCRIPTORS ? V8_PROTOTYPE_DEFINE_BUG ? function defineProperty(O, P
 };
 
 
-/***/ }),
-
-/***/ "9f68":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_DateField_vue_vue_type_style_index_0_id_3cee556c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("992b");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_DateField_vue_vue_type_style_index_0_id_3cee556c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_DateField_vue_vue_type_style_index_0_id_3cee556c_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "a04b":
@@ -27247,6 +27229,13 @@ module.exports = __webpack_require__("cee4");
 
 /***/ }),
 
+/***/ "beb3":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "bed6":
 /***/ (function(module) {
 
@@ -28235,6 +28224,17 @@ exports.f = NASHORN_BUG ? function propertyIsEnumerable(V) {
 } : $propertyIsEnumerable;
 
 
+/***/ }),
+
+/***/ "d4c7":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_DateField_vue_vue_type_style_index_0_id_c2952100_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("beb3");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_DateField_vue_vue_type_style_index_0_id_c2952100_prod_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_7_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_7_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_7_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_1_0_node_modules_vue_loader_lib_index_js_vue_loader_options_DateField_vue_vue_type_style_index_0_id_c2952100_prod_lang_css___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "d4d7":
@@ -32031,16 +32031,15 @@ function getValidationRules(userValidationRules, lang) {
   return validationRules;
 }
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/NumericField.vue?vue&type=template&id=00135598&
-var NumericFieldvue_type_template_id_00135598_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/NumericField.vue?vue&type=template&id=b2d22e3c&
+var NumericFieldvue_type_template_id_b2d22e3c_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('Field', {
     staticClass: "w-100",
     attrs: {
-      "name": _vm.fieldInfo.name,
-      "rules": _vm.fieldInfo.validationRules,
-      "label": _vm.fieldInfo.label
+      "name": _vm.GetDisplayLabel(_vm.fieldInfo),
+      "rules": _vm.fieldInfo.validationRules
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -32089,9 +32088,9 @@ var NumericFieldvue_type_template_id_00135598_render = function render() {
     }])
   });
 };
-var NumericFieldvue_type_template_id_00135598_staticRenderFns = [];
+var NumericFieldvue_type_template_id_b2d22e3c_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/NumericField.vue?vue&type=template&id=00135598&
+// CONCATENATED MODULE: ./src/components/NumericField.vue?vue&type=template&id=b2d22e3c&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/NumericField.vue?vue&type=script&lang=js&
 
@@ -32115,6 +32114,15 @@ var NumericFieldvue_type_template_id_00135598_staticRenderFns = [];
     };
   },
   methods: {
+    GetDisplayLabel(field) {
+      var labelName = '';
+      if (field.hasOwnProperty('label') && field.label) {
+        labelName = field.label;
+      } else if (field.hasOwnProperty('display_name') && field.display_name) {
+        labelName = field.display_name;
+      }
+      return labelName;
+    },
     onlyForCurrency($event) {
       // console.log($event.keyCode); //keyCodes value
       let keyCode = $event.keyCode ? $event.keyCode : $event.which;
@@ -32255,8 +32263,8 @@ function normalizeComponent(
 
 var component = normalizeComponent(
   components_NumericFieldvue_type_script_lang_js_,
-  NumericFieldvue_type_template_id_00135598_render,
-  NumericFieldvue_type_template_id_00135598_staticRenderFns,
+  NumericFieldvue_type_template_id_b2d22e3c_render,
+  NumericFieldvue_type_template_id_b2d22e3c_staticRenderFns,
   false,
   null,
   null,
@@ -32265,16 +32273,15 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var NumericField = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/SelectField.vue?vue&type=template&id=469186fe&
-var SelectFieldvue_type_template_id_469186fe_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/SelectField.vue?vue&type=template&id=79b1b40e&
+var SelectFieldvue_type_template_id_79b1b40e_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('Field', {
     staticClass: "w-100",
     attrs: {
-      "name": _vm.fieldInfo.name,
-      "rules": _vm.fieldInfo.validationRules,
-      "label": _vm.fieldInfo.label
+      "name": _vm.GetDisplayLabel(_vm.fieldInfo),
+      "rules": _vm.fieldInfo.validationRules
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -32343,9 +32350,9 @@ var SelectFieldvue_type_template_id_469186fe_render = function render() {
     }])
   });
 };
-var SelectFieldvue_type_template_id_469186fe_staticRenderFns = [];
+var SelectFieldvue_type_template_id_79b1b40e_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/SelectField.vue?vue&type=template&id=469186fe&
+// CONCATENATED MODULE: ./src/components/SelectField.vue?vue&type=template&id=79b1b40e&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__("14d9");
@@ -32386,6 +32393,15 @@ var axios_default = /*#__PURE__*/__webpack_require__.n(axios);
     this.fieldInfo.validationRules = getValidationRules(this.fieldInfo.validationRules, this.lang);
   },
   methods: {
+    GetDisplayLabel(field) {
+      var labelName = '';
+      if (field.hasOwnProperty('label') && field.label) {
+        labelName = field.label;
+      } else if (field.hasOwnProperty('display_name') && field.display_name) {
+        labelName = field.display_name;
+      }
+      return labelName;
+    },
     onChange(e) {
       if (this.fieldInfo && this.fieldInfo.config && this.fieldInfo.config.onChange) {
         this.FillDependentDropDown(e.target.value);
@@ -32516,19 +32532,18 @@ var axios_default = /*#__PURE__*/__webpack_require__.n(axios);
                 optionList = res.data;
               }
               this.dependentOptions.push({
-                request: optionList
+                name: request,
+                options: optionList
               });
               if (this.dependentOptions.length > 0) {
                 this.dependentOptions.forEach(optionInfo => {
-                  for (var name in optionInfo) {
-                    this.$parent.schema.forEach(schema => {
-                      schema.Data.forEach(field => {
-                        if (name == field.name) {
-                          field.config.options = optionInfo[name];
-                        }
-                      });
+                  this.$parent.$parent.schema.forEach(schema => {
+                    schema.Data.forEach(field => {
+                      if (optionInfo.name == field.name) {
+                        field.config.options = optionInfo.options;
+                      }
                     });
-                  }
+                  });
                 });
               }
             }).catch(error => {
@@ -32552,8 +32567,8 @@ var axios_default = /*#__PURE__*/__webpack_require__.n(axios);
 
 var SelectField_component = normalizeComponent(
   components_SelectFieldvue_type_script_lang_js_,
-  SelectFieldvue_type_template_id_469186fe_render,
-  SelectFieldvue_type_template_id_469186fe_staticRenderFns,
+  SelectFieldvue_type_template_id_79b1b40e_render,
+  SelectFieldvue_type_template_id_79b1b40e_staticRenderFns,
   false,
   null,
   null,
@@ -32562,17 +32577,16 @@ var SelectField_component = normalizeComponent(
 )
 
 /* harmony default export */ var SelectField = (SelectField_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/TextField.vue?vue&type=template&id=5b8a7d90&
-var TextFieldvue_type_template_id_5b8a7d90_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/TextField.vue?vue&type=template&id=45e51558&
+var TextFieldvue_type_template_id_45e51558_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('Field', {
     staticClass: "w-100",
     attrs: {
       "disabled": _vm.fieldInfo.disabled,
-      "name": _vm.fieldInfo.name,
-      "rules": _vm.fieldInfo.validationRules,
-      "label": _vm.fieldInfo.label
+      "name": _vm.GetDisplayLabel(_vm.fieldInfo),
+      "rules": _vm.fieldInfo.validationRules
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -32636,9 +32650,9 @@ var TextFieldvue_type_template_id_5b8a7d90_render = function render() {
     }])
   });
 };
-var TextFieldvue_type_template_id_5b8a7d90_staticRenderFns = [];
+var TextFieldvue_type_template_id_45e51558_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/TextField.vue?vue&type=template&id=5b8a7d90&
+// CONCATENATED MODULE: ./src/components/TextField.vue?vue&type=template&id=45e51558&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/TextField.vue?vue&type=script&lang=js&
 
@@ -32663,6 +32677,15 @@ var TextFieldvue_type_template_id_5b8a7d90_staticRenderFns = [];
     this.fieldInfo.validationRules = getValidationRules(this.fieldInfo.validationRules, this.lang);
   },
   methods: {
+    GetDisplayLabel(field) {
+      var labelName = '';
+      if (field.hasOwnProperty('label') && field.label) {
+        labelName = field.label;
+      } else if (field.hasOwnProperty('display_name') && field.display_name) {
+        labelName = field.display_name;
+      }
+      return labelName;
+    },
     onChange: function (e) {
       if (this.fieldInfo && this.fieldInfo.config && this.fieldInfo.config.onChange) {
         this.fieldInfo.config.onChange(e, this.fieldInfo);
@@ -32711,8 +32734,8 @@ var TextFieldvue_type_template_id_5b8a7d90_staticRenderFns = [];
 
 var TextField_component = normalizeComponent(
   components_TextFieldvue_type_script_lang_js_,
-  TextFieldvue_type_template_id_5b8a7d90_render,
-  TextFieldvue_type_template_id_5b8a7d90_staticRenderFns,
+  TextFieldvue_type_template_id_45e51558_render,
+  TextFieldvue_type_template_id_45e51558_staticRenderFns,
   false,
   null,
   null,
@@ -32721,17 +32744,16 @@ var TextField_component = normalizeComponent(
 )
 
 /* harmony default export */ var TextField = (TextField_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/DateField.vue?vue&type=template&id=3cee556c&
-var DateFieldvue_type_template_id_3cee556c_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/DateField.vue?vue&type=template&id=c2952100&
+var DateFieldvue_type_template_id_c2952100_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('Field', {
     staticClass: "w-100",
     attrs: {
       "disabled": _vm.fieldInfo.disabled,
-      "name": _vm.fieldInfo.name,
-      "rules": _vm.fieldInfo.validationRules,
-      "label": _vm.fieldInfo.label
+      "name": _vm.GetDisplayLabel(_vm.fieldInfo),
+      "rules": _vm.fieldInfo.validationRules
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -32813,9 +32835,9 @@ var DateFieldvue_type_template_id_3cee556c_render = function render() {
     }])
   });
 };
-var DateFieldvue_type_template_id_3cee556c_staticRenderFns = [];
+var DateFieldvue_type_template_id_c2952100_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/DateField.vue?vue&type=template&id=3cee556c&
+// CONCATENATED MODULE: ./src/components/DateField.vue?vue&type=template&id=c2952100&
 
 // EXTERNAL MODULE: ./node_modules/v-calendar/lib/components/date-picker.umd.js
 var date_picker_umd = __webpack_require__("404b");
@@ -32853,6 +32875,15 @@ var date_picker_umd_default = /*#__PURE__*/__webpack_require__.n(date_picker_umd
     };
   },
   methods: {
+    GetDisplayLabel(field) {
+      var labelName = '';
+      if (field.hasOwnProperty('label') && field.label) {
+        labelName = field.label;
+      } else if (field.hasOwnProperty('display_name') && field.display_name) {
+        labelName = field.display_name;
+      }
+      return labelName;
+    },
     getMinmumDate(field) {
       if (field.config && this.fieldInfo.config.minDate) {
         return field.config.minDate;
@@ -32894,8 +32925,8 @@ var date_picker_umd_default = /*#__PURE__*/__webpack_require__.n(date_picker_umd
 });
 // CONCATENATED MODULE: ./src/components/DateField.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_DateFieldvue_type_script_lang_js_ = (DateFieldvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./src/components/DateField.vue?vue&type=style&index=0&id=3cee556c&prod&lang=css&
-var DateFieldvue_type_style_index_0_id_3cee556c_prod_lang_css_ = __webpack_require__("9f68");
+// EXTERNAL MODULE: ./src/components/DateField.vue?vue&type=style&index=0&id=c2952100&prod&lang=css&
+var DateFieldvue_type_style_index_0_id_c2952100_prod_lang_css_ = __webpack_require__("d4c7");
 
 // CONCATENATED MODULE: ./src/components/DateField.vue
 
@@ -32908,8 +32939,8 @@ var DateFieldvue_type_style_index_0_id_3cee556c_prod_lang_css_ = __webpack_requi
 
 var DateField_component = normalizeComponent(
   components_DateFieldvue_type_script_lang_js_,
-  DateFieldvue_type_template_id_3cee556c_render,
-  DateFieldvue_type_template_id_3cee556c_staticRenderFns,
+  DateFieldvue_type_template_id_c2952100_render,
+  DateFieldvue_type_template_id_c2952100_staticRenderFns,
   false,
   null,
   null,
@@ -32918,15 +32949,14 @@ var DateField_component = normalizeComponent(
 )
 
 /* harmony default export */ var DateField = (DateField_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/CheckBoxField.vue?vue&type=template&id=f35d57a0&
-var CheckBoxFieldvue_type_template_id_f35d57a0_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/CheckBoxField.vue?vue&type=template&id=2d9208f8&
+var CheckBoxFieldvue_type_template_id_2d9208f8_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('Field', {
     attrs: {
-      "name": _vm.fieldInfo.name,
-      "rules": _vm.fieldInfo.validationRules,
-      "label": _vm.fieldInfo.label
+      "name": _vm.GetDisplayLabel(_vm.fieldInfo),
+      "rules": _vm.fieldInfo.validationRules
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -32975,9 +33005,9 @@ var CheckBoxFieldvue_type_template_id_f35d57a0_render = function render() {
     }])
   });
 };
-var CheckBoxFieldvue_type_template_id_f35d57a0_staticRenderFns = [];
+var CheckBoxFieldvue_type_template_id_2d9208f8_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/CheckBoxField.vue?vue&type=template&id=f35d57a0&
+// CONCATENATED MODULE: ./src/components/CheckBoxField.vue?vue&type=template&id=2d9208f8&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/CheckBoxField.vue?vue&type=script&lang=js&
 
@@ -32996,13 +33026,16 @@ var CheckBoxFieldvue_type_template_id_f35d57a0_staticRenderFns = [];
       required: true
     }
   },
-  data: function () {
-    return {
-      checkOptions: []
-    };
-  },
-  created: function () {},
   methods: {
+    GetDisplayLabel(field) {
+      var labelName = '';
+      if (field.hasOwnProperty('label') && field.label) {
+        labelName = field.label;
+      } else if (field.hasOwnProperty('display_name') && field.display_name) {
+        labelName = field.display_name;
+      }
+      return labelName;
+    },
     renderOptions: function (field) {
       if (field.config && this.fieldInfo.config.options) {
         var arrayConstructor = [].constructor;
@@ -33064,8 +33097,8 @@ var CheckBoxFieldvue_type_template_id_f35d57a0_staticRenderFns = [];
 
 var CheckBoxField_component = normalizeComponent(
   components_CheckBoxFieldvue_type_script_lang_js_,
-  CheckBoxFieldvue_type_template_id_f35d57a0_render,
-  CheckBoxFieldvue_type_template_id_f35d57a0_staticRenderFns,
+  CheckBoxFieldvue_type_template_id_2d9208f8_render,
+  CheckBoxFieldvue_type_template_id_2d9208f8_staticRenderFns,
   false,
   null,
   null,
@@ -33074,15 +33107,14 @@ var CheckBoxField_component = normalizeComponent(
 )
 
 /* harmony default export */ var CheckBoxField = (CheckBoxField_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/RadioField.vue?vue&type=template&id=6965ec07&
-var RadioFieldvue_type_template_id_6965ec07_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/RadioField.vue?vue&type=template&id=e9385970&
+var RadioFieldvue_type_template_id_e9385970_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('Field', {
     attrs: {
-      "name": _vm.fieldInfo.name,
+      "name": _vm.GetDisplayLabel(_vm.fieldInfo),
       "rules": _vm.fieldInfo.validationRules,
-      "label": _vm.fieldInfo.label,
       "slim": ""
     },
     scopedSlots: _vm._u([{
@@ -33138,9 +33170,9 @@ var RadioFieldvue_type_template_id_6965ec07_render = function render() {
     }])
   });
 };
-var RadioFieldvue_type_template_id_6965ec07_staticRenderFns = [];
+var RadioFieldvue_type_template_id_e9385970_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/RadioField.vue?vue&type=template&id=6965ec07&
+// CONCATENATED MODULE: ./src/components/RadioField.vue?vue&type=template&id=e9385970&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/RadioField.vue?vue&type=script&lang=js&
 
@@ -33158,12 +33190,16 @@ var RadioFieldvue_type_template_id_6965ec07_staticRenderFns = [];
       required: true
     }
   },
-  data: function () {
-    return {
-      checkOptions: []
-    };
-  },
   methods: {
+    GetDisplayLabel(field) {
+      var labelName = '';
+      if (field.hasOwnProperty('label') && field.label) {
+        labelName = field.label;
+      } else if (field.hasOwnProperty('display_name') && field.display_name) {
+        labelName = field.display_name;
+      }
+      return labelName;
+    },
     renderOptions: function (field) {
       if (field.config && this.fieldInfo.config.options) {
         var arrayConstructor = [].constructor;
@@ -33174,12 +33210,6 @@ var RadioFieldvue_type_template_id_6965ec07_staticRenderFns = [];
         }
       }
     },
-    AssignToggleValues: function (event, item, array) {
-      this.$emit('AssignToggleValues', event, item, array);
-    },
-    showDependentItem: function (item, value) {
-      this.$emit('showDependentItem', item, value);
-    },
     onChange(e) {
       if (this.fieldInfo && this.fieldInfo.config && this.fieldInfo.config.onChange) {
         this.fieldInfo.config.onChange(e, this.fieldInfo);
@@ -33202,8 +33232,8 @@ var RadioFieldvue_type_template_id_6965ec07_staticRenderFns = [];
 
 var RadioField_component = normalizeComponent(
   components_RadioFieldvue_type_script_lang_js_,
-  RadioFieldvue_type_template_id_6965ec07_render,
-  RadioFieldvue_type_template_id_6965ec07_staticRenderFns,
+  RadioFieldvue_type_template_id_e9385970_render,
+  RadioFieldvue_type_template_id_e9385970_staticRenderFns,
   false,
   null,
   null,
@@ -33212,16 +33242,15 @@ var RadioField_component = normalizeComponent(
 )
 
 /* harmony default export */ var RadioField = (RadioField_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/MultiSelectField.vue?vue&type=template&id=151660ca&
-var MultiSelectFieldvue_type_template_id_151660ca_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/MultiSelectField.vue?vue&type=template&id=04de9fb2&
+var MultiSelectFieldvue_type_template_id_04de9fb2_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('Field', {
     staticClass: "w-100",
     attrs: {
-      "name": _vm.fieldInfo.name,
-      "rules": _vm.fieldInfo.validationRules,
-      "label": _vm.fieldInfo.label
+      "name": _vm.GetDisplayLabel(_vm.fieldInfo),
+      "rules": _vm.fieldInfo.validationRules
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -33277,9 +33306,9 @@ var MultiSelectFieldvue_type_template_id_151660ca_render = function render() {
     }])
   });
 };
-var MultiSelectFieldvue_type_template_id_151660ca_staticRenderFns = [];
+var MultiSelectFieldvue_type_template_id_04de9fb2_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/MultiSelectField.vue?vue&type=template&id=151660ca&
+// CONCATENATED MODULE: ./src/components/MultiSelectField.vue?vue&type=template&id=04de9fb2&
 
 // EXTERNAL MODULE: ./node_modules/vue-multiselect/dist/vue-multiselect.min.js
 var vue_multiselect_min = __webpack_require__("8e5f");
@@ -33365,6 +33394,15 @@ var vue_multiselect_min_default = /*#__PURE__*/__webpack_require__.n(vue_multise
     }
   },
   methods: {
+    GetDisplayLabel(field) {
+      var labelName = '';
+      if (field.hasOwnProperty('label') && field.label) {
+        labelName = field.label;
+      } else if (field.hasOwnProperty('display_name') && field.display_name) {
+        labelName = field.display_name;
+      }
+      return labelName;
+    },
     onSearch: function (e, x) {
       if (this.fieldInfo && this.fieldInfo.config && this.fieldInfo.config.onSearchChange) {
         this.fieldInfo.config.onSearchChange(x, this.fieldInfo);
@@ -33420,8 +33458,8 @@ var vue_multiselect_minvue_type_style_index_0_prod_lang_css_ = __webpack_require
 
 var MultiSelectField_component = normalizeComponent(
   components_MultiSelectFieldvue_type_script_lang_js_,
-  MultiSelectFieldvue_type_template_id_151660ca_render,
-  MultiSelectFieldvue_type_template_id_151660ca_staticRenderFns,
+  MultiSelectFieldvue_type_template_id_04de9fb2_render,
+  MultiSelectFieldvue_type_template_id_04de9fb2_staticRenderFns,
   false,
   null,
   null,
@@ -33430,16 +33468,15 @@ var MultiSelectField_component = normalizeComponent(
 )
 
 /* harmony default export */ var MultiSelectField = (MultiSelectField_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/ToggleField.vue?vue&type=template&id=7702351e&
-var ToggleFieldvue_type_template_id_7702351e_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/ToggleField.vue?vue&type=template&id=5932229d&
+var ToggleFieldvue_type_template_id_5932229d_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('Field', {
     attrs: {
       "disabled": _vm.fieldInfo.disabled,
-      "name": _vm.fieldInfo.name,
-      "rules": _vm.fieldInfo.validationRules,
-      "label": _vm.fieldInfo.label
+      "name": _vm.GetDisplayLabel(_vm.fieldInfo),
+      "rules": _vm.fieldInfo.validationRules
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -33473,9 +33510,9 @@ var ToggleFieldvue_type_template_id_7702351e_render = function render() {
     }])
   });
 };
-var ToggleFieldvue_type_template_id_7702351e_staticRenderFns = [];
+var ToggleFieldvue_type_template_id_5932229d_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/ToggleField.vue?vue&type=template&id=7702351e&
+// CONCATENATED MODULE: ./src/components/ToggleField.vue?vue&type=template&id=5932229d&
 
 // CONCATENATED MODULE: ./node_modules/@vueform/toggle/dist/toggle.vue2.js
 function toggle_vue2_a(e,l,a,t,n,d,u,i,o,r){"boolean"!=typeof u&&(o=i,i=u,u=!1);const c="function"==typeof a?a.options:a;let s;if(e&&e.render&&(c.render=e.render,c.staticRenderFns=e.staticRenderFns,c._compiled=!0,n&&(c.functional=!0)),t&&(c._scopeId=t),d?(s=function(e){(e=e||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(e=__VUE_SSR_CONTEXT__),l&&l.call(this,o(e)),e&&e._registeredComponents&&e._registeredComponents.add(d)},c._ssrRegister=s):l&&(s=u?function(e){l.call(this,r(e,this.$root.$options.shadowRoot))}:function(e){l.call(this,i(e))}),s)if(c.functional){const e=c.render;c.render=function(l,a){return s.call(a),e(l,a)}}else{const e=c.beforeCreate;c.beforeCreate=e?[].concat(e,s):[s]}return a}const toggle_vue2_t={name:"Toggle",emits:["input","update:modelValue","change"],props:{...{value:{validator:function(e){return e=>-1!==["number","string","boolean"].indexOf(typeof e)||null==e},required:!1},modelValue:{validator:function(e){return e=>-1!==["number","string","boolean"].indexOf(typeof e)||null==e},required:!1}},id:{type:[String,Number],required:!1,default:"toggle"},name:{type:[String,Number],required:!1,default:"toggle"},disabled:{type:Boolean,required:!1,default:!1},required:{type:Boolean,required:!1,default:!1},falseValue:{type:[String,Number,Boolean],required:!1,default:!1},trueValue:{type:[String,Number,Boolean],required:!1,default:!0},onLabel:{type:[String,Object],required:!1,default:""},offLabel:{type:[String,Object],required:!1,default:""},classes:{type:Object,required:!1,default:()=>({})},labelledby:{type:String,required:!1},describedby:{type:String,required:!1},aria:{required:!1,type:Object,default:()=>({})}},setup(a,t){const n=function(a,t,n){const{value:d,modelValue:u,falseValue:i,trueValue:o,disabled:r}=Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toRefs"])(a),c=u&&void 0!==u.value?u:d,s=Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])((()=>c.value===o.value)),f=e=>{t.emit("input",e),t.emit("update:modelValue",e),t.emit("change",e)},g=()=>{f(o.value)},v=()=>{f(i.value)};return-1!==[null,void 0,!1,0,"0","off"].indexOf(c.value)&&-1===[i.value,o.value].indexOf(c.value)&&v(),-1!==[!0,1,"1","on"].indexOf(c.value)&&-1===[i.value,o.value].indexOf(c.value)&&g(),{externalValue:c,checked:s,update:f,check:g,uncheck:v,handleInput:e=>{f(e.target.checked?o.value:i.value)},handleClick:()=>{r.value||(s.value?v():g())}}}(a,t),d=function(a,t,n){const{trueValue:d,falseValue:u,onLabel:i,offLabel:o}=Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toRefs"])(a),r=n.checked,c=n.update;return{label:Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])((()=>{let e=r.value?i.value:o.value;return e||(e=" "),e})),toggle:()=>{c(r.value?u.value:d.value)},on:()=>{c(d.value)},off:()=>{c(u.value)}}}(a,0,{checked:n.checked,update:n.update}),u=function(a,t,n){const d=Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toRefs"])(a),u=d.disabled,i=n.checked,o=Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])((()=>({container:"toggle-container",toggle:"toggle",toggleOn:"toggle-on",toggleOff:"toggle-off",toggleOnDisabled:"toggle-on-disabled",toggleOffDisabled:"toggle-off-disabled",handle:"toggle-handle",handleOn:"toggle-handle-on",handleOff:"toggle-handle-off",handleOnDisabled:"toggle-handle-on-disabled",handleOffDisabled:"toggle-handle-off-disabled",label:"toggle-label",...d.classes.value})));return{classList:Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])((()=>({container:o.value.container,toggle:[o.value.toggle,u.value?i.value?o.value.toggleOnDisabled:o.value.toggleOffDisabled:i.value?o.value.toggleOn:o.value.toggleOff],handle:[o.value.handle,u.value?i.value?o.value.handleOnDisabled:o.value.handleOffDisabled:i.value?o.value.handleOn:o.value.handleOff],label:o.value.label})))}}(a,0,{checked:n.checked}),i=function(l,a,t){const{disabled:n}=Object(external_commonjs_vue_commonjs2_vue_root_Vue_["toRefs"])(l),d=t.check,u=t.uncheck,i=t.checked;return{handleSpace:()=>{n.value||(i.value?u():d())}}}(a,0,{check:n.check,uncheck:n.uncheck,checked:n.checked});return{...n,...u,...d,...i}}};var toggle_vue2_n=function(){var e=this,l=e.$createElement,a=e._self._c||l;return a("div",e._b({class:e.classList.container,attrs:{tabindex:e.disabled?void 0:0,"aria-checked":e.checked,"aria-describedby":e.describedby,"aria-labelledby":e.labelledby,role:"switch"},on:{keypress:function(l){return!l.type.indexOf("key")&&e._k(l.keyCode,"space",32,l.key,[" ","Spacebar"])?null:(l.preventDefault(),e.handleSpace.apply(null,arguments))}}},"div",e.aria,!1),[a("input",{directives:[{name:"show",rawName:"v-show",value:!1,expression:"false"}],attrs:{type:"checkbox",id:e.id,name:e.name,disabled:e.disabled},domProps:{value:e.trueValue,checked:e.checked}}),e._v(" "),a("div",{class:e.classList.toggle,on:{click:e.handleClick}},[a("span",{class:e.classList.handle}),e._v(" "),e._t("label",(function(){return[a("span",{class:e.classList.label,domProps:{innerHTML:e._s(e.label)}})]}),{checked:e.checked,classList:e.classList}),e._v(" "),e.required?a("input",{style:{appearance:"none",height:"1px",margin:"0",padding:"0",fontSize:"0",background:"transparent",position:"absolute",width:"100%",bottom:"0",outline:"none"},attrs:{type:"checkbox","aria-hidden":"true",tabindex:"-1",required:""},domProps:{checked:e.checked}}):e._e()],2)])};toggle_vue2_n._withStripped=!0;const toggle_vue2_d=toggle_vue2_a({render:toggle_vue2_n,staticRenderFns:[]},undefined,toggle_vue2_t,undefined,false,undefined,!1,void 0,void 0,void 0);
@@ -33500,6 +33537,17 @@ function toggle_vue2_a(e,l,a,t,n,d,u,i,o,r){"boolean"!=typeof u&&(o=i,i=u,u=!1);
   },
   mounted: function () {
     this.fieldInfo.validationRules = getValidationRules(this.fieldInfo.validationRules, defineRule, configure, this.lang);
+  },
+  methods: {
+    GetDisplayLabel(field) {
+      var labelName = '';
+      if (field.hasOwnProperty('label') && field.label) {
+        labelName = field.label;
+      } else if (field.hasOwnProperty('display_name') && field.display_name) {
+        labelName = field.display_name;
+      }
+      return labelName;
+    }
   }
 });
 // CONCATENATED MODULE: ./src/components/ToggleField.vue?vue&type=script&lang=js&
@@ -33518,8 +33566,8 @@ var defaultvue_type_style_index_0_prod_lang_css_ = __webpack_require__("8542");
 
 var ToggleField_component = normalizeComponent(
   components_ToggleFieldvue_type_script_lang_js_,
-  ToggleFieldvue_type_template_id_7702351e_render,
-  ToggleFieldvue_type_template_id_7702351e_staticRenderFns,
+  ToggleFieldvue_type_template_id_5932229d_render,
+  ToggleFieldvue_type_template_id_5932229d_staticRenderFns,
   false,
   null,
   null,
@@ -33528,17 +33576,16 @@ var ToggleField_component = normalizeComponent(
 )
 
 /* harmony default export */ var ToggleField = (ToggleField_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/PhoneField.vue?vue&type=template&id=76a306f0&
-var PhoneFieldvue_type_template_id_76a306f0_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/PhoneField.vue?vue&type=template&id=1d2925b4&
+var PhoneFieldvue_type_template_id_1d2925b4_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('Field', {
     staticClass: "w-100",
     attrs: {
-      "name": _vm.fieldInfo.name,
+      "name": _vm.GetDisplayLabel(_vm.fieldInfo),
       "disabled": _vm.fieldInfo.disabled,
-      "rules": _vm.fieldInfo.validationRules,
-      "label": _vm.fieldInfo.label
+      "rules": _vm.fieldInfo.validationRules
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -33571,9 +33618,9 @@ var PhoneFieldvue_type_template_id_76a306f0_render = function render() {
     }])
   });
 };
-var PhoneFieldvue_type_template_id_76a306f0_staticRenderFns = [];
+var PhoneFieldvue_type_template_id_1d2925b4_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/PhoneField.vue?vue&type=template&id=76a306f0&
+// CONCATENATED MODULE: ./src/components/PhoneField.vue?vue&type=template&id=1d2925b4&
 
 // EXTERNAL MODULE: ./node_modules/vue-tel-input/dist/vue-tel-input.umd.min.js
 var vue_tel_input_umd_min = __webpack_require__("e75b");
@@ -33610,6 +33657,15 @@ var vue_tel_input = __webpack_require__("bf68");
     };
   },
   methods: {
+    GetDisplayLabel(field) {
+      var labelName = '';
+      if (field.hasOwnProperty('label') && field.label) {
+        labelName = field.label;
+      } else if (field.hasOwnProperty('display_name') && field.display_name) {
+        labelName = field.display_name;
+      }
+      return labelName;
+    },
     onInput(phone, phoneObject, input) {
       if (phoneObject && (phoneObject === null || phoneObject === void 0 ? void 0 : phoneObject.valid) == false) {
         this.phoneError = true;
@@ -33635,8 +33691,8 @@ var vue_tel_input = __webpack_require__("bf68");
 
 var PhoneField_component = normalizeComponent(
   components_PhoneFieldvue_type_script_lang_js_,
-  PhoneFieldvue_type_template_id_76a306f0_render,
-  PhoneFieldvue_type_template_id_76a306f0_staticRenderFns,
+  PhoneFieldvue_type_template_id_1d2925b4_render,
+  PhoneFieldvue_type_template_id_1d2925b4_staticRenderFns,
   false,
   null,
   null,
@@ -33645,16 +33701,15 @@ var PhoneField_component = normalizeComponent(
 )
 
 /* harmony default export */ var PhoneField = (PhoneField_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/CustomSelectField.vue?vue&type=template&id=7f2d5810&
-var CustomSelectFieldvue_type_template_id_7f2d5810_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/CustomSelectField.vue?vue&type=template&id=4462bbfa&
+var CustomSelectFieldvue_type_template_id_4462bbfa_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('Field', {
     staticClass: "w-100",
     attrs: {
-      "name": _vm.fieldInfo.name,
-      "rules": _vm.fieldInfo.validationRules,
-      "label": _vm.fieldInfo.label
+      "name": _vm.GetDisplayLabel(_vm.fieldInfo),
+      "rules": _vm.fieldInfo.validationRules
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -33721,9 +33776,9 @@ var CustomSelectFieldvue_type_template_id_7f2d5810_render = function render() {
     }])
   });
 };
-var CustomSelectFieldvue_type_template_id_7f2d5810_staticRenderFns = [];
+var CustomSelectFieldvue_type_template_id_4462bbfa_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/CustomSelectField.vue?vue&type=template&id=7f2d5810&
+// CONCATENATED MODULE: ./src/components/CustomSelectField.vue?vue&type=template&id=4462bbfa&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/CustomSelectField.vue?vue&type=script&lang=js&
 
@@ -33804,6 +33859,15 @@ var CustomSelectFieldvue_type_template_id_7f2d5810_staticRenderFns = [];
     }
   },
   methods: {
+    GetDisplayLabel(field) {
+      var labelName = '';
+      if (field.hasOwnProperty('label') && field.label) {
+        labelName = field.label;
+      } else if (field.hasOwnProperty('display_name') && field.display_name) {
+        labelName = field.display_name;
+      }
+      return labelName;
+    },
     onSearch: function (e, x) {
       if (this.fieldInfo && this.fieldInfo.config && this.fieldInfo.config.onSearchChange) {
         this.fieldInfo.config.onSearchChange(x, this.fieldInfo);
@@ -33856,8 +33920,8 @@ var CustomSelectFieldvue_type_template_id_7f2d5810_staticRenderFns = [];
 
 var CustomSelectField_component = normalizeComponent(
   components_CustomSelectFieldvue_type_script_lang_js_,
-  CustomSelectFieldvue_type_template_id_7f2d5810_render,
-  CustomSelectFieldvue_type_template_id_7f2d5810_staticRenderFns,
+  CustomSelectFieldvue_type_template_id_4462bbfa_render,
+  CustomSelectFieldvue_type_template_id_4462bbfa_staticRenderFns,
   false,
   null,
   null,
@@ -33866,16 +33930,15 @@ var CustomSelectField_component = normalizeComponent(
 )
 
 /* harmony default export */ var CustomSelectField = (CustomSelectField_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/TextAreaField.vue?vue&type=template&id=1c027eb3&
-var TextAreaFieldvue_type_template_id_1c027eb3_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/TextAreaField.vue?vue&type=template&id=6dd77c99&
+var TextAreaFieldvue_type_template_id_6dd77c99_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('Field', {
     staticClass: "w-100",
     attrs: {
-      "name": _vm.fieldInfo.name,
-      "rules": _vm.fieldInfo.validationRules,
-      "label": _vm.fieldInfo.label
+      "name": _vm.GetDisplayLabel(_vm.fieldInfo),
+      "rules": _vm.fieldInfo.validationRules
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -33924,9 +33987,9 @@ var TextAreaFieldvue_type_template_id_1c027eb3_render = function render() {
     }])
   });
 };
-var TextAreaFieldvue_type_template_id_1c027eb3_staticRenderFns = [];
+var TextAreaFieldvue_type_template_id_6dd77c99_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/TextAreaField.vue?vue&type=template&id=1c027eb3&
+// CONCATENATED MODULE: ./src/components/TextAreaField.vue?vue&type=template&id=6dd77c99&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/TextAreaField.vue?vue&type=script&lang=js&
 
@@ -33945,6 +34008,15 @@ var TextAreaFieldvue_type_template_id_1c027eb3_staticRenderFns = [];
     }
   },
   methods: {
+    GetDisplayLabel(field) {
+      var labelName = '';
+      if (field.hasOwnProperty('label') && field.label) {
+        labelName = field.label;
+      } else if (field.hasOwnProperty('display_name') && field.display_name) {
+        labelName = field.display_name;
+      }
+      return labelName;
+    },
     getColumns(field) {
       if (field.config && this.fieldInfo.config.cols) {
         return field.config.cols;
@@ -33982,8 +34054,8 @@ var TextAreaFieldvue_type_template_id_1c027eb3_staticRenderFns = [];
 
 var TextAreaField_component = normalizeComponent(
   components_TextAreaFieldvue_type_script_lang_js_,
-  TextAreaFieldvue_type_template_id_1c027eb3_render,
-  TextAreaFieldvue_type_template_id_1c027eb3_staticRenderFns,
+  TextAreaFieldvue_type_template_id_6dd77c99_render,
+  TextAreaFieldvue_type_template_id_6dd77c99_staticRenderFns,
   false,
   null,
   null,
@@ -33992,8 +34064,8 @@ var TextAreaField_component = normalizeComponent(
 )
 
 /* harmony default export */ var TextAreaField = (TextAreaField_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/ColorField.vue?vue&type=template&id=6a91b5fc&
-var ColorFieldvue_type_template_id_6a91b5fc_render = function render() {
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6f2a365b-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/ColorField.vue?vue&type=template&id=68041c28&
+var ColorFieldvue_type_template_id_68041c28_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -34002,8 +34074,7 @@ var ColorFieldvue_type_template_id_6a91b5fc_render = function render() {
   }, [_c('Field', {
     staticClass: "w-100",
     attrs: {
-      "name": _vm.fieldInfo.name,
-      "label": _vm.fieldInfo.label
+      "name": _vm.GetDisplayLabel(_vm.fieldInfo)
     },
     scopedSlots: _vm._u([{
       key: "default",
@@ -34079,9 +34150,9 @@ var ColorFieldvue_type_template_id_6a91b5fc_render = function render() {
     }
   }) : _vm._e()], 1)], 1);
 };
-var ColorFieldvue_type_template_id_6a91b5fc_staticRenderFns = [];
+var ColorFieldvue_type_template_id_68041c28_staticRenderFns = [];
 
-// CONCATENATED MODULE: ./src/components/ColorField.vue?vue&type=template&id=6a91b5fc&
+// CONCATENATED MODULE: ./src/components/ColorField.vue?vue&type=template&id=68041c28&
 
 // EXTERNAL MODULE: ./node_modules/vue2-color-picker/dist/vue2-color-picker.js
 var vue2_color_picker = __webpack_require__("b9d7");
@@ -34127,6 +34198,15 @@ var vue2_color_picker_default = /*#__PURE__*/__webpack_require__.n(vue2_color_pi
     this.fieldInfo.validationRules = getValidationRules(this.fieldInfo.validationRules, this.lang);
   },
   methods: {
+    GetDisplayLabel(field) {
+      var labelName = '';
+      if (field.hasOwnProperty('label') && field.label) {
+        labelName = field.label;
+      } else if (field.hasOwnProperty('display_name') && field.display_name) {
+        labelName = field.display_name;
+      }
+      return labelName;
+    },
     setColor: function (color) {
       this.updateColors(color);
       this.colorValue = color;
@@ -34209,8 +34289,8 @@ var vue2_color_picker_default = /*#__PURE__*/__webpack_require__.n(vue2_color_pi
 
 var ColorField_component = normalizeComponent(
   components_ColorFieldvue_type_script_lang_js_,
-  ColorFieldvue_type_template_id_6a91b5fc_render,
-  ColorFieldvue_type_template_id_6a91b5fc_staticRenderFns,
+  ColorFieldvue_type_template_id_68041c28_render,
+  ColorFieldvue_type_template_id_68041c28_staticRenderFns,
   false,
   null,
   null,