cloud-web-corejs 1.0.54-dev.66 → 1.0.54-dev.68

package/package.json

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

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

@@ -81,7 +81,10 @@ export default {
         },
         confirm: (rows, fileInfos) => {
           this.fieldModel = rows;
-          this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+          // this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+          let eventParamNames = ['attachments', 'fileInfos'];
+          let eventParamValues = [rows, fileInfos];
+          this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
         }
       };
     }

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

@@ -242,7 +242,8 @@ modules = {
       })
     },
     getColors(){
-      let colors = [...this.field.options.echarBarOption.colors, ...this.colors];
+      let chartColors = this.field.options.echarBarOption.colors || [];
+      let colors = [...chartColors, ...this.colors];
       return colors
     },
     adjustColor() {

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

@@ -111,7 +111,8 @@ modules = {
 
   methods: {
     getColors() {
-      let colors = [...this.field.options.echarCategoryOption.colors, ...this.colors];
+      let chartColors = this.field.options.echarCategoryOption.colors || [];
+      let colors = [...chartColors, ...this.colors];
       return colors
     },
     adjustColor() {

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

@@ -147,7 +147,9 @@ export default {
     },
     submitFile(rows, fileInfos) {
       this.handlLineCode(fileInfos);
-      this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+      let eventParamNames = ['attachments', 'fileInfos'];
+      let eventParamValues = [rows, fileInfos];
+      this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
     },
     handlLineCode(fileInfos) {
       let allPromise = [];
@@ -176,7 +178,7 @@ export default {
     async processImage(base64, callback) {
       try {
         // 使用 ZXing 3.x 的 API
-        const result = await decode(base64,(result, err) => {
+        const result = await decode(base64, (result, err) => {
           if (err) {
             this.handleError(`条码识别失败: ${err}`);
             callback && callback(null)
@@ -205,7 +207,7 @@ export default {
       // const imageData = Uint8Array.from(atob(base64), c => c.charCodeAt(0));
       // const source = new ZXing.ImageLuminanceSource(imageData, base64.length);
 
-     decode(base64, (result, err) => {
+      decode(base64, (result, err) => {
         if (err) {
           this.handleError(`条码识别失败: ${err}`);
           callback && callback(null)

package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/onAfterConfirmFile-editor.vue

@@ -1,6 +1,7 @@
 <template>
   <el-form-item label="onAfterConfirmFile" label-width="150px">
-    <a href="javascript:void(0);" class="a-link link-oneLind" @click="editEventHandler('onAfterConfirmFile', eventParams)">
+    <a href="javascript:void(0);" class="a-link link-oneLind"
+       @click="editEventHandler('onAfterConfirmFile', eventParams)">
       <span>{{ optionModel.onAfterConfirmFile }}</span>
       <i class="el-icon-edit"></i>
     </a>
@@ -9,7 +10,8 @@
 
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n";
-import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 
 export default {
   name: "onAfterConfirmFile-editor",
@@ -21,7 +23,7 @@ export default {
   },
   data() {
     return {
-      eventParams: ["attachments", "fileInfos"],
+      eventParams: ["dataId", "formCode", "attachments", "fileInfos"],
     };
   },
 };