cloud-web-corejs 1.0.54-dev.712 → 1.0.54-dev.714

package/package.json

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

package/src/components/xform/docs/autocomplete /350/207/252/345/212/250/345/256/214/346/210/220/347/273/204/344/273/266/350/257/264/346/230/216.md"

@@ -27,21 +27,19 @@
 在表单设计器左侧「高级字段」分组中拖入「自动完成」组件，右侧属性面板可配置：
 
 ### 自动完成设置（`autocomplete-vabSearchName-editor`）
-- **存储ID字段**（`valueField`）：候选项数据中 ID 对应的字段名，留空则使用字段本身 `keyName`
-- **存储名称字段**（`vabSearchName`）：选中后名称持久化到的表单字段名
-- **输入提示**（`placeholder`）
-- **可清空**（`clearable`）
-- **聚焦即查询**（`triggerOnFocus`）：聚焦空输入框时是否触发一次查询
-- **防抖(ms)**（`debounce`）：输入防抖毫秒数
-- **ID反查脚本编码**（`getByIdScriptCode`）：选填，编辑态根据 ID 反查名称
-- **清空回调**（`onSearchClear`）
-- **下拉项模板**（`autocompleteItemTemplate`）：脚本，入参 `item`，返回 HTML 字符串
+
+面板精简为核心配置（参考「搜索框」组件的精简风格）：
+- **来源ID字段**（`valueField`）：候选项数据中 ID 对应的字段名，留空则使用字段本身 `keyName`；ID 始终存入字段本身
+- **来源名称字段**（`vabSearchName`）：候选项数据中名称对应的字段名，同时作为名称持久化的展示字段
 - **选中回填**（`autocompleteFillConfig`）：数组，每项 `{ targetField, targetFormField, sourceField }`
 
-### 请求访问设置（复用 `formScriptEnabled-editor`）
-- **表单脚本编码**（`formScriptCode`）：远程搜索的后台逻辑脚本编码（必填）
-- **查询参数**（`formScriptParam`）：脚本，返回额外请求参数对象
-- **查询回调**（`formScriptSuccess`）：脚本，入参 `res`、`rows`，可返回处理后的数组
+其余通用项由标准编辑器提供：**输入提示**（`placeholder`）、**可清空**（`clearable`）在「常用设置」中配置；**清空回调**（`onSearchClear`）在「事件设置」中配置；**查询脚本编码**等在下方「请求访问设置」区块维护。
+
+> 以下选项仍保留在 `autocompleteConfig` schema 中（保证旧表单兼容与运行时行为），但已从设计器面板移除，如需使用可直接写入组件 `options` JSON：
+> - `triggerOnFocus`（默认 `true`）：聚焦空输入框时是否触发一次查询
+> - `debounce`（默认 `300`）：输入防抖毫秒数
+> - `getByIdScriptCode`：编辑态根据 ID 反查名称的脚本编码
+> - `autocompleteItemTemplate`：自定义下拉项模板脚本（入参 `item`，返回 HTML 字符串）
 
 ## 远程搜索请求约定
 

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

@@ -14,16 +14,19 @@
       :placeholder="getI18nLabel(field.options.placeholder || '请输入关键词搜索')"
       :clearable="field.options.clearable"
       :fetch-suggestions="querySearchAsync"
-      :trigger-on-focus="field.options.triggerOnFocus !== false"
+      :trigger-on-focus="false"
       :debounce="field.options.debounce || 300"
       :value-key="valueKey"
       :prefix-icon="field.options.prefixIcon"
-      :suffix-icon="field.options.suffixIcon"
-      :popper-class="field.options.customClass ? field.options.customClass.join(' ') : ''"
+      :suffix-icon="field.options.suffixIcon || 'el-icon-tickets'"
+      :popper-class="
+        'autocomplete-popper' +
+        (field.options.customClass ? ' ' + field.options.customClass.join(' ') : '')
+      "
       @select="handleSelect"
       @clear="handleClear"
       @focus="handleFocusCustomEvent"
-      @blur="handleBlurCustomEvent"
+      @blur="handleBlur"
       @input="handleInputChange"
       :style="'width:' + field.options.widgetWidth + ' !important;'"
       :class="{'custom-width': field.options.widgetWidth != null}">
@@ -33,7 +36,7 @@
           <span v-html="renderItemTemplate(item)"></span>
         </template>
         <template v-else>
-          <span>{{ item[valueKey] }}</span>
+          <span v-html="highlightKeyword(item[valueKey])"></span>
         </template>
       </template>
     </el-autocomplete>
@@ -64,6 +67,30 @@ export default {
         return "";
       }
     },
+    /** HTML 转义，防止下拉项内容注入 */
+    escapeHtml(str) {
+      let map = {
+        "&": "&amp;",
+        "<": "&lt;",
+        ">": "&gt;",
+        '"': "&quot;",
+        "'": "&#39;",
+      };
+      return String(str == null ? "" : str).replace(/[&<>"']/g, (c) => map[c]);
+    },
+    /** 高亮下拉项中与当前搜索关键词匹配的部分 */
+    highlightKeyword(text) {
+      let escaped = this.escapeHtml(text);
+      let keyword = this.lastQueryKeyword;
+      if (!keyword) return escaped;
+      let kw = this.escapeHtml(keyword).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+      if (!kw) return escaped;
+      let re = new RegExp("(" + kw + ")", "gi");
+      return escaped.replace(
+        re,
+        '<span class="autocomplete-highlight">$1</span>'
+      );
+    },
   },
 }
 </script>
@@ -75,3 +102,18 @@ export default {
   width: 100% !important;
 }
 </style>
+
+<!-- 非 scoped：el-autocomplete 下拉浮层挂在 body 下，scoped 样式无法命中 -->
+<style lang="scss">
+.autocomplete-popper {
+  .el-autocomplete-suggestion__list li {
+    font-size: 13px;
+    line-height: 1.6;
+  }
+}
+
+.autocomplete-highlight {
+  color: #409eff;
+  font-weight: bold;
+}
+</style>

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

@@ -160,20 +160,14 @@ export default {
       let dataId = this.formDataId;
       if (!dataId) return;
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       if (dataId) {
         let accessParam = this.handleCustomEvent(this.field.options.formScriptParam)
         return this.formHttp({
           url: "/" + reportTemplate.serviceName + "/form_ins/getList",
-          data: {
-            formCode: formCode,
-            formVersion: reportTemplate.formVersion,
-            taBm: this.fieldKeyName,
-            data: {
-              ...accessParam,
-              id: dataId
-            }
-          },
+          data: this.buildFormScriptData(reportTemplate, {
+            ...accessParam,
+            id: dataId
+          }),
           callback: res => {
             let rows = res.objx || [];
             this.setValue(rows)

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

@@ -137,18 +137,12 @@ export default {
       let scriptCode = this.field.options.formScriptCode;
       if (!scriptCode) return;
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let accessParam = this.handleCustomEvent(this.field.options.formScriptParam);
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            ...accessParam,
-          },
-        },
+        data: this.buildFormScriptData(reportTemplate, {
+          ...accessParam,
+        }),
         callback: (res) => {
           let data = res.objx || {};
           this.fieldModel = data;

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -717,14 +717,7 @@ modules = {
           );
           return this.formHttp({
             scriptCode: scriptCode,
-            data: {
-              formCode: formCode,
-              formVersion: reportTemplate.formVersion,
-              taBm: this.fieldKeyName,
-              data: {
-                ...accessParam,
-              },
-            },
+            data: this.buildFormScriptData(reportTemplate, { ...accessParam }),
             callback: (res) => {
               let rows = res.objx?.records || res.objx || [];
               this.loadGloatOptions(rows, initFlag);
@@ -767,6 +760,20 @@ modules = {
         return;
       }
     },
+    /**
+     * 构造表单脚本请求的 data 参数（通用）。
+     * 勾选"请求去掉data层"(removeDataLevel)时，内层参数平铺到外层，不再包一层 data。
+     */
+    buildFormScriptData: function (reportTemplate, innerData, taBm) {
+      let base = {
+        formCode: reportTemplate.formCode,
+        formVersion: reportTemplate.formVersion,
+        taBm: taBm || this.fieldKeyName,
+      };
+      return this.field.options.removeDataLevel
+        ? { ...base, ...(innerData || {}) }
+        : { ...base, data: innerData || {} };
+    },
     loadGloatOptions: function (e, initFlag) {
       let optionItems = baseRefUtil.translateOptionItems(
         e,
@@ -859,14 +866,7 @@ modules = {
           );
           return this.formHttp({
             scriptCode: scriptCode,
-            data: {
-              formCode: formCode,
-              formVersion: reportTemplate.formVersion,
-              taBm: this.fieldKeyName,
-              data: {
-                ...accessParam,
-              },
-            },
+            data: this.buildFormScriptData(reportTemplate, { ...accessParam }),
             callback: (res) => {
               let rows = res.objx || [];
               this.loadOptions(rows);

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

@@ -288,7 +288,7 @@ export default {
 
       if (!!this.designer) {
         return this.designer.formConfig.labelWidth + "px";
-      } else {
+      } else { 
         return this.formConfig.labelWidth + "px";
       }
     },

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

@@ -59,28 +59,51 @@ export default {
       currentData[fieldKeyName] = val;
     },
     showValue(val) {
-      //外部回显：当 currentData[labelField] 变化时，同步到输入框
+      //外部回显：当 currentData[displayField] 变化时，同步到输入框
       this.displayValue = val;
     },
   },
   computed: {
     /**
-     * 选项数据中"ID/值"对应的字段名
+     * 关联来源字段：候选数据中"ID/值"对应的字段名
      */
     valueField() {
       return trim(this.field.options.valueField) || this.fieldKeyName;
     },
     /**
-     * 选项数据中"名称"对应的字段名（同时作为持久化到表单数据的展示字段）
+     * 展示来源字段：候选数据中"名称"对应的字段名
+     * （为空时回退展示字段 vabSearchName，再回退字段本身，保证旧表单兼容）
      */
-    labelField() {
+    sourceLabelField() {
+      return (
+        trim(this.field.options.labelSourceField) ||
+        trim(this.field.options.vabSearchName) ||
+        this.fieldKeyName
+      );
+    },
+    /**
+     * 展示字段：表单数据中持久化"名称"的字段（用于存储与回显）
+     */
+    displayField() {
       return trim(this.field.options.vabSearchName) || this.fieldKeyName;
     },
     /**
-     * el-autocomplete 下拉项展示用的 value-key
+     * el-autocomplete 下拉项展示用的 value-key（取自候选数据的展示来源字段）
      */
     valueKey() {
-      return this.labelField;
+      return this.sourceLabelField;
+    },
+    /**
+     * 查询字段：远程搜索时关键词传给后台的参数名（默认 keyword）
+     */
+    queryField() {
+      return trim(this.field.options.queryField) || "keyword";
+    },
+    /**
+     * condition格式下查询的数据表 taBm（留空取字段本身 keyName）
+     */
+    conditionTaBm() {
+      return trim(this.field.options.conditionTaBm) || this.fieldKeyName;
     },
     tableRow() {
       let tableParam = this.tableParam;
@@ -95,8 +118,8 @@ export default {
      */
     showValue() {
       let currentData = this.currentData;
-      let labelField = this.labelField;
-      let value = currentData[labelField] ?? null;
+      let displayField = this.displayField;
+      let value = currentData[displayField] ?? null;
       this.displayValue = value;
       return value;
     },
@@ -122,7 +145,7 @@ export default {
     this.$nextTick(() => {
       if (this.designState) return;
       let id = this.fieldModel;
-      let label = this.currentData[this.labelField];
+      let label = this.currentData[this.displayField];
       if (this.isNotNullVal(id) && !this.isNotNullVal(label)) {
         this.fetchLabelById(id);
       }
@@ -138,8 +161,8 @@ export default {
      * 设置展示名称到当前数据行/表单模型，并同步到输入框
      */
     setShowValue(val = null) {
-      let labelField = this.labelField;
-      this.currentData[labelField] = val;
+      let displayField = this.displayField;
+      this.currentData[displayField] = val;
       this.displayValue = val;
     },
     setValue: function (e) {
@@ -174,8 +197,15 @@ export default {
         cb([]);
         return;
       }
-      //避免对相同关键词重复查询（el-autocomplete focus/input 都会触发）
+      //需要有内容才执行搜索：关键词为空（含聚焦触发的空串）时不查询
       let keyword = queryString == null ? "" : String(queryString);
+      if (!trim(keyword)) {
+        this.lastQueryKeyword = null;
+        this._lastSuggestions = null;
+        cb([]);
+        return;
+      }
+      //避免对相同关键词重复查询（el-autocomplete focus/input 都会触发）
       if (
         keyword === this.lastQueryKeyword
         && this._lastSuggestions
@@ -187,20 +217,38 @@ export default {
       this.lastQueryKeyword = keyword;
 
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let accessParam = this.handleCustomEvent(
         this.field.options.formScriptParam
       );
-      let taBm = this.fieldKeyName;
-      let data = {
-        formCode: formCode,
-        formVersion: reportTemplate.formVersion,
-        taBm: taBm,
-        data: {
+      let innerData;
+      if (this.field.options.conditionFormat) {
+        //condition 传值格式：关键词以 { field, value, filter:'like' } 追加到 condition 数组
+        let extra = accessParam || {};
+        let conditions = Array.isArray(extra.condition)
+          ? extra.condition.slice()
+          : [];
+        conditions.push({
+          value: keyword,
+          field: this.queryField,
+          filter: "like",
+        });
+        innerData = {
+          current: 1,
+          size: this.field.options.conditionSize || 100,
+          searchCount: true,
+          ...extra,
+          condition: conditions,
+        };
+      } else {
+        innerData = {
           ...accessParam,
-          keyword: keyword,
-        },
-      };
+          [this.queryField]: keyword,
+        };
+      }
+      let taBm = this.field.options.conditionFormat
+        ? this.conditionTaBm
+        : undefined;
+      let data = this.buildFormScriptData(reportTemplate, innerData, taBm);
       return this.formHttp({
         scriptCode: scriptCode,
         isLoading: false,
@@ -234,9 +282,9 @@ export default {
       this.isSelecting = true;
       try {
         let valueField = this.valueField;
-        let labelField = this.labelField;
+        let sourceLabelField = this.sourceLabelField;
         let id = item[valueField] ?? null;
-        let label = item[labelField] ?? null;
+        let label = item[sourceLabelField] ?? null;
 
         //存储 ID（提交字段）
         this.setValue(id);
@@ -286,33 +334,34 @@ export default {
       }
     },
     /**
-     * 输入框内容变化：若非"选中"触发，且与已存储名称不一致，则清空 ID（用户正在重新搜索）
+     * 输入框内容变化：仅派发校验与自定义 onInput，不清除已存储的 ID/名称。
+     * 用户输入但未选择、直接失焦时，由 handleBlur 还原为已存储的展示名称。
      */
     handleInputChange(text) {
       if (this.isSelecting) return;
-      if (!this.designState) {
-        if (!text) {
-          //输入框被清空（非通过 clear 按钮）
-          this.setValue(null);
-          this.setShowValue(null);
-          return;
-        }
-        let storedLabel = this.currentData[this.labelField];
-        if (text !== storedLabel) {
-          //用户手动输入了与已选中名称不同的内容，清空已存储的 ID 与名称
-          this.fieldModel = null;
-          this.currentData[this.fieldKeyName] = null;
-          this.currentData[this.labelField] = null;
-          this.oldFieldValue = null;
-        }
-      }
-      //同步到表单模型并派发校验
       this.dispatch("VFormRender", "fieldValidation", [this.getPropName()]);
       if (this.field.options.onInput) {
         let fn = new Function("value", this.field.options.onInput);
         fn.call(this, text);
       }
     },
+    /**
+     * 失焦：若未通过"选择"确认新值，则把输入框内容还原为已存储的展示名称
+     * （已存储 ID 保持不变；从未选择过则清空输入框）。
+     */
+    handleBlur(e) {
+      if (!this.designState) {
+        //延迟到"选择"事件之后再还原，避免点击下拉项时被误还原
+        setTimeout(() => {
+          if (this.isSelecting) return;
+          let storedLabel = this.currentData[this.displayField] ?? null;
+          if (this.displayValue !== storedLabel) {
+            this.displayValue = storedLabel;
+          }
+        }, 150);
+      }
+      this.handleBlurCustomEvent(e);
+    },
     /**
      * 根据回填配置把选中项的其他字段值写入表单
      */
@@ -337,7 +386,7 @@ export default {
     },
     /**
      * 通过 ID 反查名称（编辑态回显场景）。
-     * 当 fieldModel 有值但 currentData[labelField] 为空时调用。
+     * 当 fieldModel 有值但 currentData[displayField] 为空时调用。
      */
     fetchLabelById(id) {
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
@@ -347,27 +396,47 @@ export default {
       //优先使用专用的 getById 脚本；否则不自动反查
       if (!getByIdScriptCode) return;
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let accessParam = this.handleCustomEvent(
         this.field.options.formScriptParam
       );
+      let innerData;
+      if (this.field.options.conditionFormat) {
+        //condition 传值格式：按 关联来源字段 eq id 反查
+        let extra = accessParam || {};
+        let conditions = Array.isArray(extra.condition)
+          ? extra.condition.slice()
+          : [];
+        conditions.push({
+          value: id,
+          field: this.valueField,
+          filter: "eq",
+        });
+        innerData = {
+          current: 1,
+          size: this.field.options.conditionSize || 100,
+          searchCount: true,
+          ...extra,
+          condition: conditions,
+        };
+      } else {
+        innerData = {
+          ...accessParam,
+          id: id,
+        };
+      }
+      let taBm = this.field.options.conditionFormat
+        ? this.conditionTaBm
+        : undefined;
+      let data = this.buildFormScriptData(reportTemplate, innerData, taBm);
       return this.formHttp({
         scriptCode: getByIdScriptCode,
         isLoading: false,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            ...accessParam,
-            id: id,
-          },
-        },
+        data: data,
         callback: (res) => {
           let rows = res.objx?.records || res.objx || [];
           let row = Array.isArray(rows) ? rows[0] : rows;
           if (row) {
-            let label = row[this.labelField] ?? null;
+            let label = row[this.sourceLabelField] ?? null;
             this.setShowValue(label);
           }
         },

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

@@ -376,21 +376,15 @@ modules = {
     },*/
     loadDataDefaultHandle() {
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
       let scriptCode = this.field.options.formScriptCode
       if (!scriptCode) return;
       let accessParam = this.handleCustomEvent(this.field.options.formScriptParam)
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            ...accessParam
-          }
-        },
+        data: this.buildFormScriptData(reportTemplate, {
+          ...accessParam
+        }),
         callback: res => {
           let rows = res.objx || [];
           this.setValue(rows)

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

@@ -248,21 +248,15 @@ modules = {
     },*/
     loadDataDefaultHandle() {
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
       let scriptCode = this.field.options.formScriptCode
       if (!scriptCode) return;
       let accessParam = this.handleCustomEvent(this.field.options.formScriptParam)
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            ...accessParam
-          }
-        },
+        data: this.buildFormScriptData(reportTemplate, {
+          ...accessParam
+        }),
         callback: res => {
           let rows = res.objx || [];
           this.setValue(rows)

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

@@ -171,21 +171,15 @@ modules = {
     },*/
     loadDataDefaultHandle() {
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
       let scriptCode = this.field.options.formScriptCode
       if (!scriptCode) return;
       let accessParam = this.handleCustomEvent(this.field.options.formScriptParam)
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            ...accessParam
-          }
-        },
+        data: this.buildFormScriptData(reportTemplate, {
+          ...accessParam
+        }),
         callback: res => {
           let rows = res.objx || [];
           this.setValue(rows)

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

@@ -154,15 +154,10 @@ export default {
       let accessParam = this.handleCustomEvent(this.field.options.formScriptParam);
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            ...accessParam,
-            id: dataId,
-          },
-        },
+        data: this.buildFormScriptData(reportTemplate, {
+          ...accessParam,
+          id: dataId,
+        }),
         callback: (res) => {
           let rows = res.objx || [];
           this.setValue(rows);

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

@@ -137,7 +137,6 @@ export default {
       let dataId = this.formDataId;
       if (!dataId) return;
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
       let scriptCode = this.field.options.formScriptCode || "getList";
       if (!scriptCode) return;
@@ -148,15 +147,10 @@ export default {
         return this.formHttp({
           // url: "/" + reportTemplate.serviceName + "/form_ins/getList",
           scriptCode: scriptCode,
-          data: {
-            formCode: formCode,
-            formVersion: reportTemplate.formVersion,
-            taBm: this.fieldKeyName,
-            data: {
-              ...accessParam,
-              id: dataId,
-            },
-          },
+          data: this.buildFormScriptData(reportTemplate, {
+            ...accessParam,
+            id: dataId,
+          }),
           callback: (res) => {
             let rows = res.objx || [];
             this.setValue(rows);

package/src/components/xform/form-designer/setting-panel/property-editor/field-autocomplete/autocomplete-vabSearchName-editor.vue

@@ -4,76 +4,56 @@
       <el-divider class="custom-divider-margin-top">自动完成设置</el-divider>
     </el-form-item>
 
-    <el-form-item label="存储ID字段">
+    <el-form-item label="展示字段">
+      <el-input
+        type="text"
+        v-model="optionModel.vabSearchName"
+        placeholder="表单中存储名称的字段"
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="关联来源字段">
       <el-input
         type="text"
         v-model="optionModel.valueField"
-        placeholder="留空则使用字段本身"
+        placeholder="候选数据中作为值/ID的字段（默认字段本身），值存入字段本身"
       ></el-input>
     </el-form-item>
-    <el-form-item label="存储名称字段">
+    <el-form-item label="展示来源字段">
       <el-input
         type="text"
-        v-model="optionModel.vabSearchName"
-        placeholder="存储展示名称的字段名"
+        v-model="optionModel.labelSourceField"
+        placeholder="候选数据中作为名称的字段（默认取展示字段）"
       ></el-input>
     </el-form-item>
-    <el-form-item label="输入提示">
+    <el-form-item label="查询字段">
       <el-input
         type="text"
-        v-model="optionModel.placeholder"
+        v-model="optionModel.queryField"
+        placeholder="condition格式时为字段名，否则为参数名（默认 keyword）"
       ></el-input>
     </el-form-item>
-    <el-form-item label="可清空">
-      <el-switch v-model="optionModel.clearable"></el-switch>
+    <el-form-item label="condition传值格式">
+      <el-switch v-model="optionModel.conditionFormat"></el-switch>
     </el-form-item>
-    <el-form-item label="聚焦即查询">
-      <el-switch v-model="optionModel.triggerOnFocus"></el-switch>
+    <el-form-item label="查询数据表">
+      <el-input
+        type="text"
+        v-model="optionModel.conditionTaBm"
+        placeholder="condition查询的数据表taBm（留空取字段本身）"
+      ></el-input>
     </el-form-item>
-    <el-form-item label="防抖(ms)">
+    <el-form-item label="查询条数">
       <el-input-number
-        v-model="optionModel.debounce"
-        :min="0"
-        :max="2000"
-        :step="100"
+        v-model="optionModel.conditionSize"
+        :min="1"
         controls-position="right"
         style="width: 100%"
       ></el-input-number>
     </el-form-item>
 
-    <el-form-item label="ID反查脚本编码">
-      <el-input
-        type="text"
-        v-model="optionModel.getByIdScriptCode"
-        placeholder="选填，编辑态根据ID反查名称"
-      ></el-input>
-    </el-form-item>
-
-    <el-form-item label="清空回调">
-      <a
-        href="javascript:void(0);"
-        class="a-link link-oneLind"
-        @click="editEventHandler('onSearchClear', ['rowData', 'rowIndex'])"
-      >
-        <span>{{ optionModel.onSearchClear }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
-
-    <el-form-item label="下拉项模板">
-      <a
-        href="javascript:void(0);"
-        class="a-link link-oneLind"
-        @click="editEventHandler('autocompleteItemTemplate', ['item'])"
-      >
-        <span>{{ optionModel.autocompleteItemTemplate }}</span>
-        <i class="el-icon-edit"></i>
-      </a>
-    </el-form-item>
-
     <el-form-item label="选中回填">
       <el-button type="primary" plain round @click="showFillDialog = true">
-        {{ i18nt('designer.setting.editAction') }}
+        {{ i18nt("designer.setting.editAction") }}
       </el-button>
     </el-form-item>
 
@@ -99,12 +79,20 @@
           border
           stripe
         >
-          <el-table-column label="目标字段(组件名)" width="180" prop="targetField">
+          <el-table-column
+            label="目标字段(组件名)"
+            width="180"
+            prop="targetField"
+          >
             <template slot-scope="scope">
               <el-input v-model="scope.row.targetField"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="目标数据属性" width="180" prop="targetFormField">
+          <el-table-column
+            label="目标数据属性"
+            width="180"
+            prop="targetFormField"
+          >
             <template slot-scope="scope">
               <el-input v-model="scope.row.targetFormField"></el-input>
             </template>
@@ -147,12 +135,23 @@
         </el-table>
       </div>
       <div class="dialog-footer" slot="footer">
-        <span class="fl tips">注：'目标字段'与'目标数据属性'只需维护一个即可。</span>
-        <el-button @click="showFillDialog = false" class="button-sty" icon="el-icon-close">
-          {{ i18nt('designer.hint.cancel') }}
+        <span class="fl tips"
+          >注：'目标字段'与'目标数据属性'只需维护一个即可。</span
+        >
+        <el-button
+          @click="showFillDialog = false"
+          class="button-sty"
+          icon="el-icon-close"
+        >
+          {{ i18nt("designer.hint.cancel") }}
         </el-button>
-        <el-button type="primary" @click="confirmFillDialog" class="button-sty" icon="el-icon-check">
-          {{ i18nt('designer.hint.confirm') }}
+        <el-button
+          type="primary"
+          @click="confirmFillDialog"
+          class="button-sty"
+          icon="el-icon-check"
+        >
+          {{ i18nt("designer.hint.confirm") }}
         </el-button>
       </div>
     </el-dialog>
@@ -161,12 +160,11 @@
 
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n";
-import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 import propertyMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/propertyMixin";
 
 export default {
   name: "autocomplete-vabSearchName-editor",
-  mixins: [i18n, eventMixin, propertyMixin],
+  mixins: [i18n, propertyMixin],
   props: {
     designer: Object,
     selectedWidget: Object,

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

@@ -58,6 +58,12 @@
         <el-input type="text" v-model="optionModel.valueKey" :disabled="optionModel.commonAttributeEnabled"></el-input>
       </el-form-item> -->
     </template>
+    <el-form-item
+      label="请求去掉data层"
+      v-if="optionModel.formScriptEnabled"
+    >
+      <el-switch v-model="optionModel.removeDataLevel"></el-switch>
+    </el-form-item>
     <el-form-item
       label="查询回调"
       v-if="optionModel.formScriptEnabled || optionModel.commonAttributeEnabled"
@@ -98,6 +104,7 @@ export default {
         "status",
         "gantt",
         "cascader",
+        "autocomplete",
       ],
     };
   },

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

@@ -1,3 +1,18 @@
+// 注意：httpConfig 需在 containers / autocompleteConfig 等使用处之前声明，
+// 否则经 Babel 转译（const→var 提升，丢失 TDZ）后 ...httpConfig 会展开 undefined（为空），
+// 导致相关组件丢失 formScriptEnabled 等「请求访问设置」字段。
+const httpConfig = {
+  httpFormCode: null,
+  formScriptEnabled: true,
+  commonAttributeEnabled: false,
+  formScriptCode: null,
+  formScriptParam: null,
+  formScriptSuccess: null,
+  formScriptCallback: null,
+  //请求去掉data层：勾选后请求参数不再包一层 data
+  removeDataLevel: false,
+};
+
 export const containers = [
   {
     type: "grid",
@@ -908,22 +923,25 @@ const autocompleteConfig = {
   customClass: [],
   placeholder: "请输入关键词搜索",
   clearable: true,
-  //el-autocomplete 相关
-  triggerOnFocus: true,
-  debounce: 300,
+  //查询字段：远程搜索时关键词传给后台的参数名(默认 keyword)
+  queryField: "keyword",
+  //condition传值格式：勾选后关键词以 { condition:[{field,value,filter:'like'}], current,size,searchCount } 结构传递
+  conditionFormat: true,
+  //condition格式下的分页条数
+  conditionSize: 200,
+  //condition格式下查询的数据表(taBm)，留空则取字段本身 keyName
+  conditionTaBm: null,
   prefixIcon: null,
   suffixIcon: null,
-  //选项数据中"值/ID"对应的字段名(为空时取字段本身 keyName)
+  //关联来源字段：候选数据中"值/ID"对应的字段名(为空时取字段本身 keyName)，值存入字段本身
   valueField: null,
+  //展示来源字段：候选数据中"名称"对应的字段名(为空时回退 vabSearchName，再回退字段本身 keyName)
+  labelSourceField: null,
   //远程搜索后台逻辑脚本配置(复用 httpConfig)
   ...httpConfig,
-  formScriptCode: null,
-  //通过 ID 反查名称的脚本编码(可选，用于编辑态回显)
-  getByIdScriptCode: null,
+  formScriptCode: "getPage",
   //选中后回填其他表单字段的配置
   autocompleteFillConfig: [],
-  //自定义下拉项模板脚本(可选，入参 item，返回 HTML 字符串)
-  autocompleteItemTemplate: null,
   //事件
   onCreated: "",
   onMounted: "",
@@ -980,16 +998,6 @@ const projectTagConfig = {
   tagWidth: "",
 };
 
-const httpConfig = {
-  httpFormCode: null,
-  formScriptEnabled: true,
-  commonAttributeEnabled: false,
-  formScriptCode: null,
-  formScriptParam: null,
-  formScriptSuccess: null,
-  formScriptCallback: null,
-};
-
 export const hiddenWidgetTypesOfWf = [
   "button",
   "search_button",

package/src/components/xform/form-render/container-item/list-h5-item.vue

@@ -1431,9 +1431,22 @@ export default {
         queryCreateInfo: window.$vueRoot.$store.getters.queryCreateInfo || "0",
       };
     },
+    /**
+     * 构造表单脚本请求的 data 参数（通用）。
+     * 勾选"请求去掉data层"(removeDataLevel)时，内层参数平铺到外层，不再包一层 data。
+     */
+    buildFormScriptData(reportTemplate, innerData, taBm) {
+      let base = {
+        formCode: reportTemplate.formCode,
+        formVersion: reportTemplate.formVersion,
+        taBm: taBm || this.fieldKeyName,
+      };
+      return this.widget.options.removeDataLevel
+        ? { ...base, ...(innerData || {}) }
+        : { ...base, data: innerData || {} };
+    },
     loadDefaultQueryList(reqData, done) {
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let scriptCode = this.getScriptCode();
       let accessParam = this.getAccessParam() || {};
       let otherParam = {};
@@ -1449,12 +1462,7 @@ export default {
       requestData = extendDeeply(requestData, accessParam);
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: requestData,
-        },
+        data: this.buildFormScriptData(reportTemplate, requestData),
         isLoading: false,
         ...defaultOption,
         callback: (res) => {
@@ -1465,7 +1473,6 @@ export default {
     loadDefaultViewList() {
       let dataId = this.formDataId;
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let accessParam = this.getAccessParam() || {};
       let otherParam = {};
       let attachmentType = this.getAttachmentType();
@@ -1475,16 +1482,11 @@ export default {
       let scriptCode = this.getScriptCode();
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            id: dataId,
-            ...otherParam,
-            ...accessParam,
-          },
-        },
+        data: this.buildFormScriptData(reportTemplate, {
+          id: dataId,
+          ...otherParam,
+          ...accessParam,
+        }),
         callback: (res) => {
           let rows = res.objx ? res.objx.records || res.objx || [] : [];
           this.setValue(rows);

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

@@ -207,13 +207,26 @@ export default {
       this.widget.rows.length = 0;
       this.widget.rows.push(...widgetRows);
     },
+    /**
+     * 构造表单脚本请求的 data 参数（通用）。
+     * 勾选"请求去掉data层"(removeDataLevel)时，内层参数平铺到外层，不再包一层 data。
+     */
+    buildFormScriptData(reportTemplate, innerData, taBm) {
+      let base = {
+        formCode: reportTemplate.formCode,
+        formVersion: reportTemplate.formVersion,
+        taBm: taBm || this.fieldKeyName,
+      };
+      return this.widget.options.removeDataLevel
+        ? { ...base, ...(innerData || {}) }
+        : { ...base, data: innerData || {} };
+    },
     loadDataDefaultHandle(flag) {
       // this.init();
       // return
       let dataId = this.formDataId;
       if (flag !== true && !dataId) return;
       let reportTemplate = this.getFormRef().reportTemplate;
-      let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.widget.options.formScriptEnabled || false;
       let scriptCode = this.widget.options.formScriptCode;
       if (!scriptCode) return;
@@ -222,15 +235,10 @@ export default {
       );
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            id: dataId,
-            ...accessParam,
-          },
-        },
+        data: this.buildFormScriptData(reportTemplate, {
+          id: dataId,
+          ...accessParam,
+        }),
         success: (res) => {
           let rows = res.objx || [];
           this.handleCustomEvent(