cloud-web-corejs 1.0.54-dev.374 → 1.0.54-dev.376

package/src/components/fileLibrary/propertiesDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="$t2('文件详情','components.fileLibrary.fileDetail')"
+    :title="$t2('文件详情', 'components.fileLibrary.fileDetail')"
     :append-to-body="true"
     :modal-append-to-body="falseValue"
     :close-on-click-modal="falseValue"
@@ -18,85 +18,97 @@
         <el-form ref="editForm" :model="attachmentDTO">
           <div class="d-header clearfix">
             <div class="fl">
-              <i class="el-icon-info"/>
-              {{ $t2('文件详情', 'components.fileLibrary.fileDetail') }}
+              <i class="el-icon-info" />
+              {{ $t2("文件详情", "components.fileLibrary.fileDetail") }}
             </div>
             <div class="fr">
-              <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData"
-                         v-if="isEdit && attachmentDTO.status!=1">{{ $t2('保存', 'system.button.save') }}
+              <el-button
+                type="primary"
+                class="button-sty"
+                icon="el-icon-check"
+                @click="saveData"
+                v-if="isEdit && attachmentDTO.status != 1"
+                >{{ $t2("保存", "system.button.save") }}
               </el-button>
             </div>
           </div>
           <baseTabs>
-            <baseTabPane :label="$t2('基本信息','system.label.baseInfo')">
+            <baseTabPane :label="$t2('基本信息', 'system.label.baseInfo')">
               <template #default>
                 <table class="table-detail">
                   <tbody>
-                  <tr>
-                    <th>{{ $t2('文件路径', 'components.fileLibrary.filePath') }}</th>
-                    <td colspan="3">
-                      <el-breadcrumb separator-class="el-icon-arrow-right">
-                        <el-breadcrumb-item v-for="(pathName,index) in pathNameArr" :key="index">{{
-                            pathName
-                          }}
-                        </el-breadcrumb-item>
-                      </el-breadcrumb>
-                    </td>
-                  </tr>
-                  <tr>
-                    <th>
-                      {{ $t2('文件名称', 'components.fileLibrary.fileName') }}
-                    </th>
-                    <td colspan="3">
-                      <el-input v-model="fileName" clearable v-if="isEdit">
-                        <template slot="append">{{ filePrefix }}</template>
-                      </el-input>
-                      <template v-else>{{ attachmentDTO.fileName }}</template>
-                    </td>
-                  </tr>
-                  <tr>
-                    <th>{{ $t2('所属对象描述', 'components.fileLibrary.note') }}</th>
-                    <td colspan="3">{{ attachmentDTO.note }}</td>
-                  </tr>
-                  <tr>
-                    <th>{{ $t1('文件类型名') }}</th>
-                    <td colspan="3"><b>{{ attachmentDTO.fileTypeName }}</b></td>
-                  </tr>
-                  <tr>
-                    <th>{{ $t2('文件大小', 'components.fileLibrary.fileSize') }}</th>
-                    <td>{{ formatFileSize(attachmentDTO.fileSize) }}</td>
-                    <th>{{ $t2('版本号', 'components.fileLibrary.fileRev') }}</th>
-                    <td>{{ attachmentDTO.rev }}</td>
-                  </tr>
-                  <tr>
-                    <th>{{ $t2('分辨率', 'components.fileLibrary.widthHeight') }}</th>
-                    <td>{{ attachmentDTO.widthHeight }}</td>
-                    <th>{{ $t2('是否归档', 'components.fileLibrary.status') }}</th>
-                    <td>{{ attachmentDTO.status == 1 ? "已归档" : "未归档" }}</td>
-                  </tr>
-                  <!--                  <tr>
+                    <tr>
+                      <th>{{ $t2("文件路径", "components.fileLibrary.filePath") }}</th>
+                      <td colspan="3">
+                        <el-breadcrumb separator-class="el-icon-arrow-right">
+                          <el-breadcrumb-item
+                            v-for="(pathName, index) in pathNameArr"
+                            :key="index"
+                            >{{ pathName }}
+                          </el-breadcrumb-item>
+                        </el-breadcrumb>
+                      </td>
+                    </tr>
+                    <tr>
+                      <th>
+                        {{ $t2("文件名称", "components.fileLibrary.fileName") }}
+                      </th>
+                      <td colspan="3">
+                        <el-input v-model="fileName" clearable v-if="isEdit">
+                          <template slot="append">{{ filePrefix }}</template>
+                        </el-input>
+                        <template v-else>{{ attachmentDTO.fileName }}</template>
+                      </td>
+                    </tr>
+                    <tr>
+                      <th>{{ $t2("所属对象描述", "components.fileLibrary.note") }}</th>
+                      <td colspan="3">{{ attachmentDTO.note }}</td>
+                    </tr>
+                    <tr>
+                      <th>{{ $t1("文件类型名") }}</th>
+                      <td colspan="3">
+                        <b>{{ attachmentDTO.fileTypeName }}</b>
+                      </td>
+                    </tr>
+                    <tr>
+                      <th>{{ $t2("文件大小", "components.fileLibrary.fileSize") }}</th>
+                      <td>{{ formatFileSize(attachmentDTO.fileSize) }}</td>
+                      <th>{{ $t2("版本号", "components.fileLibrary.fileRev") }}</th>
+                      <td>{{ attachmentDTO.rev }}</td>
+                    </tr>
+                    <tr>
+                      <th>{{ $t2("分辨率", "components.fileLibrary.widthHeight") }}</th>
+                      <td>{{ attachmentDTO.widthHeight }}</td>
+                      <th>{{ $t2("是否归档", "components.fileLibrary.status") }}</th>
+                      <td>{{ attachmentDTO.status == 1 ? "已归档" : "未归档" }}</td>
+                    </tr>
+                    <!--                  <tr>
                                       <th>状态</th>
                                       <td>{{ attachmentDTO.status == 1 ? '归档' : '未归档' }}</td>
                                     </tr>-->
-                  <tr>
-                    <th>{{ $t2('文件编码', 'components.fileLibrary.fileSn') }}</th>
-                    <td colspan="3">{{ attachmentDTO.fileSn }}</td>
-                  </tr>
-                  <tr>
-                    <th>{{ $t2('创建人', 'system.label.createBy') }}</th>
-                    <td>{{ attachmentDTO.createBy }}</td>
-                    <th>{{ $t2('创建时间', 'system.label.createDate') }}</th>
-                    <td>{{ attachmentDTO.createDate }}</td>
-                  </tr>
+                    <tr>
+                      <th>{{ $t2("文件编码", "components.fileLibrary.fileSn") }}</th>
+                      <td colspan="3">{{ attachmentDTO.fileSn }}</td>
+                    </tr>
+                    <tr>
+                      <th>{{ $t2("创建人", "system.label.createBy") }}</th>
+                      <td>{{ attachmentDTO._createBy }}</td>
+                      <th>{{ $t2("创建时间", "system.label.createDate") }}</th>
+                      <td>{{ attachmentDTO.createDate }}</td>
+                    </tr>
                   </tbody>
                 </table>
               </template>
             </baseTabPane>
-            <baseTabPane :label="$t2('文件属性','components.fileLibrary.fileAttribute')">
+            <baseTabPane :label="$t2('文件属性', 'components.fileLibrary.fileAttribute')">
               <template #button>
-                <el-button class="button-sty" @click="addItem" icon="el-icon-plus"
-                           v-if="isEdit && attachmentDTO.status!=1">
-                  {{ $t2('新增文件属性', 'components.fileLibrary.addFileAttribute') }}
+                <el-button
+                  class="button-sty"
+                  @click="addItem"
+                  icon="el-icon-plus"
+                  v-if="isEdit && attachmentDTO.status != 1"
+                >
+                  {{ $t2("新增文件属性", "components.fileLibrary.addFileAttribute") }}
                 </el-button>
               </template>
               <template #default>
@@ -109,24 +121,33 @@
                   @resizable-change="$vxeTableUtil.onColumnWitchChange"
                   @custom="$vxeTableUtil.customHandle"
                 >
-                  <template #attributeName="{row,rowIndex}">
-                    <el-form-item :prop="'fileAttachAttributeDTOs.' + rowIndex + '.attributeName'"
-                                  :rules="[{ required: true, trigger: 'blur' }]">
-                      <el-input v-model="row.attributeName" clearable v-if="isEdit"/>
+                  <template #attributeName="{ row, rowIndex }">
+                    <el-form-item
+                      :prop="'fileAttachAttributeDTOs.' + rowIndex + '.attributeName'"
+                      :rules="[{ required: true, trigger: 'blur' }]"
+                    >
+                      <el-input v-model="row.attributeName" clearable v-if="isEdit" />
                       <template v-else>{{ row.attributeName }}</template>
                     </el-form-item>
                   </template>
-                  <template #attributeValue="{row}">
-                    <el-input v-model="row.attributeValue" clearable v-if="isEdit"/>
+                  <template #attributeValue="{ row }">
+                    <el-input v-model="row.attributeValue" clearable v-if="isEdit" />
                     <template v-else>{{ row.attributeValue }}</template>
                   </template>
-                  <template #operate="{row,rowIndex}">
-                    <a class="a-link" @click="attachmentDTO.fileAttachAttributeDTOs.splice(rowIndex, 1)"
-                       v-if="isEdit">
-                      <el-tooltip :enterable="false" effect="dark"
-                                  :content="$t2('删除','components.fileLibrary.delete')" placement="top"
-                                  popper-class="tooltip-skin">
-                        <i class="el-icon-delete"/>
+                  <template #operate="{ row, rowIndex }">
+                    <a
+                      class="a-link"
+                      @click="attachmentDTO.fileAttachAttributeDTOs.splice(rowIndex, 1)"
+                      v-if="isEdit"
+                    >
+                      <el-tooltip
+                        :enterable="false"
+                        effect="dark"
+                        :content="$t2('删除', 'components.fileLibrary.delete')"
+                        placement="top"
+                        popper-class="tooltip-skin"
+                      >
+                        <i class="el-icon-delete" />
                       </el-tooltip>
                     </a>
                   </template>
@@ -155,9 +176,9 @@
 </template>
 
 <script>
-import mixins from './mixins/propertiesDialogMixins';
+import mixins from "./mixins/propertiesDialogMixins";
 
 export default {
-  mixins: [mixins]
+  mixins: [mixins],
 };
 </script>

package/src/components/scriptDescription/button.vue

@@ -1,26 +1,36 @@
 <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>
-    <scriptDescriptionDialog :path="path" v-if="showDialog"
-                             :visiable.sync="showDialog"></scriptDescriptionDialog>
+    <el-tooltip :content="title" 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>
 </template>
 <script>
-
 export default {
   name: "scriptDescriptionButton",
-  components: {scriptDescriptionDialog:() => import('../../components/scriptDescription/dialog')},
-  props: ['path'],
+  components: {
+    scriptDescriptionDialog: () => import("../../components/scriptDescription/dialog"),
+  },
+  props: {
+    path: String,
+    title: {
+      type: String,
+      default: () => this.$t2("脚本说明", "components.scriptDescription.title"),
+    },
+  },
   data() {
     return {
-      showDialog: false
-    }
-  }
-}
+      showDialog: false,
+    };
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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() {
     /* 这里不能访问方法和属性！！ */
   },