cloud-web-corejs 1.0.54-dev.426 → 1.0.54-dev.429

package/package.json

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

package/src/components/Tinymce/index.vue

@@ -217,24 +217,43 @@ export default {
         //   }, 0);
         //   return img
         // },
-        // images_upload_handler(blobInfo, success, failure, progress) {
-        //   progress(0);
-        //   const token = _this.$store.getters.token;
-        //   getToken(token).then(response => {
-        //     const url = response.data.qiniu_url;
-        //     const formData = new FormData();
-        //     formData.append('token', response.data.qiniu_token);
-        //     formData.append('key', response.data.qiniu_key);
-        //     formData.append('file', blobInfo.blob(), url);
-        //     upload(formData).then(() => {
-        //       success(url);
-        //       progress(100);
-        //     })
-        //   }).catch(err => {
-        //     failure('出现未知问题，刷新页面，或者联系程序员')
-        //     console.log(err);
-        //   });
-        // },
+        images_upload_handler(blobInfo, success, failure, progress) {
+          progress(0);
+          _this.$baseUpload.upload({
+            file:blobInfo.blob(),
+            onProgress:(e)=>{
+              progress(e.percent)
+            },
+            callback:(res)=>{
+              if(res.type=="success"){
+                let url =  res.objx.domain + res.objx.url;
+                success(url);
+                progress(100);
+              }else{
+                failure(res.content)
+              }
+            },
+            error:(e)=>{
+              failure(e.message)
+            }
+          })
+          /* progress(0);
+          const token = _this.$store.getters.token;
+          getToken(token).then(response => {
+            const url = response.data.qiniu_url;
+            const formData = new FormData();
+            formData.append('token', response.data.qiniu_token);
+            formData.append('key', response.data.qiniu_key);
+            formData.append('file', blobInfo.blob(), url);
+            upload(formData).then(() => {
+              success(url);
+              progress(100);
+            })
+          }).catch(err => {
+            failure('出现未知问题，刷新页面，或者联系程序员')
+            console.log(err);
+          }); */
+        },
       });
     },
     destroyTinymce() {

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

@@ -84,56 +84,46 @@ export default {
   methods: {
     clickHandle() {
       if (this.designState || this.field.options.disabled) return;
-      /* let copyData = this.$baseLodash.cloneDeep(this.formModel);
 
-        this.handleCustomEvent(this.field.options.copyDataHandle, ["copyData"], [copyData])
-        this.getFormRef().openCopyEditTab(copyData); */
+      this.downloadHandle();
     },
     downloadHandle() {
+      let dataTableName = this.field.options.dataTableName
+      if(!dataTableName)return
+      let attachmentType = this.field.options.attachmentType
+      if(!attachmentType)return;
+      let $grid = this.getWidgetRef(dataTableName).getGridTable();
+      let checkRows = $grid.getCheckboxRecords(true);
+      if(!checkRows.length){
+        this.$message.error(this.$t1("请勾选需要下载的数据"))
+        return
+      }
+      let ids = checkRows.map(item=>item.id);
+
 
-    },
-    loadDataDefaultHandle() {
       let reportTemplate = this.getFormRef().reportTemplate;
       let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
       let scriptCode = this.field.options.formScriptCode;
       if (!scriptCode) return;
-      if (dataId) {
-        let accessParam = this.handleCustomEvent(
-          this.field.options.formScriptParam
-        );
-        return this.formHttp({
-          scriptCode: scriptCode,
-          data: {
-            formCode: formCode,
-            formVersion: reportTemplate.formVersion,
-            taBm: this.fieldKeyName,
-            data: {
-              ...accessParam,
-            },
-          },
-          success: (res) => {
-            let data = res.objx;
-            if(data){
-              this.$downloadByFileWhole(data, (url)=>{
-                this.openInNewTab(url)
-              })
-            }else{
-              this.$message.error(this.$t1("下载文件失败"))
-            }
-          },
-        });
-      }
+      let accessParam = this.handleCustomEvent(this.field.options.formScriptParam);
+      return this.formHttp({
+        scriptCode: scriptCode,
+        data: {
+          ids,
+          attachmentType,
+          ...accessParam,
+        },
+        success: (res) => {
+          let data = res.objx;
+          if (data) {
+            this.$downloadByFileWhole(data, this.field.options.fileName);
+          } else {
+            this.$message.error(this.$t1("下载文件失败"));
+          }
+        },
+      });
     },
-    openInNewTab(url) {
-      if (!url) return;
-      var a = document.createElement("a");
-      a.href = url;
-      a.target = "_blank";
-      document.body.appendChild(a);
-      a.click();
-      document.body.removeChild(a);
-    }
   },
 };
 </script>

package/src/components/xform/form-designer/setting-panel/property-editor/downloadButtonFlag-editor.vue

@@ -0,0 +1,32 @@
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">下载设置</el-divider>
+    </el-form-item>
+    <el-form-item label="表格唯一名称">
+      <el-input v-model="optionModel.dataTableName" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="类型">
+      <el-input v-model="optionModel.attachmentType" clearable></el-input>
+    </el-form-item>
+    <el-form-item label="文件名">
+      <el-input v-model="optionModel.fileName" clearable></el-input>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../../components/xform/utils/i18n";
+
+export default {
+  name: "downloadButtonFlag-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
+</script>
+
+<style scoped></style>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -166,6 +166,7 @@ const COMMON_PROPERTIES = {
   "autoValueEnabled": "autoValueEnabled-editor",
   // "commonAttributeEnabled": "commonAttributeEnabled-editor"
   "colorClass": "colorClass-editor",
+  "downloadButtonFlag": "downloadButtonFlag-editor"
 }
 
 const ADVANCED_PROPERTIES = {

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -3448,7 +3448,10 @@ export const advancedFields = [
       customClass: "",
       ...httpConfig,
 
-      downloadButton: "",
+      downloadButtonFlag: 1,
+      dataTableName: null,
+      attachmentType: null,
+      fileName: null,
 
       onCreated: "",
       onMounted: "",