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

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

@@ -9,6 +9,7 @@ import {CanvasRenderer} from 'echarts/renderers';
 import {PieChart} from 'echarts/charts';
 import {TitleComponent, TooltipComponent, LegendComponent} from 'echarts/components';
 import {THEME_KEY} from 'vue-echarts';
+import {extendDeeply} from "@base/utils/index.js";
 
 use([CanvasRenderer, PieChart, TitleComponent, TooltipComponent, LegendComponent]);
 
@@ -53,6 +54,7 @@ modules = {
       requestAccess: null,
       serieClone: {},
       showChart: true,
+      colors:[]
     };
   },
   computed: {
@@ -77,6 +79,9 @@ modules = {
         return height;
       }
       return '';
+    },
+    chartOption() {
+      return this.field.options.echarPieOption
     }
   },
   beforeCreate() {
@@ -91,6 +96,7 @@ modules = {
     this.initEventHandler();
 
     this.handleOnCreated();
+    this.initOption();
     this.serieClone = deepClone(this.field.options.echarPieOption.series[0]);
     // this.loadData();
   },
@@ -104,6 +110,10 @@ modules = {
   },
 
   methods: {
+    initOption() {
+      let echartConfig = this.handleCustomEvent(this.field.options.echartConfig) || {};
+      this.field.options.echarPieOption = extendDeeply(this.field.options.echarPieOption, echartConfig);
+    },
     /*async loadData() {
       if (this.designState) {
         return;
@@ -188,6 +198,9 @@ modules = {
       this.$nextTick(() => {
         this.showChart = true;
       })
+    },
+    getChart() {
+      return this.$refs.chart;
     }
   }
 };

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

@@ -4,7 +4,21 @@
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                      :sub-form-row-id="subFormRowId">
     <el-button icon="el-icon-plus" type="warning" class="el-button-tag" v-if="designState"></el-button>
-    <projectTagView v-else v-model="fieldModel" :readonly="field.options.readonly"></projectTagView>
+    <div v-else>
+      <el-tag
+        v-for="(tag,index) in fieldModel"
+        :key="index"
+        type="warning"
+        :disable-transitions="false"
+        :closable="!field.options.disabled && field.options.tabDeleteEnabled"
+        @close="deleteCallback(index)"
+      >
+        {{ tag[field.options.tagLabelField] }}
+      </el-tag>
+      <el-button icon="el-icon-plus" type="warning" class="el-button-tag" @click="openProjectTagDialog"
+                 v-if="!field.options.disabled"></el-button>
+    </div>
+
   </form-item-wrapper>
 </template>
 
@@ -13,7 +27,6 @@ import FormItemWrapper from './form-item-wrapper'
 import emitter from '../../../../../components/xform/utils/emitter'
 import i18n from "../../../../../components/xform/utils/i18n";
 import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
-import projectTagView from "../../../../../components/projectTag/view.vue";
 
 export default {
   name: "project-tag-widget",
@@ -45,7 +58,6 @@ export default {
     }
   },
   components: {
-    projectTagView,
     FormItemWrapper,
   },
   inject: ['refList', 'globalOptionData', 'globalModel', 'getFormConfig'],
@@ -124,6 +136,58 @@ export default {
       });
 
     },
+    openProjectTagDialog() {
+      if (this.field.options.onClick) {
+        this.handleCustomEvent(this.field.options.onClick);
+        return
+      }
+      let formCode = this.field.options.tagFormCode;
+      let tagLabelField = this.field.options.tagLabelField;
+      let tagUniqueField = this.field.options.tagUniqueField;
+      let tagFormLabelField = this.field.options.tagFormLabelField;
+      let tagFormUniqueField = this.field.options.tagFormUniqueField;
+      /*let checkRows = this.fieldModel.map(item => {
+        return {
+          [tagFormUniqueField]: item[tagUniqueField] ?? null,
+          [tagFormLabelField]: item[tagLabelField] ?? null,
+        }
+      })*/
+      let tagFormParam = this.handleCustomEvent(this.field.options.tagFormParam)
+      this.getFormRef().openSearchDialog({
+        formCode,
+        param: tagFormParam,
+        // rows: checkRows,
+        multiple: true,
+        confirm: (rows) => {
+          if (!this.field.options.tagConfirmCallback) {
+            let tagFillConfig = this.field.options.tagFillConfig || [];
+            let items = rows.map(item => {
+              let newData = {
+                [tagUniqueField]: item[tagFormUniqueField],
+                [tagLabelField]: item[tagFormLabelField],
+              }
+              tagFillConfig.forEach(item1 => {
+                newData[item1.targetField] = item[item1.sourceField]
+              })
+              return newData
+            });
+            this.addTagData(items);
+          } else {
+            this.handleCustomEvent(this.field.options.tagConfirmCallback, ['rows'], [rows])
+          }
+        }
+      });
+    },
+    addTagData(rows) {
+      let tagUniqueField = this.field.options.tagUniqueField;
+      let keys = this.fieldModel.map(item => item[tagUniqueField]);
+      let items = rows.filter(item => !keys.includes(item[tagUniqueField]))
+      this.fieldModel.push(...items);
+    },
+    deleteCallback(index) {
+      this.fieldModel.splice(index, 1)
+      this.handleCustomEvent(this.field.options.tagDeleteCallback)
+    }
   }
 }
 </script>

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

@@ -6,14 +6,14 @@
                     :disabled="field.options.disabled" :size="field.options.size"
                     @change="handleChangeEvent">
       <template v-if="!!field.options.buttonStyle">
-        <el-radio-button v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-radio-button v-for="(item, index) in optionItems" :key="index" :label="item.value"
                          :disabled="item.disabled" :border="field.options.border"
                          :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-radio-button>
       </template>
       <template v-else>
-        <el-radio v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-radio v-for="(item, index) in optionItems" :key="index" :label="item[valueField]"
                   :disabled="item.disabled" :border="field.options.border"
-                  :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-radio>
+                  :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-radio>
       </template>
     </el-radio-group>
   </form-item-wrapper>
@@ -67,7 +67,15 @@
       }
     },
     computed: {
-
+      labelField(){
+        return this.field.options.labelKey || "label";
+      },
+      valueField(){
+        return this.field.options.valueKey || "value";
+      },
+      optionItems(){
+        return this.getOptionItems();
+      }
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */
@@ -78,8 +86,8 @@
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
       this.handleCreatedEnterEvent();
-      this.initOptionItems()
       this.initFieldModel()
+      this.initOptionItemsHandle()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()

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

@@ -5,7 +5,7 @@
                           :index-of-parent-list="indexOfParentList"
                           :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                           :sub-form-row-id="subFormRowId">
-    <el-button class="button-sty" @click="handleButtonWidgetClick" icon="el-icon-search">
+    <el-button class="button-sty" @click="handleButtonWidgetClick" icon="el-icon-search" :disabled="!designState &&field.options.disabled">
       {{ field.options.label }}
     </el-button>
   </static-content-wrapper>

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

@@ -18,8 +18,8 @@
                @change="handleChangeEvent"
                :style="'width:'+field.options.widgetWidth+' !important;'"
                :class="{'custom-width':field.options.widgetWidth!=null}">
-      <el-option v-for="item in field.options.optionItems" :key="item.value" :label="getI18nLabel(item.label)"
-                 :value="item.value" :disabled="item.disabled">
+      <el-option v-for="(item,index) in optionItems" :key="index" :label="getI18nLabel(item[labelField])"
+                 :value="item[valueField]" :disabled="item.disabled">
       </el-option>
     </el-select>
     <span v-else>{{ fieldModelLabel }}</span>
@@ -73,6 +73,12 @@ export default {
     }
   },
   computed: {
+    labelField(){
+      return this.field.options.labelKey || "label";
+    },
+    valueField(){
+      return this.field.options.valueKey || "value";
+    },
     allowDefaultFirstOption() {
       return (!!this.field.options.filterable && !!this.field.options.allowCreate)
     },
@@ -81,6 +87,9 @@ export default {
       let optionItems = this.field.options.optionItems;
       let optionItem = optionItems.find(item => item.value === fieldModel)
       return optionItem && optionItem.label ? optionItem.label : null;
+    },
+    optionItems(){
+      return this.getOptionItems();
     }
 
   },
@@ -99,7 +108,7 @@ export default {
     this.buildFieldRules()
 
     this.handleOnCreated()
-    this.initOptionItems()
+    this.initOptionItemsHandle()
   },
 
   mounted() {

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

@@ -76,7 +76,12 @@ 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),
+        showImageAtTable: this.field.options.showImageAtTable || 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/text-widget.vue

@@ -1,20 +1,29 @@
 <template>
-  <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">
-    <span>{{fieldModel}}</span>
+  <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"
+  >
+    <span>{{ showVaule }}</span>
   </form-item-wrapper>
 </template>
 
 <script>
-import FormItemWrapper from './form-item-wrapper'
-import emitter from '../../../../../components/xform/utils/emitter'
+import FormItemWrapper from "./form-item-wrapper";
+import emitter from "../../../../../components/xform/utils/emitter";
 import i18n from "../../../../../components/xform/utils/i18n";
 import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
 
 export default {
   name: "text-widget",
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -25,37 +34,40 @@ export default {
 
     designState: {
       type: Boolean,
-      default: false
+      default: false,
     },
 
-    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
-      type: String,
-      default: ''
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
     },
-
   },
   components: {
     FormItemWrapper,
   },
-  inject: ['refList', 'globalOptionData', 'globalModel'],
+  inject: ["refList", "globalOptionData", "globalModel"],
   data() {
     return {
       oldFieldValue: null, //field组件change之前的值
       fieldModel: null,
       rules: [],
-    }
+    };
   },
   computed: {
-
-
+    showVaule() {
+      let value = !this.field.options.autoValueEnabled
+        ? this.fieldModel
+        : this.handleCustomEvent(this.field.options.autoValueHanlde);
+      return value;
+    },
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -64,29 +76,29 @@ export default {
   created() {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
-    this.initFieldModel()
-    this.registerToRefList()
-    this.initEventHandler()
-    this.buildFieldRules()
+    this.initFieldModel();
+    this.registerToRefList();
+    this.initEventHandler();
+    this.buildFieldRules();
 
-    this.handleOnCreated()
+    this.handleOnCreated();
   },
 
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
   },
 
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
 
-  methods: {
-
-  }
-}
+  methods: {},
+};
 </script>
 
 <style lang="scss" scoped>
 @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
-::v-deep .el-form-item{min-height: 34px;}
+::v-deep .el-form-item {
+  min-height: 34px;
+}
 </style>

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

@@ -57,8 +57,8 @@
     inject: ['refList', 'globalOptionData', 'globalModel'],
     data() {
       return {
-        oldFieldValue: null, //field组件change之前的值
-        fieldModel: null,
+        oldFieldValue: [], //field组件change之前的值
+        fieldModel: [],
         rules: [],
       }
     },

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

@@ -192,7 +192,10 @@ export default {
           this.currentData[labelField] = val;
         }
       }
-    }
+    },
+    fieldModelLabel() {
+      return this.showValue;
+    },
   }
 }
 </script>

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

@@ -12,10 +12,17 @@
     </div>
     <baseUpload accept="file" :file.sync="fieldModel" :hidePasteArea.sync="isH5"
                 :uploadDialogCustomClass="isH5?'dialog-upload-h5':null" :pickPrivateProfile="false"
-                :multi.sync="multi"
-                :limit.sync="limit"
+                :multi="field.options.limit!==1"
+                :limit="field.options.limit"
                 resultType="Array"
                 :edit="!field.options.disabled"
+                @callback="submitFile"
+                :hideInfo="field.options.hideFileInfo"
+                :hideName="field.options.hideFileName"
+                :showSize="!!field.options.showFileSize"
+                :createBy="!!field.options.showFileCreateBy"
+                :createDate="!!field.options.showFileCreateDate"
+                :widgetSize="field.options.fileShowImageSize"
                 v-else></baseUpload>
   </form-item-wrapper>
 </template>
@@ -76,12 +83,6 @@ export default {
     formDataId() {
       let formRef = this.getFormRef();
       return formRef.dataId;
-    },
-    limit() {
-      return this.field.options.limit ? this.field.options.limit : null;
-    },
-    multi() {
-      return this.limit !== 1;
     }
   },
   beforeCreate() {
@@ -140,10 +141,89 @@ export default {
           callback: res => {
             let rows = res.objx || [];
             this.setValue(rows)
+            this.handleCustomEvent(this.field.options.formScriptSuccess,['res'],[res]);
+          }
+        });
+      }
+    },
+    submitFile(rows, fileInfos) {
+      // this.handlLineCode(fileInfos);
+      let eventParamNames = ['attachments', 'fileInfos'];
+      let eventParamValues = [rows, fileInfos];
+      this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
+    },
+    /*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>