cloud-web-corejs 1.0.101 → 1.0.103

package/package.json

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

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

@@ -75,7 +75,15 @@
       },
       optionItems(){
         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;
+      },
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */

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

@@ -74,10 +74,10 @@ export default {
     }
   },
   computed: {
-    labelField(){
+    labelField() {
       return this.field.options.labelKey || "label";
     },
-    valueField(){
+    valueField() {
       return this.field.options.valueKey || "value";
     },
     allowDefaultFirstOption() {
@@ -86,10 +86,12 @@ export default {
     fieldModelLabel() {
       let fieldModel = this.fieldModel;
       let optionItems = this.field.options.optionItems;
-      let optionItem = optionItems.find(item => item.value === fieldModel)
-      return optionItem && optionItem.label ? optionItem.label : null;
+      let valueField = this.valueField;
+      let labelField = this.labelField;
+      let optionItem = optionItems.find(item => item[valueField] === fieldModel)
+      return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
     },
-    optionItems(){
+    optionItems() {
       return this.getOptionItems();
     }
 

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

@@ -115,6 +115,9 @@ export default {
     refreshWidget() {
       this.initStatusForDesign();
       this.$refs.statusTag.init();
+    },
+    getFieldModelLabel(){
+      return this.$refs.statusTag.getShowLabel();
     }
 
   }

package/src/views/user/home/default.vue

@@ -532,6 +532,7 @@ export default {
         data: {type: 0, size: 20},
         method: 'post',
         isLoading: isLoading,
+        modal: isLoading || false,
         loadingTarget: document.body,
         success: res => {
           this.unDoWfRows = res.objx && res.objx.records ? res.objx.records : [];
@@ -554,6 +555,7 @@ export default {
         method: `post`,
         data: {},
         isLoading: isLoading,
+        modal: isLoading || false,
         loadingTarget: document.body,
         success: res => {
           this.unreadMessageNum = res.objx || 0;