cloud-web-corejs 1.0.66 → 1.0.68

package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-bar-mixin.js

@@ -3,7 +3,7 @@ import i18n from '../../../../../../components/xform/utils/i18n';
 import fieldMixin from '../../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin';
 
 import {deepClone} from '../../../../../../components/xform/utils/util';
-
+import {extendDeeply} from "@base/utils/index.js";
 import {use} from 'echarts/core';
 import {CanvasRenderer} from 'echarts/renderers';
 import {BarChart} from 'echarts/charts';
@@ -206,6 +206,9 @@ modules = {
           delete chartOptions.yAxis.data;
         }
       }
+    },
+    chartOption(){
+      return this.field.options.echarBarOption
     }
   },
   beforeCreate() {
@@ -220,6 +223,7 @@ modules = {
     this.initEventHandler();
 
     this.handleOnCreated();
+    this.initOption();
     this.serieClone = deepClone(this.field.options.echarBarOption.series[0]);
   },
 
@@ -232,6 +236,10 @@ modules = {
   },
 
   methods: {
+    initOption(){
+      let echartConfig = this.handleCustomEvent(this.field.options.echartConfig) || {};
+      this.field.options.echarBarOption = extendDeeply(this.field.options.echarBarOption, echartConfig);
+    },
     /*async loadData() {
       if (this.designState) {
         this.showChart = true;
@@ -412,6 +420,9 @@ modules = {
       this.$nextTick(()=>{
         this.showChart  = true;
       })
+    },
+    getChart(){
+      return this.$refs.chart;
     }
   }
 };

package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-category-mixin.js

@@ -157,6 +157,9 @@ modules = {
         return height;
       }
       return '';
+    },
+    chartOption(){
+      return this.field.options.echarBarOption
     }
   },
   beforeCreate() {
@@ -363,6 +366,9 @@ modules = {
       this.$nextTick(()=>{
         this.showChart  = true;
       })
+    },
+    getChart(){
+      return this.$refs.chart;
     }
   }
 };

package/src/components/xform/form-designer/form-widget/field-widget/mixins/echart-pie-mixin.js

@@ -77,6 +77,9 @@ modules = {
         return height;
       }
       return '';
+    },
+    chartOption() {
+      return this.field.options.echarBarOption
     }
   },
   beforeCreate() {
@@ -188,6 +191,9 @@ modules = {
       this.$nextTick(() => {
         this.showChart = true;
       })
+    },
+    getChart() {
+      return this.$refs.chart;
     }
   }
 };

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

@@ -76,7 +76,11 @@ export default {
       if (this.designState) {
         return
       }
-      let opt = {title: this.field.options.exportFileName || null, targetRef: this.field.options.tableRef || null};
+      let opt = {
+        title: this.field.options.exportFileName || null,
+        targetRef: this.field.options.tableRef || null,
+        pageSize: (this.field.options.exportPageSize || null)
+      };
       let tableExportParam = this.handleCustomEvent(this.field.options.tableExportParam);
       let options = {...opt, ...tableExportParam, type: type};
       let tableRef = options?.targetRef;

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

@@ -16,6 +16,7 @@
                 :limit.sync="limit"
                 resultType="Array"
                 :edit="!field.options.disabled"
+                @callback="submitFile"
                 v-else></baseUpload>
   </form-item-wrapper>
 </template>
@@ -144,6 +145,82 @@ export default {
         });
       }
     },
+    submitFile(rows, fileInfos) {
+      this.handlLineCode(fileInfos);
+      this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+    },
+    handlLineCode(fileInfos) {
+      let allPromise = [];
+      fileInfos.forEach(async fileInfo => {
+        await this.processFile(fileInfo.file, (lineCode) => {
+          fileInfo.lineCode = lineCode;
+        })
+      })
+
+    },
+    processFile(file, callback) {
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader();
+        reader.onload = (e) => this.processImage(e.target.result, (lineCode) => {
+          resolve(lineCode)
+          callback(lineCode)
+        });
+        reader.onerror = () => {
+          resolve(null)
+          callback(null)
+          this.setError('文件读取失败')
+        };
+        reader.readAsDataURL(file);
+      })
+    },
+    async processImage(base64, callback) {
+      try {
+        // 使用 ZXing 3.x 的 API
+        const result = await decode(base64,(result, err) => {
+          if (err) {
+            this.handleError(`条码识别失败: ${err}`);
+            callback && callback(null)
+            return;
+          }
+          this.scannedText = result.text;
+          this.loading = false;
+          callback && callback(result.text)
+        });
+      } catch (err) {
+        console.error(err);
+        callback && callback(null)
+        this.handleError(`条码识别失败: ${err.message}`);
+      }
+    },
+    handleLineCode(fileInfos) {
+      fileInfos.forEach(fileInfo => {
+        let file = fileInfo.file;
+      })
+    },
+    handleImage(base64, fileName, callback) {
+      // 创建 ZXing Scanner
+
+
+      // 将 Base64 转换为 ImageLuminanceSource
+      // const imageData = Uint8Array.from(atob(base64), c => c.charCodeAt(0));
+      // const source = new ZXing.ImageLuminanceSource(imageData, base64.length);
+
+     decode(base64, (result, err) => {
+        if (err) {
+          this.handleError(`条码识别失败: ${err}`);
+          callback && callback(null)
+          return;
+        }
+        this.scannedText = result.text;
+        this.loading = false;
+        callback && callback(result.text)
+      });
+    },
+
+    handleError(errorMessage) {
+      this.error = errorMessage;
+      this.loading = false;
+    },
   }
 }
 </script>