cloud-web-corejs 1.0.76 → 1.0.77

package/src/components/xform/form-designer/form-widget/dialog/formDialog.vue

@@ -6,7 +6,7 @@
     v-bind="dialogConfig"
     @close="close"
   >
-    <div class="cont" v-bind="bodyConfig" id="containt">
+    <div class="cont designer-view" v-bind="bodyConfig" id="containt">
       <v-form-render :form-json.sync="formJson" :form-data="formData" :option-data="optionData" ref="vFormRef"
                      :reportTemplate.sync="formTemplate" :conditionParam.sync="conditionParam"
                      :formInsData.sync="formInsData" v-if="showRender" visible-key="showRender" :parent-target="_self"

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

@@ -11,9 +11,9 @@
                             :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-checkbox-button>
       </template>
       <template v-else>
-        <el-checkbox v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-checkbox v-for="(item, index) in field.options.optionItems" :key="index" :label="item[valueField]"
                      :disabled="item.disabled" :border="field.options.border"
-                     :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-checkbox>
+                     :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-checkbox>
       </template>
     </el-checkbox-group>
   </form-item-wrapper>
@@ -62,12 +62,17 @@
     data() {
       return {
         oldFieldValue: null, //field组件change之前的值
-        fieldModel: null,
+        fieldModel: [],
         rules: [],
       }
     },
     computed: {
-
+      labelField(){
+        return this.field.options.labelKey || "label";
+      },
+      valueField(){
+        return this.field.options.valueKey || "value";
+      },
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */
@@ -78,8 +83,8 @@
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
       this.handleCreatedEnterEvent();
-      this.initOptionItems()
       this.initFieldModel()
+      this.initOptionItems()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()