cloud-web-corejs 1.0.127 → 1.0.129

package/package.json

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

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

@@ -1,41 +1,57 @@
 <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="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>
+    <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"
+      @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,
@@ -46,44 +62,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;
-    }
+    },
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -93,26 +109,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 +138,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,22 +153,123 @@ export default {
             taBm: this.fieldKeyName,
             data: {
               ...accessParam,
-              id: dataId
-            }
+              id: dataId,
+            },
           },
-          callback: res => {
+          callback: (res) => {
             let rows = res.objx || [];
-            this.setValue(rows)
-            this.handleCustomEvent(this.field.options.formScriptSuccess,['res'],[res]);
-          }
+            this.setValue(rows);
+            this.handleCustomEvent(
+              this.field.options.formScriptSuccess,
+              ["res"],
+              [res]
+            );
+          },
         });
       }
     },
     submitFile(rows, fileInfos) {
       // this.handlLineCode(fileInfos);
-      let eventParamNames = ['attachments', 'fileInfos'];
+      let eventParamNames = ["attachments", "fileInfos"];
       let eventParamValues = [rows, fileInfos];
-      this.handleCustomEvent(this.field.options.onAfterConfirmFile, eventParamNames, eventParamValues)
+      this.handleCustomEvent(
+        this.field.options.onAfterConfirmFile,
+        eventParamNames,
+        eventParamValues
+      );
+    },
+    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 = [];
@@ -224,8 +343,8 @@ export default {
       this.error = errorMessage;
       this.loading = false;
     },*/
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -236,17 +355,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>

package/src/components/xform/form-render/container-item/data-table-item.vue

@@ -206,15 +206,18 @@
           </component>
         </template>-->
     <template #widget="obj">
-      <template
-        v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY] && fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id]">
+      <template v-if="!!getTableColumnWidget(obj)">
         <template v-if="obj.column.params.widget.type == 'status'">
-          <template
-            v-for="(item,index) in fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id].options.statusParam">
-            <span
-              v-if="obj.row[getFieldKeyName(fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id])]===item.value"
-              :key="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id].id+'-'+index" class="list-tag"
-              :class="item.type">{{ getI18nLabel(item.label) }}</span>
+          <template v-for="(item,index) in getTableColumnWidget(obj).options.statusParam">
+            <template v-if="isShowColumnStatusWidget(obj,item)">
+              <span
+              v-if="getTableColumnWidget(obj).options.formScriptEnabled || getTableColumnWidget(obj).options.commonAttributeEnabled"
+              :key="getTableColumnWidget(obj).id+'-'+index">{{ getI18nLabel(item[getTableColumnStatusWidgetLabelKey(obj)]) }}</span>
+              <span
+              v-else
+              :key="getTableColumnWidget(obj).id+'-'+index" class="list-tag"
+              :class="item.type">{{ getI18nLabel(item[getTableColumnStatusWidgetLabelKey(obj)]) }}</span>
+            </template>
           </template>
         </template>
         <component
@@ -242,7 +245,7 @@
       <div>
         <template v-for="(fieldWidget,index) in obj.column.params.widgetList">
           <component
-            v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY]"
+            v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY] && !!obj.row._X_ROW_KEY"
             :is="getColumnWidgetName(fieldWidget)"
             v-bind="getRowWidgetOption(obj,fieldWidget)"
             :form-model="globalModel.formModel"
@@ -252,7 +255,7 @@
             :columnConfig="obj.column.params.columnConfig"
             :subFormRowIndex="obj.rowIndex"
             :subFormRowId="obj.row._X_ROW_KEY"
-            formItemProp="false"
+            :formItemProp="getColumnProp2(fieldWidget, obj)"
             :tableParam="obj"
           >
             <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">