cloud-web-corejs 1.0.54-dev.375 → 1.0.54-dev.377

package/src/components/scriptDescription/button.vue

@@ -1,8 +1,8 @@
 <template>
   <span>
-    <el-tooltip :content="$t2('脚本说明', 'components.scriptDescription.title')" placement="top">
-    <a @click="showDialog=true" class="tips-icon"><i class="el-icon-view el-icon-question"></i></a>
-  </el-tooltip>
+    <el-tooltip :content="content" placement="top">
+      <a @click="showDialog=true" class="tips-icon"><i class="el-icon-view el-icon-question"></i></a>
+    </el-tooltip>
     <scriptDescriptionDialog :path="path" v-if="showDialog"
                              :visiable.sync="showDialog"></scriptDescriptionDialog>
   </span>
@@ -12,7 +12,15 @@
 export default {
   name: "scriptDescriptionButton",
   components: {scriptDescriptionDialog:() => import('../../components/scriptDescription/dialog')},
-  props: ['path'],
+  props: {
+    path: String,
+    title: String
+  },
+  computed: {
+    content() {
+      return this.title || this.$t2('脚本说明', 'components.scriptDescription.title');
+    },
+  },
   data() {
     return {
       showDialog: false

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

@@ -119,7 +119,7 @@ export default {
   methods: {
     reload(e,option){
       let updateParam = option?.updateParam || {};
-      Object.assign(this.formConfig,updateParam)
+      if(this.formConfig)Object.assign(this.formConfig,updateParam)
       this.showRender = false;
       this.getReportTemplate();
     },

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

@@ -2,7 +2,9 @@
   <form-item-wrapper :designer="designer" :field="field" :rules="rules" :design-state="designState"
                      :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
-    <el-cascader ref="fieldEditor" :options="field.options.optionItems" v-model="fieldModel" class="full-width-input"
+    <el-cascader ref="fieldEditor" :options="field.options.optionItems"
+                  v-model="fieldModel" class="full-width-input"
+                  v-show="!isReadMode"
                  :disabled="field.options.disabled"
                  :size="field.options.size"
                  :clearable="field.options.clearable"
@@ -13,6 +15,9 @@
                  @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
                  @change="handleChangeEvent">
     </el-cascader>
+    <template v-if="isReadMode">
+      <span class="readonly-mode-field">{{contentForReadMode}}</span>
+    </template>
   </form-item-wrapper>
 </template>
 
@@ -101,6 +106,19 @@
           })
         }, 100)
       },
+      contentForReadMode() {
+        if (!!this.field.options.multiple) {
+          //console.log('test======', this.$refs.fieldEditor.presentTags)
+          const curTags = this.$refs.fieldEditor.presentTags
+          if (!curTags || (curTags.length <= 0)) {
+            return '--'
+          } else {
+            return curTags.map(tagItem => tagItem.text).join(', ')
+          }
+        } else {
+          return this.$refs.fieldEditor.presentText || '--'
+        }
+      },
 
     }
   }

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

@@ -2,7 +2,7 @@
   <form-item-wrapper :designer="designer" :field="field" :rules="rules" :design-state="designState"
                      :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
-    <el-checkbox-group ref="fieldEditor" v-model="fieldModel"
+    <el-checkbox-group ref="fieldEditor" v-model="fieldModel" v-show="!isReadMode"
                        :disabled="field.options.disabled" :size="field.options.size"
                        @change="handleChangeEvent">
       <template v-if="!!field.options.buttonStyle">
@@ -16,6 +16,9 @@
                      :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-checkbox>
       </template>
     </el-checkbox-group>
+    <template v-if="isReadMode">
+      <span class="readonly-mode-field">{{optionLabel}}</span>
+    </template>
   </form-item-wrapper>
 </template>
 

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

@@ -2,11 +2,14 @@
   <form-item-wrapper :designer="designer" :field="field" :rules="rules" :design-state="designState"
                      :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
-    <el-color-picker ref="fieldEditor" v-model="fieldModel"
+    <el-color-picker ref="fieldEditor" v-model="fieldModel" v-show="!isReadMode"
                      :size="field.options.size"
                      :disabled="field.options.disabled"
                      @change="handleChangeEvent">
     </el-color-picker>
+    <template v-if="isReadMode">
+      <span class="readonly-mode-field">{{fieldModel}}</span>
+    </template>
   </form-item-wrapper>
 </template>
 

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

@@ -3,7 +3,7 @@
                      :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                      :sub-form-row-id="subFormRowId">
-    <el-date-picker ref="fieldEditor" :type="field.options.type" v-model="fieldModel" class="full-width-input"
+    <el-date-picker ref="fieldEditor" :type="field.options.type" v-model="fieldModel" v-show="!isReadMode" class="full-width-input"
                     :disabled="field.options.disabled" :readonly="field.options.readonly"
                     :size="field.options.size"
                     :clearable="field.options.clearable" :editable="field.options.editable"
@@ -14,6 +14,9 @@
                     @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
                     @change="handleChangeEvent">
     </el-date-picker>
+    <template v-if="isReadMode">
+      <span class="readonly-mode-field">{{contentForReadMode}}</span>
+    </template>
   </form-item-wrapper>
 </template>
 
@@ -64,7 +67,15 @@ export default {
       rules: [],
     }
   },
-  computed: {},
+  computed: {
+    contentForReadMode() {
+      if (!this.fieldModel) {
+        return ''
+      } else {
+        return this.fieldModel[0] + ' - ' + this.fieldModel[1]
+      }
+    },
+  },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
   },

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

@@ -3,7 +3,7 @@
                      :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                      :sub-form-row-id="subFormRowId">
-    <el-date-picker ref="fieldEditor" :type="field.options.type" v-model="fieldModel" class="full-width-input"
+    <el-date-picker ref="fieldEditor" :type="field.options.type" v-model="fieldModel" v-show="!isReadMode" class="full-width-input"
                     :readonly="field.options.readonly" :disabled="field.options.disabled"
                     :size="field.options.size"
                     :clearable="field.options.clearable" :editable="field.options.editable"
@@ -14,6 +14,9 @@
                     :picker-options="pickerOptions"
     >
     </el-date-picker>
+    <template v-if="isReadMode">
+      <span class="readonly-mode-field">{{contentForReadMode}}</span>
+    </template>
   </form-item-wrapper>
 </template>
 
@@ -65,7 +68,11 @@ export default {
       pickerOptions: {}
     }
   },
-  computed: {},
+  computed: {
+    contentForReadMode() {
+      return this.fieldModel ? this.fieldModel : ''
+    },
+  },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
   },