cloud-web-corejs 1.0.54-dev.19 → 1.0.54-dev.191

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

@@ -6,11 +6,11 @@
     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"
-                     @reload="$baseReload()" v-bind="formConfig" :param="dialogParam"
+                     @reload="reload" v-bind="formConfig" :param="dialogParam"
                      class="data-table_height"/>
     </div>
     <span slot="footer" class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">
@@ -38,6 +38,7 @@ export default {
   },
   mixins: [],
   inject: ["getFormConfig"],
+
   mounted() {
 
   },
@@ -59,7 +60,8 @@ export default {
       conditionParam: null,
       formInsData: null,
       $grid: null,
-      currentLayoutType: null
+      currentLayoutType: null,
+      dataId:null
     };
   },
   computed: {
@@ -104,6 +106,10 @@ export default {
     }
   },
   created() {
+    /*let dataId = this.option?.formConfig?.dataId??null
+    delete this.option?.formConfig?.dataId
+    this.dataId = dataId;*/
+
     let currentFormConfig = this.getFormConfig();
     this.currentLayoutType = currentFormConfig.layoutType
 
@@ -111,7 +117,13 @@ export default {
     this.getReportTemplate();
   },
   methods: {
-    async getReportTemplate() {
+    reload(e,option){
+      let updateParam = option?.updateParam || {};
+      Object.assign(this.formConfig,updateParam)
+      this.showRender = false;
+      this.getReportTemplate();
+    },
+    async getReportTemplate(callback) {
       let param = {
         objTypeCode: this.$attrs.objTypeCode,
         objId: this.$attrs.objId,

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

@@ -4,7 +4,7 @@
       <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"
-                     @reload="$baseReload()" :param="dialogParam"
+                     @reload="reload" :param="dialogParam"
                      class="data-table_height"/>
     </div>
     <span class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">
@@ -105,6 +105,10 @@ export default {
     this.getReportTemplate();
   },
   methods: {
+    reload(){
+      this.showRender = false;
+      this.getReportTemplate();
+    },
     async getReportTemplate() {
       let param = {
         objTypeCode: this.$attrs.objTypeCode,

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

@@ -2,7 +2,7 @@
   <div v-if="showContent">
     <el-dialog
       :title="$t2('导入', 'components.excelImport.title')"
-      :append-to-body="falseValue"
+      :append-to-body="true"
       :modal-append-to-body="falseValue"
       :close-on-click-modal="falseValue"
       :visible.sync="showImportDialog"
@@ -41,6 +41,7 @@
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
+        <span class="fl tips">{{ $t1('注：导入文件不允许超过{fileSize}MB', {fileSize: importFileLimitSize}) }}</span>
 				<el-button type="primary" plain class="button-sty" @click="dialogClose1">
 					<i class="el-icon-close el-icon"></i>
 					{{ $t2('取 消', 'system.button.cancel2') }}
@@ -54,7 +55,7 @@
     <el-dialog
       ref="importDialog"
       :title="$t2('导入', 'components.excelImport.title')"
-      :append-to-body="falseValue"
+      :append-to-body="true"
       :modal-append-to-body="falseValue"
       :close-on-click-modal="falseValue"
       :visible.sync="showImportDialog2"
@@ -62,11 +63,33 @@
       custom-class="dialog-style"
       width="501px"
       height="250px"
-      @close="dialogClose2"
+      :beforeClose="handleBeforeClose"
+      @close="handleClose2"
       v-el-drag-dialog
     >
       <div>
-        <div class="import-box">
+        <div v-show="importLoading" class="import-stepbox">
+          <ul>
+            <li :class="getLoadingClass(1,percent1)">
+              <i class="el-icon-circle-check"></i>
+              <i class="el-icon-loading"></i>
+              <span v-html="$t1('上传导入文件  {percent}', {percent: `<span class=nums>${percent1}%</span>`})"></span>
+            </li>
+            <li :class="getLoadingClass(2,percent2)">
+              <i class="el-icon-circle-check"></i>
+              <i class="el-icon-loading"></i>
+              <span
+                v-html="$t1('校验导入文件中的图片数据格式  {percent}', {percent: `<span class=nums>${percent2}%</span>`})"></span>
+            </li>
+            <li :class="getLoadingClass(3,percent3)">
+              <i class="el-icon-circle-check"></i>
+              <i class="el-icon-loading"></i>
+              <span
+                v-html="$t1('存储导入文件中的图片  {percent}', {percent: `<span class=nums>${percent3}%</span>`})"></span>
+            </li>
+          </ul>
+        </div>
+        <div v-show="!importLoading" class="import-box" style="margin-bottom: 30px;">
           <div class="tips">
             {{ $t2('导入中，请勿关闭当前窗口', 'components.excelImport.tip2') }}
             <!-- <span class="fr">耗时：<em class="time-txt">0 时 0 分 0 秒 </em></span> -->
@@ -88,7 +111,7 @@
         </div>
       </div>
       <div slot="footer" class="dialog-footer" center="true">
-        <div class="fl import-count">
+        <div class="fl import-count" v-show="!importLoading">
           <span class="f-red doneNum">0</span>
           /
           <span class="dataSize">0</span>
@@ -130,12 +153,20 @@
                   <div class="clearfix screen-btns">
                     <div class="fl">
                       <vxe-button status="primary" class="button-sty" icon="el-icon-upload2" @click="exportToExcel()">
-                        导出
+                        {{ $t1('导出') }}
                       </vxe-button>
                     </div>
                     <div class="fr"></div>
                   </div>
                 </template>
+                <template #attachment="{row,column}">
+                  <base-attachment :option="{
+                      title: column.title,
+                      rows: row[column.field],
+                      showViewButton: true,
+                      edit:false
+                    }"/>
+                </template>
               </vxe-grid>
             </div>
           </div>