cloud-web-corejs 1.0.54-dev.480 → 1.0.54-dev.481

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.480",
+  "version": "1.0.54-dev.481",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -140,6 +140,21 @@ modules = {
       return !!this.getReadMode() || this.fieldReadonlyFlag;
     },
     optionLabel() {
+      return this.getOptionLabel();
+    },
+    tableRow() {
+      let tableParam = this.tableParam;
+      return tableParam && tableParam.row ? tableParam.row : null;
+    },
+    fieldKeyName() {
+      let o = this.field.options.name;
+      return (
+        (this.field.options.keyNameEnabled && this.field.options.keyName) || o
+      );
+    },
+  },
+  methods: {
+    getOptionLabel(){
       if (this.fieldModel === null) {
         return null
       } else {
@@ -152,22 +167,9 @@ modules = {
             // resultContent = resultContent === '--' ? oItem.label : resultContent + ' ' + oItem.label
           }
         })
-
         return resultList.join(",")
       }
     },
-    tableRow() {
-      let tableParam = this.tableParam;
-      return tableParam && tableParam.row ? tableParam.row : null;
-    },
-    fieldKeyName() {
-      let o = this.field.options.name;
-      return (
-        (this.field.options.keyNameEnabled && this.field.options.keyName) || o
-      );
-    },
-  },
-  methods: {
     initValueWatchEvent() {
       if (!this.designer) {
         this.$watch(() => {

package/src/components/xform/form-designer/form-widget/field-widget/radio-widget.vue

@@ -80,12 +80,13 @@
         return this.getOptionItems();
       },
       fieldModelLabel() {
-        let fieldModel = this.fieldModel;
-        let optionItems = this.field.options.optionItems;
-        let valueField = this.valueField;
-        let labelField = this.labelField;
-        let optionItem = optionItems.find(item => item[valueField] === fieldModel)
-        return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
+        // let fieldModel = this.fieldModel;
+        // let optionItems = this.field.options.optionItems;
+        // let valueField = this.valueField;
+        // let labelField = this.labelField;
+        // let optionItem = optionItems.find(item => item[valueField] === fieldModel)
+        // return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
+        return this.getOptionLabel();
       },
     },
     beforeCreate() {

package/src/components/xform/form-designer/form-widget/field-widget/select-widget.vue

@@ -92,7 +92,7 @@ export default {
       // let labelField = this.labelField;
       // let optionItem = optionItems.find(item => item[valueField] === fieldModel)
       // return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
-      return this.optionLabel;
+      return this.getOptionLabel();
     },
     optionItems() {
       return this.getOptionItems();