cloud-web-corejs 1.0.54-dev.780 → 1.0.54-dev.781

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.780",
+  "version": "1.0.54-dev.781",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",

package/src/components/VabUpload/index.vue

@@ -63,6 +63,9 @@
             {{
               $t2('注意：当前所有文件上传完，才允许确定操作，单个文件上传大小，请尽量小于100MB。', 'components.VabUpload.tip2')
             }}
+            <template v-if="allowedFileTypesText">{{
+                $t2('仅支持上传以下格式：', 'components.VabUpload.fileTypesTip')
+              }}{{ allowedFileTypesText }}</template>
             <div class="upload-count fr">
               <div>{{ $t2('总数', 'components.VabUpload.total') }}：<span>{{ totalQuantity }}</span></div>
               <div>{{ $t2('成功', 'components.VabUpload.success') }}：<span>{{ successQuantity }}</span></div>
@@ -90,7 +93,7 @@
             :on-remove="handleRemove"
             :on-success="handleSuccess"
             :before-upload="handleBeforeUpload"
-            :accept="accept"
+            :accept="uploadAccept"
             class="upload-demo"
             list-type="picture"
           >

package/src/components/VabUpload/mixins.js

@@ -28,14 +28,22 @@ tmixins = {
       type: Number,
       default: () => 100000,
     },
+    /* 单个文件大小限制(MB)，0 表示不限制 */
     size: {
       type: Number,
-      default: 200,
+      default: () => {
+        return settingConfig.uploadFileSize ?? 200;
+      },
     },
     accept: {
       type: String,
       default: "file",
     },
+    /* 允许上传的文件格式，数组或逗号分隔字符串，如 ['doc','xlsx'] / 'doc,xlsx'；为空表示不限制 */
+    fileTypes: {
+      type: [Array, String],
+      default: () => [],
+    },
     chunkSize: {
       type: Number,
       default: 5, //5MB
@@ -147,8 +155,55 @@ tmixins = {
       }
       return isMulti;
     },
+    /* 允许上传的文件后缀（小写、去掉点号），为空数组表示不限制 */
+    allowedFileTypes() {
+      let types = this.fileTypes;
+      if (typeof types === "string") {
+        types = types.split(",");
+      }
+      if (!Array.isArray(types)) {
+        return [];
+      }
+      return types
+        .map((type) => String(type).trim().replace(/^\./, "").toLowerCase())
+        .filter((type) => !!type);
+    },
+    /* 限制了上传格式时用后缀列表覆盖 accept，未限制则沿用外部传入的 accept */
+    uploadAccept() {
+      let types = this.allowedFileTypes;
+      if (!types.length) {
+        return this.accept;
+      }
+      return types.map((type) => "." + type).join(",");
+    },
+    allowedFileTypesText() {
+      return this.allowedFileTypes.join("、");
+    },
   },
   methods: {
+    /* 校验文件后缀是否在允许的上传格式内，未配置格式时一律通过 */
+    checkFileType(file) {
+      let types = this.allowedFileTypes;
+      if (!types.length) {
+        return true;
+      }
+      let suffix = this.$commonFileUtil.getFileSuffix(file.name || "");
+      return types.indexOf(suffix) > -1;
+    },
+    showFileTypeError(fileName) {
+      this.$message({
+        message: this.$t2(
+          "文件[" + fileName + "]格式不支持，仅允许" + this.allowedFileTypesText,
+          "components.VabUpload.warnMsg4",
+          {
+            fileName: fileName,
+            fileTypes: this.allowedFileTypesText,
+          }
+        ),
+        type: "error",
+        duration: 3 * 1000,
+      });
+    },
     openFileLibraryDialog() {
       this.$openFileLibraryDialog({
         prefix: this.storeAreaPrefix,
@@ -220,8 +275,19 @@ tmixins = {
       // this.show = true
     },
     handleChange(file, fileList) {
+      /* 格式校验只针对仍在列表中的文件，removeFile 移除后也会回调本方法，不能重复报错 */
+      if (fileList.indexOf(file) > -1 && !this.checkFileType(file)) {
+        fileList.splice(fileList.indexOf(file), 1);
+        this.fileList = fileList;
+        this.showFileTypeError(file.name);
+        if (file.raw) {
+          file.raw.status = "fail";
+        }
+        return false;
+      }
+      /* size 为 0（或未配置限制）时不做大小校验 */
       let maxSize = this.size * 1024 * 1024;
-      if (file.size > maxSize) {
+      if (maxSize > 0 && file.size > maxSize) {
         fileList.map((item, index) => {
           if (item === file) {
             fileList.splice(index, 1);
@@ -1034,6 +1100,14 @@ tmixins = {
 
       let newFiles = rows
         .filter((row) => !row.dirs && !sourceSns.includes(row.sn))
+        .filter((row) => {
+          /* 文件库/个人文档选来的文件不走 el-upload，需在此处补做格式校验 */
+          if (this.checkFileType({ name: row.fileName })) {
+            return true;
+          }
+          this.showFileTypeError(row.fileName);
+          return false;
+        })
         .map((row) => {
           let item = {
             status: "success",
@@ -1251,14 +1325,22 @@ tViewMixins = {
       type: Number,
       default: 100000,
     },
+    /* 单个文件大小限制(MB)，0 表示不限制 */
     size: {
       type: Number,
-      default: 200,
+      default: () => {
+        return settingConfig.uploadFileSize ?? 200;
+      },
     },
     accept: {
       type: String,
       default: "file",
     },
+    /* 允许上传的文件格式，数组或逗号分隔字符串，如 ['doc','xlsx'] / 'doc,xlsx'；为空表示不限制 */
+    fileTypes: {
+      type: [Array, String],
+      default: () => [],
+    },
     chunkSize: {
       type: Number,
       default: 5, //5MB
@@ -1415,6 +1497,7 @@ tViewMixins = {
         limit: this.limit,
         multi: this.multi,
         accept: this.accept ? this.accept : "file",
+        fileTypes: this.fileTypes,
         auto: this.auto,
         size: this.fileMaxSize,
         chunkSize: this.chunkSize,

package/src/components/obsUpload/index.vue

@@ -63,6 +63,9 @@
             {{
               $t2('注意：当前所有文件上传完，才允许确定操作，单个文件上传大小，请尽量小于100MB。', 'components.VabUpload.tip2')
             }}
+            <template v-if="allowedFileTypesText">{{
+                $t2('仅支持上传以下格式：', 'components.VabUpload.fileTypesTip')
+              }}{{ allowedFileTypesText }}</template>
             <div class="upload-count fr">
               <div>{{ $t2('总数', 'components.VabUpload.total') }}：<span>{{ totalQuantity }}</span></div>
               <div>{{ $t2('成功', 'components.VabUpload.success') }}：<span>{{ successQuantity }}</span></div>
@@ -90,7 +93,7 @@
             :on-remove="handleRemove"
             :on-success="handleSuccess"
             :before-upload="handleBeforeUpload"
-            :accept="accept"
+            :accept="uploadAccept"
             class="upload-demo"
             list-type="picture"
           >

package/src/components/obsUpload/mixins.js

@@ -28,14 +28,22 @@ tmixins = {
       type: Number,
       default: () => 100000,
     },
+    /* 单个文件大小限制(MB)，0 表示不限制 */
     size: {
       type: Number,
-      default: 200,
+      default: () => {
+        return settingConfig.uploadFileSize ?? 200;
+      },
     },
     accept: {
       type: String,
       default: "file",
     },
+    /* 允许上传的文件格式，数组或逗号分隔字符串，如 ['doc','xlsx'] / 'doc,xlsx'；为空表示不限制 */
+    fileTypes: {
+      type: [Array, String],
+      default: () => [],
+    },
     chunkSize: {
       type: Number,
       default: 5, //5MB
@@ -138,8 +146,55 @@ tmixins = {
       }
       return isMulti;
     },
+    /* 允许上传的文件后缀（小写、去掉点号），为空数组表示不限制 */
+    allowedFileTypes() {
+      let types = this.fileTypes;
+      if (typeof types === "string") {
+        types = types.split(",");
+      }
+      if (!Array.isArray(types)) {
+        return [];
+      }
+      return types
+        .map((type) => String(type).trim().replace(/^\./, "").toLowerCase())
+        .filter((type) => !!type);
+    },
+    /* 限制了上传格式时用后缀列表覆盖 accept，未限制则沿用外部传入的 accept */
+    uploadAccept() {
+      let types = this.allowedFileTypes;
+      if (!types.length) {
+        return this.accept;
+      }
+      return types.map((type) => "." + type).join(",");
+    },
+    allowedFileTypesText() {
+      return this.allowedFileTypes.join("、");
+    },
   },
   methods: {
+    /* 校验文件后缀是否在允许的上传格式内，未配置格式时一律通过 */
+    checkFileType(file) {
+      let types = this.allowedFileTypes;
+      if (!types.length) {
+        return true;
+      }
+      let suffix = this.$commonFileUtil.getFileSuffix(file.name || "");
+      return types.indexOf(suffix) > -1;
+    },
+    showFileTypeError(fileName) {
+      this.$message({
+        message: this.$t2(
+          "文件[" + fileName + "]格式不支持，仅允许" + this.allowedFileTypesText,
+          "components.VabUpload.warnMsg4",
+          {
+            fileName: fileName,
+            fileTypes: this.allowedFileTypesText,
+          }
+        ),
+        type: "error",
+        duration: 3 * 1000,
+      });
+    },
     updateUploadingStatus() {
       var target = this.$refs.upload;
       let uploading, hasReadyFile;
@@ -185,8 +240,19 @@ tmixins = {
       // this.show = true
     },
     handleChange(file, fileList) {
+      /* 格式校验只针对仍在列表中的文件，removeFile 移除后也会回调本方法，不能重复报错 */
+      if (fileList.indexOf(file) > -1 && !this.checkFileType(file)) {
+        fileList.splice(fileList.indexOf(file), 1);
+        this.fileList = fileList;
+        this.showFileTypeError(file.name);
+        if (file.raw) {
+          file.raw.status = "fail";
+        }
+        return false;
+      }
+      /* size 为 0（或未配置限制）时不做大小校验 */
       let maxSize = this.size * 1024 * 1024;
-      if (file.size > maxSize) {
+      if (maxSize > 0 && file.size > maxSize) {
         fileList.map((item, index) => {
           if (item === file) {
             fileList.splice(index, 1);

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

@@ -138,6 +138,7 @@ export default {
         showViewButton: this.field.options.showViewButton !== false,
         uploadConfig: {
           limit: this.field.options.limit,
+          fileTypes: this.field.options.fileTypes || [],
           resultType: "Array"
         },
         rows: (done) => {

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

@@ -29,6 +29,7 @@
       :pickPrivateProfile="false"
       :multi="field.options.limit !== 1"
       :limit="field.options.limit"
+      :fileTypes="field.options.fileTypes || []"
       resultType="Array"
       :edit="!field.options.disabled"
       :remove="!field.options.hideRemoveButton"

package/src/components/xform/form-designer/setting-panel/property-editor/field-baseAttachment/baseAttachment-fileTypes-editor.vue

@@ -0,0 +1,23 @@
+<template>
+  <file-types-select :option-model="optionModel"></file-types-select>
+</template>
+
+<script>
+  import FileTypesSelect from "../fileTypesSelect.vue"
+
+  export default {
+    name: "baseAttachment-fileTypes-editor",
+    components: {
+      FileTypesSelect,
+    },
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-vabUpload/vabUpload-fileTypes-editor.vue

@@ -0,0 +1,23 @@
+<template>
+  <file-types-select :option-model="optionModel"></file-types-select>
+</template>
+
+<script>
+  import FileTypesSelect from "../fileTypesSelect.vue"
+
+  export default {
+    name: "vabUpload-fileTypes-editor",
+    components: {
+      FileTypesSelect,
+    },
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/fileTypesEditorMixin.js

@@ -0,0 +1,116 @@
+/**
+ * 上传格式属性编辑器的共用逻辑。
+ *
+ * 存储格式仍是扁平的后缀数组（如 ['jpg','png','mp4']），分类只是勾选时的快捷方式：
+ * 勾"图片"等于把该分类下的后缀一次性并入，取消勾选则整组移除。这样运行期的格式
+ * 校验与 accept 生成都不必感知分类，已保存的老表单里的后缀数组也能原样沿用。
+ */
+
+/* 每个分类内的后缀顺序即下拉分组里的展示顺序 */
+export const FILE_TYPE_CATEGORIES = [
+  {
+    value: "image",
+    labelKey: "designer.setting.fileTypeCategory.image",
+    types: ["jpg", "jpeg", "png", "gif", "bmp", "webp", "svg"],
+  },
+  {
+    value: "video",
+    labelKey: "designer.setting.fileTypeCategory.video",
+    types: ["mp4", "avi", "mov", "wmv", "flv", "mkv", "rmvb"],
+  },
+  {
+    value: "audio",
+    labelKey: "designer.setting.fileTypeCategory.audio",
+    types: ["mp3", "wav", "wma", "aac", "flac"],
+  },
+  {
+    value: "word",
+    labelKey: "designer.setting.fileTypeCategory.word",
+    types: ["doc", "docx"],
+  },
+  {
+    value: "excel",
+    labelKey: "designer.setting.fileTypeCategory.excel",
+    types: ["xls", "xlsx", "csv"],
+  },
+  {
+    value: "ppt",
+    labelKey: "designer.setting.fileTypeCategory.ppt",
+    types: ["ppt", "pptx"],
+  },
+  {
+    value: "pdf",
+    labelKey: "designer.setting.fileTypeCategory.pdf",
+    types: ["pdf"],
+  },
+  {
+    value: "text",
+    labelKey: "designer.setting.fileTypeCategory.text",
+    types: ["txt"],
+  },
+  {
+    value: "archive",
+    labelKey: "designer.setting.fileTypeCategory.archive",
+    types: ["zip", "rar", "7z", "tar", "gz"],
+  },
+];
+
+export default {
+  computed: {
+    fileTypeCategories() {
+      return FILE_TYPE_CATEGORIES.map((category) => {
+        return {
+          ...category,
+          label: this.i18nt(category.labelKey),
+        };
+      });
+    },
+    selectedFileTypes: {
+      get() {
+        return this.optionModel.fileTypes || [];
+      },
+      set(value) {
+        /* 老表单可能没有 fileTypes 键，用 $set 保证可响应 */
+        this.$set(this.optionModel, "fileTypes", this.normalizeFileTypes(value));
+      },
+    },
+  },
+  methods: {
+    /* 允许手工输入，统一成小写、去点号、去重的后缀 */
+    normalizeFileTypes(value) {
+      let result = [];
+      (value || []).forEach((item) => {
+        let fileType = String(item).trim().replace(/^\./, "").toLowerCase();
+        if (!!fileType && result.indexOf(fileType) < 0) {
+          result.push(fileType);
+        }
+      });
+      return result;
+    },
+    isCategoryChecked(category) {
+      let selected = this.selectedFileTypes;
+      return category.types.every((fileType) => {
+        return selected.indexOf(fileType) > -1;
+      });
+    },
+    isCategoryIndeterminate(category) {
+      if (this.isCategoryChecked(category)) {
+        return false;
+      }
+      let selected = this.selectedFileTypes;
+      return category.types.some((fileType) => {
+        return selected.indexOf(fileType) > -1;
+      });
+    },
+    toggleCategory(category, checked) {
+      let selected = this.selectedFileTypes;
+      if (checked) {
+        this.selectedFileTypes = [...selected, ...category.types];
+      } else {
+        this.selectedFileTypes = selected.filter((fileType) => {
+          return category.types.indexOf(fileType) < 0;
+        });
+      }
+    },
+  },
+};

package/src/components/xform/form-designer/setting-panel/property-editor/fileTypesSelect.vue

@@ -0,0 +1,130 @@
+<template>
+  <!-- 分类勾选行放不进 120px 标签剩下的宽度里，故整块用 label-width="0" 占满属性面板 -->
+  <el-form-item class="file-types-item" label-width="0">
+    <div class="file-types-title">{{i18nt('designer.setting.fileTypes')}}
+      <el-tooltip effect="light" :content="i18nt('designer.setting.fileTypesCategoryHelp')">
+        <i class="el-icon-info"></i></el-tooltip>
+    </div>
+    <div class="file-types-category">
+      <el-checkbox v-for="category in fileTypeCategories"
+                   :key="category.value"
+                   :value="isCategoryChecked(category)"
+                   :indeterminate="isCategoryIndeterminate(category)"
+                   @change="toggleCategory(category, $event)">{{ category.label }}</el-checkbox>
+    </div>
+    <div class="file-types-select">
+      <el-select ref="fileTypesSelect" multiple allow-create filterable default-first-option clearable
+                 :placeholder="i18nt('designer.setting.fileTypesPlaceholder')"
+                 v-model="selectedFileTypes" style="width: 100%">
+        <el-option-group v-for="category in fileTypeCategories"
+                         :key="category.value"
+                         :label="category.label">
+          <el-option v-for="fileType in category.types"
+                     :key="fileType"
+                     :label="fileType"
+                     :value="fileType">
+          </el-option>
+        </el-option-group>
+      </el-select>
+    </div>
+  </el-form-item>
+</template>
+
+<script>
+  import i18n from "../../../../../components/xform/utils/i18n"
+  import fileTypesEditorMixin from "./fileTypesEditorMixin"
+
+  export default {
+    name: "file-types-select",
+    mixins: [i18n, fileTypesEditorMixin],
+    props: {
+      optionModel: Object,
+    },
+    mounted() {
+      /*
+       * el-select 标签区的 max-width 是挂载那一刻按控件宽度算出来的内联样式，
+       * 这个编辑器常常挂载在还没完成布局的属性弹窗里，算出来的值偏小，
+       * 标签就会溢出到输入框外面。等布局稳定后让它重算一次。
+       */
+      this.$nextTick(() => {
+        let select = this.$refs.fileTypesSelect
+        if (!!select && !!select.resetInputWidth) {
+          select.resetInputWidth()
+        }
+      })
+    },
+  }
+</script>
+
+<style scoped>
+  .file-types-title {
+    color: #606266;
+    line-height: 22px;
+  }
+
+  .file-types-category {
+    margin-bottom: 4px;
+    line-height: 22px;
+  }
+
+  /* 独立的 el-checkbox 默认没有间距，且标签会跟着换行错位 */
+  .file-types-category .el-checkbox {
+    margin-right: 10px;
+  }
+
+  /*
+   * 全局样式表 src/resources/css/style.scss 里对 .el-form-item__content / .el-input
+   * 有大量固定宽度和 display 的 !important 覆盖，属性面板这一处正好被波及：
+   * 外面的 el-select 撑开了，里面画边框的 .el-input__inner 却还是窄的，
+   * 于是标签溢出到框外。这里从内容区一路 !important 压到最内层的 input。
+   */
+  .file-types-item ::v-deep .el-form-item__content {
+    display: block !important;
+    width: auto !important;
+    margin-left: 0 !important;
+    float: none;
+  }
+
+  .file-types-select {
+    display: block;
+    width: auto;
+  }
+
+  .file-types-select ::v-deep .el-select {
+    display: block !important;
+    width: 100% !important;
+  }
+
+  .file-types-select ::v-deep .el-select .el-input,
+  .file-types-select ::v-deep .el-select .el-input__inner {
+    width: 100% !important;
+  }
+
+  /*
+   * el-select 的标签区是绝对定位盖在输入框上的兄弟节点，max-width 为挂载时按控件
+   * 宽度算出的内联值；弹窗里挂载时控件还没有宽度，这个值会偏小导致标签溢出到框外。
+   * 这里用 !important 盖掉内联值，但必须和 element 一样留出右侧 32px：
+   * 清空按钮的显隐挂在 el-input 的 mouseenter/mouseleave 上，标签层一旦盖住图标区，
+   * 鼠标移过去就会触发 el-input 的 mouseleave，图标随即消失。
+   */
+  .file-types-select ::v-deep .el-select__tags {
+    max-width: calc(100% - 32px) !important;
+    /*
+     * 标签层整体对鼠标透明：清空按钮的显隐挂在 el-input 的 mouseenter/mouseleave 上，
+     * 而标签层是盖在输入框上的兄弟节点，凡是它盖住的地方 hover 都算不到 el-input 头上，
+     * 清空按钮就只在没被盖住的图标区才出现。
+     */
+    pointer-events: none;
+  }
+
+  /* 标签上的删除按钮和手工输入框仍要能点 */
+  .file-types-select ::v-deep .el-select__tags .el-tag__close,
+  .file-types-select ::v-deep .el-select__input {
+    pointer-events: auto;
+  }
+
+  /* 手工输入用的内联 input 同样带着按旧宽度算出的内联 max-width，同样留出图标区 */
+  .file-types-select ::v-deep .el-select__input {
+    max-width: calc(100% - 42px) !important;
+  }
+</style>

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -2942,6 +2942,7 @@ export const advancedFields = [
       labelWidth: null,
       labelHidden: !0,
       limit: null,
+      fileTypes: [],
       hideRemoveButton: false,
       accessType: "1",
       entityTableCode: null,
@@ -2960,12 +2961,14 @@ export const advancedFields = [
       showRuleEnabled: 1,
       showRules: [],
 
-      hiddenFileInfo: false,
-      hiddenFileName: false,
+      /* 键名须与 field-vabUpload-editor、vabUpload-widget 读取的一致；
+         早期的 hiddenFileInfo/hiddenFileName/widgetSize 无处读取，已改名 */
+      hideFileInfo: false,
+      hideFileName: false,
       showFileSize: false,
       showFileCreateBy: false,
       showFileCreateDate: false,
-      widgetSize: 2,
+      fileShowImageSize: 2,
 
       customUploadEnabled: false,
       uploadUrl: null,
@@ -3468,6 +3471,7 @@ export const advancedFields = [
       labelWidth: null,
       labelHidden: !0,
       limit: null,
+      fileTypes: [],
       showViewButton: true,
       accessType: "1",
       entityTableCode: null,

package/src/components/xform/form-render/indexMixin.js

@@ -4020,30 +4020,53 @@ modules = {
             let treeTaBm = newFormData.treeTaBm || [];
             treeTaBm.push(formTemplateTableDTO.tableAlias);
             newFormData.treeTaBm = treeTaBm;
+            // 树的主键以 treeConfig.rowField 为准：transform 模式下 vxe 是用它
+            // (xe-utils toArrayTree 的 key) 建树的，根节点判定必须与之同源，
+            // 否则判出来的顶层节点和表格里的实际层级对不上。
+            let idField = $grid.treeConfig.rowField || "id";
             let tableDatas = this.$baseLodash.cloneDeep(
               formDataModel[formTemplateTableDTO.name] || []
             );
+            // 根节点判定必须在下面清空临时 id 之前完成：新增子行的父 id 是
+            // "row_xxx"，清空后变成空值，之后再判定就会被误判成根节点，既提交成
+            // 顶层节点又已嵌在父行的 children 里，造成重复与层级错乱。
+            // 判定口径与 toArrayTree 一致：父值为空(null/undefined/""/0/"0")视为
+            // 根；父值非空但父行不在本表数据里（过滤/查询后的孤儿行）也要收进顶层
+            // 数组，否则整棵子树被静默丢弃——它的 parentField 原值保留不清空，
+            // 后端据此重新挂接到既有父节点。
+            let idSet = new Set();
             tableDatas.forEach((tableData) => {
-              if (
-                tableData.id &&
-                tableData.id.startsWith &&
-                tableData.id.startsWith("row_")
-              ) {
-                tableData.id = null;
+              let id = tableData[idField];
+              if (id !== null && id !== undefined && id !== "") {
+                idSet.add(String(id));
               }
-              if (
-                tableData[parentField] &&
-                tableData[parentField].startsWith &&
-                tableData[parentField].startsWith("row_")
-              ) {
-                tableData[parentField] = null;
+            });
+            let isRootFlags = tableDatas.map((tableData) => {
+              let parentValue = tableData[parentField];
+              if ([null, undefined, "", 0, "0"].includes(parentValue)) {
+                return true;
               }
+              return !idSet.has(String(parentValue));
+            });
+            // 临时 id 要连字面量 id 一起清：新增行(addTreeRow)把 "row_xxx" 写在
+            // row.id 上，复制(handleCopyTreeData)写在 rowField 上，来源不同，
+            // 只清一个会把临时 id 提交给后端。rowField 缺省时两者是同一字段。
+            let clearTempValue = (tableData, field) => {
+              let value = tableData[field];
+              if (value && value.startsWith && value.startsWith("row_")) {
+                tableData[field] = null;
+              }
+            };
+            tableDatas.forEach((tableData) => {
+              clearTempValue(tableData, idField);
+              if (idField !== "id") {
+                clearTempValue(tableData, "id");
+              }
+              clearTempValue(tableData, parentField);
               if (tableData[parentField] === undefined)
                 tableData[parentField] = null;
             });
-            tableDatas = tableDatas.filter((item) => {
-              return item[parentField] === 0 || item[parentField] === null;
-            });
+            tableDatas = tableDatas.filter((item, index) => isRootFlags[index]);
             newFormData[tableAlias] = tableDatas;
           } else {
             newFormData[tableAlias] =

package/src/components/xform/lang/en-US.js

@@ -239,6 +239,19 @@ export default {
           fileMaxSize: "Max Size(MB)",
           fileTypes: "Upload File Types",
           fileTypesHelp: "Allows to add more file types",
+          fileTypesCategoryHelp: "Check a category to select all its formats at once, or type in other extensions; empty means no restriction",
+          fileTypesPlaceholder: "No format restriction",
+          fileTypeCategory: {
+            image: "Image",
+            video: "Video",
+            audio: "Audio",
+            word: "Word",
+            excel: "Excel",
+            ppt: "PPT",
+            pdf: "PDF",
+            text: "Text",
+            archive: "Archive",
+          },
           headers: "Request Headers",
           cellWidth: "Width",
           cellHeight: "Height",

package/src/components/xform/lang/zh-CN.js

@@ -394,6 +394,19 @@ export default {
       fileMaxSize: "文件大小限制(MB)",
       fileTypes: "上传文件类型",
       fileTypesHelp: "支持添加其他文件类型",
+      fileTypesCategoryHelp: "勾选分类可批量选择该类下的全部格式，也支持手工输入其他后缀；留空表示不限制",
+      fileTypesPlaceholder: "不限制上传格式",
+      fileTypeCategory: {
+        image: "图片",
+        video: "视频",
+        audio: "音频",
+        word: "Word",
+        excel: "Excel",
+        ppt: "PPT",
+        pdf: "PDF",
+        text: "文本",
+        archive: "压缩包",
+      },
       headers: "上传请求头",
       formulaEnabled: "启用计算公式",
       formula: "计算公式",

package/src/utils/resolveViewComponent.js

@@ -156,7 +156,12 @@ function requireAppView(rel) {
 function getRendererAppCode() {
   const webPrefix = (window.WEB_PREFIX || "").replace(/^\/+/, "");
   try {
-    const settings = require("@/settings").default;
+    // settings.js 是 CommonJS（module.exports），取 .default 会拿到 undefined，
+    // 必须兼容两种形态，否则 appCode 永远读不到、退化成 WEB_PREFIX 派生值，
+    // 与 store/modules/permission.js 的 getOwnAppCode 口径不一致（appCode 与
+    // WEB_PREFIX 不同名的应用会误判归属）。
+    const mod = require("@/settings");
+    const settings = (mod && mod.default) || mod;
     return (settings && settings.appCode) || webPrefix;
   } catch (e) {
     return webPrefix;