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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.480",
+  "version": "1.0.54-dev.482",
   "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,21 +140,7 @@ modules = {
       return !!this.getReadMode() || this.fieldReadonlyFlag;
     },
     optionLabel() {
-      if (this.fieldModel === null) {
-        return null
-      } else {
-        let resultList = []
-        let valueField = this.getOptionItemLabelKey();
-        let labelField = this.getOptionItemValueKey();
-        this.field.options.optionItems.forEach(oItem => {
-          if ((oItem[valueField] === this.fieldModel) || (this.findInArray(this.fieldModel, oItem[valueField])) !== -1) {
-            resultList.push(this.$t1(oItem[labelField]))
-            // resultContent = resultContent === '--' ? oItem.label : resultContent + ' ' + oItem.label
-          }
-        })
-
-        return resultList.join(",")
-      }
+      return this.getOptionLabel();
     },
     tableRow() {
       let tableParam = this.tableParam;
@@ -168,6 +154,22 @@ modules = {
     },
   },
   methods: {
+    getOptionLabel(){
+      if (this.fieldModel === null) {
+        return null
+      } else {
+        let resultList = []
+        let labelField = this.getOptionItemLabelKey();
+        let valueField = this.getOptionItemValueKey();
+        this.field.options.optionItems.forEach(oItem => {
+          if ((oItem[valueField] === this.fieldModel) || (this.findInArray(this.fieldModel, oItem[valueField])) !== -1) {
+            resultList.push(this.$t1(oItem[labelField]))
+            // resultContent = resultContent === '--' ? oItem.label : resultContent + ' ' + oItem.label
+          }
+        })
+        return resultList.join(",")
+      }
+    },
     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();