cloud-web-corejs 1.0.54-dev.57 → 1.0.54-dev.571

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

@@ -14,186 +14,18 @@
       @change="changeShowValue2"
     >
       <i slot="suffix" class="el-input__icon el-icon-search" @click="emitAppendButtonClick"></i>
-      <span v-show="false">{{ showValue }}</span>
+      <span v-show="false">{{ showValue2 }}</span>
     </el-input>
   </form-item-wrapper>
 </template>
 
 <script>
-import FormItemWrapper from './form-item-wrapper'
-import emitter from '../../../../../components/xform/utils/emitter'
-import i18n from "../../../../../components/xform/utils/i18n";
-import {deepClone} from "../../../../../components/xform/utils/util";
-import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
+import mixins from "@base/components/xform/form-designer/form-widget/field-widget/mixins/vabsearch-mixin";
 
 export default {
   name: "vabsearch-widget",
   componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
-  mixins: [emitter, fieldMixin, i18n],
-  props: {
-    field: Object,
-    parentWidget: Object,
-    parentList: Array,
-    indexOfParentList: Number,
-    designer: Object,
-
-    designState: {
-      type: Boolean,
-      default: false
-    },
-    columnConfig: {
-      type: Object,
-      default: null
-    },
-    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
-      type: Number,
-      default: -1
-    },
-    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
-      type: Number,
-      default: -1
-    },
-    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
-      type: String,
-      default: ''
-    }
-  },
-  components: {
-    FormItemWrapper
-  },
-  data() {
-    let multipleChoices = this.field.options.multipleChoices || false;
-    let defaultValue = !multipleChoices ? null : [];
-    return {
-      oldFieldValue: defaultValue, //field组件change之前的值
-      fieldModel: defaultValue,
-      showValue2: null,
-      rules: [],
-      showSearchialog: false,
-      dialogContent: null,
-      showSysSearchialog: false,
-      systemDialogParam: {},
-      showVformDialog: false,
-      code: null,
-      formDialogOption: {}
-    }
-  },
-  watch: {
-    fieldModel(val) {
-      this.handleChangeEvent(val);
-    },
-    showValue(val) {
-      this.setShowValue(val);
-    }
-  },
-  computed: {
-    showValue() {
-      let currentData = this.currentData;
-      let fieldKeyName = this.fieldKeyName;
-      let vabSearchName = this.field.options.vabSearchName;
-      let multipleChoices = this.field.options.multipleChoices || false;
-      let labelField = this.field.options.vabSearchName || fieldKeyName;
-      let value = null;
-      if (!multipleChoices) {
-        value = currentData[labelField] ?? null;
-      } else {
-        if (this.fieldModel) {
-          value = this.fieldModel.map(item => item[labelField]).join(",");
-        }
-      }
-      this.showValue2 = value;
-      return value
-    },
-    tableRow() {
-      let tableParam = this.tableParam;
-      return tableParam && tableParam.row ? tableParam.row : null;
-    },
-    currentData() {
-      let tableParam = this.tableParam;
-      return tableParam && tableParam.row ? tableParam.row : this.formModel;
-    }
-  },
-  beforeCreate() {
-    /* 这里不能访问方法和属性！！ */
-  },
-
-  created() {
-    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
-       需要在父组件created中初始化！！ */
-    if (this.field.options.readonly == undefined) {
-      this.$set(this.field.options, "readonly", true);
-    }
-    this.initFieldModel()
-    this.registerToRefList()
-    this.initEventHandler()
-    this.buildFieldRules()
-
-    this.handleOnCreated()
-    // this.initValue();
-  },
-
-  mounted() {
-    this.handleOnMounted()
-
-  },
-
-  beforeDestroy() {
-    this.unregisterFromRefList()
-  },
-  methods: {
-    setShowValue(val = null) {
-      let multipleChoices = this.field.options.multipleChoices || false;
-      if (!multipleChoices) {
-        let fieldKeyName = this.fieldKeyName;
-        let labelField = this.field.options.vabSearchName || fieldKeyName;
-        // this.$set(this.currentData, labelField, val)
-
-        this.currentData[labelField] = val
-        this.showValue2 = val;
-      }
-    },
-    setValue: function (e) {
-      if (this.field.formItemFlag) {
-        let data = this.tableRow || this.formModel;
-        var t = deepClone(this.fieldModel);
-        this.fieldModel = e,
-          this.initFileList(),
-          this.syncUpdateFormModel(e),
-          this.emitFieldDataChange(e, t);
-      }
-    },
-    clearHandle() {
-      let multipleChoices = this.field.options.multipleChoices || false;
-      let defaultValue = !multipleChoices ? null : [];
-      this.setShowValue(null)
-      this.setValue(defaultValue)
-      if (this.field.options.onSearchClear) {
-        let tableParam = this.tableParam;
-        let eventParamNames = [];
-        let eventParamValues = [];
-        if (tableParam) {
-          eventParamNames = ['rowData', 'rowIndex'];
-          eventParamValues = [tableParam.row, tableParam.rowIndex];
-        }
-        this.handleCustomEvent(this.field.options.onSearchClear, eventParamNames, eventParamValues)
-
-        /* var e = new Function(this.field.options.onSearchClear);
-         e.call(this);*/
-      }
-      this.handleClearSearchDialog();
-    },
-    changeShowValue2(val) {
-      if (this.field.options.readonly === false) {
-        let multipleChoices = this.field.options.multipleChoices || false;
-        if (!multipleChoices) {
-          let fieldKeyName = this.fieldKeyName;
-          let vabSearchName = this.field.options.vabSearchName;
-          let labelField = this.field.options.vabSearchName || fieldKeyName;
-          this.currentData[labelField] = val;
-        }
-      }
-    }
-  }
+  mixins: [mixins],
 }
 </script>
 

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

@@ -1,35 +1,58 @@
 <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">
+  <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"
+  >
     <div id="uploadImage" class="upload-img" v-if="designState">
-      <div class="el-upload el-upload--picture" style="vertical-align: middle;display: inline-block;float:left">
-        <button type="button" class=" avatar-uploader">
+      <div
+        class="el-upload el-upload--picture"
+        style="vertical-align: middle; display: inline-block; float: left"
+      >
+        <button type="button" class="avatar-uploader">
           <i class="el-icon-plus avatar-uploader-icon"></i>
         </button>
       </div>
     </div>
-    <baseUpload accept="file" :file.sync="fieldModel" :hidePasteArea.sync="isH5"
-                :uploadDialogCustomClass="isH5?'dialog-upload-h5':null" :pickPrivateProfile="false"
-                :multi.sync="multi"
-                :limit.sync="limit"
-                resultType="Array"
-                :edit="!field.options.disabled"
-                @callback="submitFile"
-                v-else></baseUpload>
+    <baseUpload
+      accept="file"
+      :file.sync="fieldModel"
+      :hidePasteArea.sync="isH5"
+      :uploadDialogCustomClass="isH5 ? 'dialog-upload-h5' : null"
+      :pickPrivateProfile="false"
+      :multi="field.options.limit !== 1"
+      :limit="field.options.limit"
+      resultType="Array"
+      :edit="!field.options.disabled"
+      :remove="!field.options.hideRemoveButton"
+      @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>
 
 <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: "vabUpload-widget",
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -40,50 +63,44 @@ 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', 'getFormConfig'],
+  inject: ["refList", "globalOptionData", "globalModel", "getFormConfig"],
   data() {
     return {
       oldFieldValue: [], //field组件change之前的值
       fieldModel: [],
       rules: [],
-      isH5: false
-    }
+      isH5: false,
+    };
   },
   watch: {
     fieldModel(val) {
       this.handleChangeEvent(val);
-    }
+    },
   },
   computed: {
     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() {
     /* 这里不能访问方法和属性！！ */
@@ -93,26 +110,26 @@ export default {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
 
-    this.isH5 = this.getFormConfig().layoutType === 'H5';
+    this.isH5 = this.getFormConfig().layoutType === "H5";
 
-    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: {
     setValue(val) {
-      let data = val || []
+      let data = val || [];
       this.fieldModel = data;
       this.getFormRef().formDataModel[this.fieldKeyName] = data;
     },
@@ -122,10 +139,12 @@ export default {
       let reportTemplate = this.getFormRef().reportTemplate;
       let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
-      let scriptCode = this.field.options.formScriptCode || "getList"
+      let scriptCode = this.field.options.formScriptCode || "getList";
       if (!scriptCode) return;
       if (dataId) {
-        let accessParam = this.handleCustomEvent(this.field.options.formScriptParam)
+        let accessParam = this.handleCustomEvent(
+          this.field.options.formScriptParam
+        );
         return this.formHttp({
           // url: "/" + reportTemplate.serviceName + "/form_ins/getList",
           scriptCode: scriptCode,
@@ -135,21 +154,125 @@ export default {
             taBm: this.fieldKeyName,
             data: {
               ...accessParam,
-              id: dataId
-            }
+              id: dataId,
+            },
           },
-          callback: res => {
+          callback: (res) => {
             let rows = res.objx || [];
-            this.setValue(rows)
-          }
+            this.setValue(rows);
+            this.handleCustomEvent(
+              this.field.options.formScriptSuccess,
+              ["res"],
+              [res]
+            );
+          },
         });
       }
     },
     submitFile(rows, fileInfos) {
-      this.handlLineCode(fileInfos);
-      this.field.options.onAfterConfirmFile && this.field.options.onAfterConfirmFile(rows, fileInfos);
+      // this.handlLineCode(fileInfos);
+      let eventParamNames = ["attachments", "fileInfos"];
+      let eventParamValues = [rows, fileInfos];
+      this.handleCustomEvent(
+        this.field.options.onAfterConfirmFile,
+        eventParamNames,
+        eventParamValues
+      );
     },
-    handlLineCode(fileInfos) {
+    setValueByUrl(fileUrl) {
+      let value = [];
+      if (fileUrl) {
+        let row = this.parseFileUrl(fileUrl);
+        if (row) {
+          value.push(row);
+        }
+      }
+      this.setValue(value);
+    },
+    parseFileUrl(fileUrl) {
+      if (!fileUrl) return null;
+      let result = null;
+
+      // 输入校验
+      if (typeof fileUrl !== "string") {
+        throw new TypeError("输入必须是字符串格式");
+      }
+      if (!fileUrl.trim()) {
+        throw new Error("URL不能为空");
+      }
+
+      // 基本URL格式验证
+      const urlRegex =
+        /^(https?:\/\/)?([\w.-]+)(:\d+)?(\/[^?#]*)?(\?[^#]*)?(#.*)?$/i;
+      if (!urlRegex.test(fileUrl)) {
+        throw new Error("无效的URL格式");
+      }
+
+      // 提取域名部分
+      const domainRegex = /^(https?:\/\/[^\/]+)/i;
+      const domainMatch = fileUrl.match(domainRegex);
+      if (!domainMatch) {
+        throw new Error("URL缺少协议或域名部分");
+      }
+      const domain = domainMatch[0];
+
+      // 提取完整路径
+      const url = fileUrl.substring(domain.length);
+      if (!url || url === "/") {
+        throw new Error("URL缺少文件路径部分");
+      }
+
+      // 提取带扩展名的文件名
+      const filenameRegex = /[^\/]+$/;
+      const filenameMatch = url.match(filenameRegex);
+      if (!filenameMatch) {
+        throw new Error("无法从路径中提取文件名");
+      }
+      const fullFilename = filenameMatch[0];
+
+      // 验证文件名格式（至少1字符+扩展名）
+      const nameFormat = /^.+\..+$/;
+      if (!nameFormat.test(fullFilename)) {
+        throw new Error(`无效的文件名格式: ${fullFilename}`);
+      }
+
+      // 修复点：更可靠的文件名和扩展名分离
+      const lastDotIndex = fullFilename.lastIndexOf(".");
+      const filenameBase = fullFilename.substring(0, lastDotIndex); // 点之前部分
+      const extension = fullFilename.substring(lastDotIndex + 1).toLowerCase(); // 点之后部分
+
+      // 扩展名验证
+      /* const validExtensions = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'svg', 'bmp'];
+    if (!validExtensions.includes(extension)) {
+      throw new Error(`不支持的扩展名类型: ${extension}`);
+    } */
+
+      let thumbnail = null,
+        large = null,
+        medium = null,
+        source = null;
+      if (this.$commonFileUtil.isPicture(extension)) {
+        thumbnail = url;
+        large = url;
+        medium = url;
+        source = url;
+      }
+
+      result = {
+        extension,
+        domain,
+        url,
+        thumbnail,
+        large,
+        medium,
+        source,
+        name: fullFilename,
+      };
+
+      // 返回结构化对象
+      return result;
+    },
+    /*handlLineCode(fileInfos) {
       let allPromise = [];
       fileInfos.forEach(async fileInfo => {
         await this.processFile(fileInfo.file, (lineCode) => {
@@ -176,7 +299,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 +328,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)
@@ -220,9 +343,9 @@ export default {
     handleError(errorMessage) {
       this.error = errorMessage;
       this.loading = false;
-    },
-  }
-}
+    },*/
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -233,17 +356,19 @@ export default {
 }
 
 .hideUploadDiv {
-  ::v-deep div.el-upload--picture-card { /* 隐藏最后的图片上传按钮 */
+  ::v-deep div.el-upload--picture-card {
+    /* 隐藏最后的图片上传按钮 */
     display: none;
   }
 
-  ::v-deep div.el-upload--text { /* 隐藏最后的文件上传按钮 */
+  ::v-deep div.el-upload--text {
+    /* 隐藏最后的文件上传按钮 */
     display: none;
   }
 
-  ::v-deep div.el-upload__tip { /* 隐藏最后的文件上传按钮提示 */
+  ::v-deep div.el-upload__tip {
+    /* 隐藏最后的文件上传按钮提示 */
     display: none;
   }
 }
-
 </style>