cnhis-design-vue 3.1.31-beta.7 → 3.1.31-beta.9

package/es/components/button-print/src/components/EditFormat.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, openBlock, createBlock, unref, withCtx, createVNode, createElementBlock, Fragment, renderList, createElementVNode, createTextVNode, toDisplayString } from 'vue';
+import { defineComponent, ref, openBlock, createBlock, unref, withCtx, createVNode, createElementVNode, createTextVNode } from 'vue';
 import { useMessage, NForm, NFormItem, NSpace, NUpload, NUploadDragger, NIcon, NText, NP } from 'naive-ui';
 import { Archive } from '@vicons/ionicons5';
 import axios from 'axios';
@@ -7,48 +7,75 @@ import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
 const _hoisted_1 = { style: { "margin-bottom": "12px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "EditFormat",
+  props: {
+    formatId: null,
+    token: null
+  },
   setup(__props, { expose }) {
+    const props = __props;
     const PROTOCOL = window.location.protocol;
     const HOST = window.location.host;
-    const SAVEIREPORT = `${PROTOCOL}//${HOST}/bi-api/reprot/print/open/client/saveIReportFormat`;
+    const BASEURL = `${PROTOCOL}//${HOST}/bi-api`;
+    const SAVEIREPORT = `${BASEURL}/reprot/print/open/client/saveIReportFormat`;
+    const QUERYFILELIST = `${BASEURL}/reprot/print/open/client/getIReportFiles`;
+    const DELETEFILE = `${BASEURL}/reprot/print/open/client/delIReportFiles`;
     const instance = axios.create({});
     const $message = useMessage();
-    const fileList = ref([
-      {
-        key: "jrxml",
-        value: []
-      },
-      {
-        key: "jasper",
-        value: []
-      }
-    ]);
+    const fileList = ref([]);
+    queryFileList();
+    function queryFileList() {
+      var _a;
+      instance.get(`${QUERYFILELIST}?formatId=${(_a = props.formatId) == null ? void 0 : _a.split("_")[1]}&authorizationKey=${props.token}`).then(({ data }) => {
+        (data.list || []).forEach((file) => {
+          fileList.value.push({
+            id: Date.now().toString(),
+            name: file,
+            status: "finished"
+          });
+        });
+      });
+    }
+    function onRemove(options) {
+      return new Promise((resolve, reject) => {
+        var _a;
+        instance.get(
+          `${DELETEFILE}?formatId=${(_a = props.formatId) == null ? void 0 : _a.split("_")[1]}&authorizationKey=${props.token}&fileName=${options.file.name}`
+        ).then(({ data }) => {
+          if ((data == null ? void 0 : data.result) !== "SUCCESS") {
+            $message.error((data == null ? void 0 : data.resultMsg) || "\u5220\u9664\u6587\u4EF6\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\uFF01");
+            reject();
+          } else {
+            $message.success("\u5220\u9664\u6587\u4EF6\u6210\u529F\uFF01");
+            resolve("SUCCESS");
+          }
+        });
+      });
+    }
     function submit(datas) {
       return new Promise((resolve, reject) => {
-        var _a, _b, _c, _d;
-        const isOk = fileList.value.every((file) => file.value.length > 0);
-        if (!isOk) {
-          $message.warning("\u8BF7\u5148\u4E0A\u4F20\u6587\u4EF6");
+        if (!validateFormat()) {
+          $message.warning("\u8BF7\u81F3\u5C11\u4E0A\u4F20\u4E00\u4E2Ajrxml\u6587\u4EF6\u548C\u4E00\u4E2Ajasper\u6587\u4EF6\uFF01");
+          return;
+        }
+        const files = fileList.value.filter((file) => file.file);
+        if (files.length === 0) {
+          $message.warning("\u672C\u6B21\u65E0\u65B0\u6587\u4EF6\u589E\u52A0\uFF0C\u8BF7\u5148\u6DFB\u52A0\u65B0\u6587\u4EF6\uFF01");
           return;
         }
-        const jrxml = (_b = (_a = fileList.value.find((file) => file.key === "jrxml")) == null ? void 0 : _a.value) == null ? void 0 : _b[0];
-        const jasper = (_d = (_c = fileList.value.find((file) => file.key === "jasper")) == null ? void 0 : _c.value) == null ? void 0 : _d[0];
-        const data = {
-          jrxml: jrxml == null ? void 0 : jrxml.file,
-          jasper: jasper == null ? void 0 : jasper.file,
-          ...datas
-        };
         const params = new FormData();
-        Object.keys(data).forEach((v) => {
-          params.append(v, data[v]);
+        Object.keys(datas).forEach((v) => {
+          params.append(v, datas[v]);
+        });
+        fileList.value.forEach((file) => {
+          file.file && params.append("files", file.file);
         });
         instance.post(SAVEIREPORT, params, {
           headers: {
             "Content-Type": "application/x-www-form-urlencoded"
           }
-        }).then(({ data: data2 }) => {
-          if ((data2 == null ? void 0 : data2.result) !== "SUCCESS") {
-            $message.error((data2 == null ? void 0 : data2.resultMsg) || "\u4E0A\u4F20\u6587\u4EF6\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\uFF01");
+        }).then(({ data }) => {
+          if ((data == null ? void 0 : data.result) !== "SUCCESS") {
+            $message.error((data == null ? void 0 : data.resultMsg) || "\u4E0A\u4F20\u6587\u4EF6\u5931\u8D25\uFF0C\u8BF7\u91CD\u8BD5\uFF01");
             reject();
           } else {
             resolve("SUCCESS");
@@ -56,29 +83,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       });
     }
-    function onChange(data, index) {
-      fileList.value[index].value = data.fileList;
-    }
-    async function onBeforeUpload(data) {
-      if (!validateFormat(data.file, ".jrxml,.jasper")) {
-        $message.warning("\u53EA\u80FD\u4E0A\u4F20.jrxml\u6216\u8005.jasper\u683C\u5F0F\u7684\u6587\u4EF6\uFF0C\u8BF7\u91CD\u65B0\u4E0A\u4F20");
+    function validateFormat() {
+      if (fileList.value.length < 2)
         return false;
-      }
-      return true;
-    }
-    function validateFormat(file, format) {
-      let res = false;
-      if (!format || format.includes("*")) {
-        return true;
-      }
-      let list = format.split(",");
-      if (!list.length) {
+      let isJrxml = false;
+      let isJasper = false;
+      const rExt = /\.([^.]+)$/;
+      fileList.value.forEach((file) => {
+        var _a;
+        const name = ((_a = file.file) == null ? void 0 : _a.name) || file.name || "";
+        const ext = rExt.exec(name) ? RegExp.$1.toLowerCase() : "";
+        if (ext && ".jrxml".includes(ext))
+          isJrxml = true;
+        if (ext && ".jasper".includes(ext))
+          isJasper = true;
+      });
+      if (isJrxml && isJasper)
         return true;
-      }
-      let rExt = /\.([^.]+)$/;
-      let ext = rExt.exec(file.name) ? RegExp.$1.toLowerCase() : "";
-      res = format.includes(ext);
-      return res;
+      return false;
     }
     expose({
       submit
@@ -96,46 +118,44 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             default: withCtx(() => [
               createVNode(unref(NSpace), { vertical: "" }, {
                 default: withCtx(() => [
-                  (openBlock(true), createElementBlock(Fragment, null, renderList(fileList.value, (file, index) => {
-                    return openBlock(), createBlock(unref(NUpload), {
-                      "directory-dnd": "",
-                      max: 1,
-                      key: file.key,
-                      onBeforeUpload,
-                      onChange: (data) => onChange(data, index)
-                    }, {
-                      default: withCtx(() => [
-                        createVNode(unref(NUploadDragger), null, {
-                          default: withCtx(() => [
-                            createElementVNode("div", _hoisted_1, [
-                              createVNode(unref(NIcon), {
-                                size: "36",
-                                depth: 3,
-                                component: unref(Archive)
-                              }, null, 8, ["component"])
-                            ]),
-                            createVNode(unref(NText), { style: { "font-size": "14px" } }, {
-                              default: withCtx(() => [
-                                createTextVNode("\u70B9\u51FB\u6216\u8005\u62D6\u52A8\u6587\u4EF6\u5230\u8BE5\u533A\u57DF\u6765\u4E0A\u4F20")
-                              ]),
-                              _: 1
-                            }),
-                            createVNode(unref(NP), {
-                              depth: "3",
-                              style: { "margin": "5px 0 0 0" }
-                            }, {
-                              default: withCtx(() => [
-                                createTextVNode("xxxxxx." + toDisplayString(file.key), 1)
-                              ]),
-                              _: 2
-                            }, 1024)
+                  createVNode(unref(NUpload), {
+                    multiple: "",
+                    "directory-dnd": "",
+                    "file-list": fileList.value,
+                    "onUpdate:file-list": _cache[0] || (_cache[0] = ($event) => fileList.value = $event),
+                    onRemove
+                  }, {
+                    default: withCtx(() => [
+                      createVNode(unref(NUploadDragger), null, {
+                        default: withCtx(() => [
+                          createElementVNode("div", _hoisted_1, [
+                            createVNode(unref(NIcon), {
+                              size: "36",
+                              depth: 3,
+                              component: unref(Archive)
+                            }, null, 8, ["component"])
                           ]),
-                          _: 2
-                        }, 1024)
-                      ]),
-                      _: 2
-                    }, 1032, ["onChange"]);
-                  }), 128))
+                          createVNode(unref(NText), { style: { "font-size": "12px" } }, {
+                            default: withCtx(() => [
+                              createTextVNode("\u70B9\u51FB\u6216\u8005\u62D6\u52A8\u6587\u4EF6\u5230\u8BE5\u533A\u57DF\u6765\u4E0A\u4F20")
+                            ]),
+                            _: 1
+                          }),
+                          createVNode(unref(NP), {
+                            depth: "3",
+                            style: { "margin": "5px 0 0 0", "font-size": "13px" }
+                          }, {
+                            default: withCtx(() => [
+                              createTextVNode("\u81F3\u5C11\u5305\u542B\u4E00\u4E2Ajxml\u6587\u4EF6\u548C\u4E00\u4E2Ajasper\u6587\u4EF6")
+                            ]),
+                            _: 1
+                          })
+                        ]),
+                        _: 1
+                      })
+                    ]),
+                    _: 1
+                  }, 8, ["file-list"])
                 ]),
                 _: 1
               })

package/es/components/button-print/src/components/IdentityVerification.vue.d.ts

@@ -358,59 +358,69 @@ declare const _default: import("vue").DefineComponent<{
         readonly ignorePathChange: boolean;
     }>;
     NInput: any;
-    EditFormat: import("vue").DefineComponent<{}, {
+    EditFormat: import("vue").DefineComponent<{
+        formatId: {
+            type: StringConstructor;
+            required: false;
+        };
+        token: {
+            type: StringConstructor;
+            required: true;
+        };
+    }, {
         PROTOCOL: string;
         HOST: string;
+        BASEURL: string;
         SAVEIREPORT: string;
+        QUERYFILELIST: string;
+        DELETEFILE: string;
         instance: import("axios").AxiosInstance;
         $message: import("naive-ui").MessageApi;
+        props: {
+            formatId?: string | undefined;
+            token: string;
+        };
         fileList: import("vue").Ref<{
-            key: string;
-            value: {
-                id: string;
-                name: string;
-                batchId?: string | null | undefined;
-                percentage?: number | null | undefined;
-                status: "error" | "pending" | "uploading" | "finished" | "removed";
-                url?: string | null | undefined;
-                file?: {
-                    readonly lastModified: number;
-                    readonly name: string;
-                    readonly webkitRelativePath: string;
-                    readonly size: number;
-                    readonly type: string;
-                    arrayBuffer: {
-                        (): Promise<ArrayBuffer>;
-                        (): Promise<ArrayBuffer>;
-                    };
-                    slice: {
-                        (start?: number | undefined, end?: number | undefined, contentType?: string | undefined): Blob;
-                        (start?: number | undefined, end?: number | undefined, contentType?: string | undefined): Blob;
-                    };
-                    stream: {
-                        (): ReadableStream<Uint8Array>;
-                        (): NodeJS.ReadableStream;
-                    };
-                    text: {
-                        (): Promise<string>;
-                        (): Promise<string>;
-                    };
-                } | null | undefined;
-                thumbnailUrl?: string | null | undefined;
-                type?: string | null | undefined;
-                fullPath?: string | null | undefined;
-            }[];
+            id: string;
+            name: string;
+            batchId?: string | null | undefined;
+            percentage?: number | null | undefined;
+            status: "error" | "pending" | "uploading" | "finished" | "removed";
+            url?: string | null | undefined;
+            file?: {
+                readonly lastModified: number;
+                readonly name: string;
+                readonly webkitRelativePath: string;
+                readonly size: number;
+                readonly type: string;
+                arrayBuffer: {
+                    (): Promise<ArrayBuffer>;
+                    (): Promise<ArrayBuffer>;
+                };
+                slice: {
+                    (start?: number | undefined, end?: number | undefined, contentType?: string | undefined): Blob;
+                    (start?: number | undefined, end?: number | undefined, contentType?: string | undefined): Blob;
+                };
+                stream: {
+                    (): ReadableStream<Uint8Array>;
+                    (): NodeJS.ReadableStream;
+                };
+                text: {
+                    (): Promise<string>;
+                    (): Promise<string>;
+                };
+            } | null | undefined;
+            thumbnailUrl?: string | null | undefined;
+            type?: string | null | undefined;
+            fullPath?: string | null | undefined;
         }[]>;
-        submit: (datas: import("../../../../shared/types").AnyObject) => Promise<unknown>;
-        onChange: (data: {
+        queryFileList: () => void;
+        onRemove: (options: {
             file: import("naive-ui").UploadFileInfo;
             fileList: import("naive-ui").UploadFileInfo[];
-        }, index: number) => void;
-        onBeforeUpload: (data: {
-            file: import("naive-ui").UploadFileInfo;
-            fileList: import("naive-ui").UploadFileInfo[];
-        }) => Promise<boolean>;
-        validateFormat: (file: import("naive-ui").UploadFileInfo, format: string) => boolean;
+        }) => Promise<unknown>;
+        submit: (datas: import("../../../../shared/types").AnyObject) => Promise<unknown>;
+        validateFormat: () => boolean;
         NForm: any;
         NFormItem: import("vue").DefineComponent<{
             readonly label: StringConstructor;
@@ -1578,7 +1588,16 @@ declare const _default: import("vue").DefineComponent<{
         }>;
         NSpace: any;
         Archive: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
-    }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        formatId: {
+            type: StringConstructor;
+            required: false;
+        };
+        token: {
+            type: StringConstructor;
+            required: true;
+        };
+    }>>, {}>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "success" | "update:modelValue")[], "close" | "success" | "update:modelValue", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     verifyUser: {
         type: FunctionConstructor;

package/es/components/button-print/src/components/IdentityVerification.vue.js

@@ -71,12 +71,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     };
     const submitEditFile = async () => {
-      var _a;
+      var _a, _b;
       try {
         loading.value = true;
-        const data = await ((_a = editFormRef.value) == null ? void 0 : _a.submit({
+        const data = await ((_b = editFormRef.value) == null ? void 0 : _b.submit({
           authorizationKey: token.value,
-          id: props.formatId,
+          id: (_a = props.formatId) == null ? void 0 : _a.split("_")[1],
           templateId: props.templateId,
           datasourceName: null,
           dataSourceId: null
@@ -117,7 +117,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               key: 0,
               ref_key: "editFormRef",
               ref: editFormRef
-            }, _ctx.$attrs), null, 16)) : (openBlock(), createBlock(unref(NForm), {
+            }, _ctx.$attrs, {
+              formatId: __props.formatId,
+              token: token.value
+            }), null, 16, ["formatId", "token"])) : (openBlock(), createBlock(unref(NForm), {
               key: 1,
               class: "login-form-button-print",
               ref_key: "formRef",

package/es/components/button-print/style/index.css

@@ -1 +1 @@
-.dropdown-button{border-color:#d5d5d5!important;color:#212121}.c-dropdown .n-dropdown-menu-wrapper span.active{color:#5585f5}.login-form-button{border-radius:24px;color:#fff;font-size:16px;height:50px;width:100%}.login-form-button-print{padding-top:15px}.login-form-button-print .n-input{border-radius:6px;color:#757575;font-size:14px;height:50px;line-height:50px}.c-button-print-modal .n-form-item-feedback-wrapper{display:none}.c-button-preview-modal{max-width:none}.c-button-preview-modal .n-dialog__content{height:98%}
+.dropdown-button{border-color:#d5d5d5!important;color:#212121}.c-dropdown .n-dropdown-menu-wrapper span.active{color:#5585f5}.login-form-button{border-radius:24px;color:#fff;font-size:16px;height:50px;width:100%}.login-form-button-print{padding-top:15px}.login-form-button-print .n-input{border-radius:6px;color:#757575;font-size:14px;height:50px;line-height:50px}.c-button-print-modal .n-form-item-feedback-wrapper{display:none}.n-dialog.n-modal.c-button-preview-modal{max-width:none}.n-dialog.n-modal.c-button-preview-modal .n-dialog__content{height:98%}

package/es/components/fabric-chart/src/hooks/useCenter.js

@@ -250,6 +250,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     });
   }
   function drawPolyLine(item, dataIndex, scaleValue) {
+    var _a;
     const {
       type,
       riseStyle = {},
@@ -264,7 +265,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     const pointList = [];
     const lineList = [];
     const otherList = [];
-    item.list.forEach((v, index) => {
+    (_a = item.list) == null ? void 0 : _a.forEach((v, index) => {
       const _item = type !== "temperature" ? item : dataList.find((_v) => _v.key === v.key);
       const points = getPointer(v, scaleValue);
       const otherObj = {};
@@ -311,7 +312,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       };
     }
     function drawOther(points, v, _item, otherObj) {
-      var _a;
+      var _a2;
       if (!(points == null ? void 0 : points.length) || !["temperature", "pain"].includes(type))
         return;
       const { lineAttr = {} } = _item;
@@ -355,7 +356,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           ...reduceStyle.line,
           ...defaultStyle
         });
-        reducePoint = drawPoint(((_a = reduceStyle == null ? void 0 : reduceStyle.point) == null ? void 0 : _a.type) || "circle", {
+        reducePoint = drawPoint(((_a2 = reduceStyle == null ? void 0 : reduceStyle.point) == null ? void 0 : _a2.type) || "circle", {
           left: points[0],
           top: reduceY,
           ...reduceStyle.point,
@@ -658,9 +659,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
   }
   function redrawPoints() {
     var _a;
-    if (!gridPoints.size)
-      return;
-    (_a = canvas.value) == null ? void 0 : _a.remove(...getRemovePoints([...gridPoints]));
+    gridPoints.size && ((_a = canvas.value) == null ? void 0 : _a.remove(...getRemovePoints([...gridPoints])));
     shadowPointCache = [];
     gridPoints.clear();
     maiboPoints.clear();

package/es/components/fabric-chart/src/hooks/useGrid.js

@@ -1,6 +1,6 @@
 import { onMounted, nextTick } from 'vue';
 import { fabric } from '../utils/index.js';
-import { drawLine } from './useDraw.js';
+import { drawLine, defaultBorderStyle } from './useDraw.js';
 
 function useGrid(canvas, propItems) {
   var _a, _b;
@@ -25,10 +25,10 @@ function useGrid(canvas, propItems) {
       style = grid.subSecondLineStyle || {};
     }
     if (i % grid.subXCell === 0) {
-      style = ((_b = grid.mainLineStyle) == null ? void 0 : _b.y) || {};
+      style = i !== 0 && i !== gridXNumber ? ((_b = grid.mainLineStyle) == null ? void 0 : _b.y) || {} : defaultBorderStyle;
     }
     const line = drawLine([x, originY, x, endY], style);
-    if (i % grid.subXCell === 0) {
+    if (i % grid.subXCell === 0 && i !== 0 && i !== gridXNumber) {
       mainList.add(line);
     } else {
       xList.push(line);

package/es/components/fabric-chart/src/interface.d.ts

@@ -40,7 +40,7 @@ export interface IPropItems {
     left: ILeft;
     right: IRight | undefined;
     bottom: any;
-    other: IOther;
+    other?: IOther;
     painIndex: number;
     painHeight: number;
     painOriginY: any;

package/es/components/form-render/index.js

@@ -16,7 +16,7 @@ export { useAnchor } from './src/hooks/useAnchor.js';
 export { useAutographOptions } from './src/hooks/useAutographOptions.js';
 export { useFormContext } from './src/hooks/useFormContext.js';
 export { useCommonInjection, useSelectOptionProps } from './src/hooks/useCommonInjection.js';
-export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser } from './src/utils/index.js';
+export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, mergeDeepProperties, optionMatcherWithKeyword, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser } from './src/utils/index.js';
 export * from '@formily/core';
 export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './src/utils/business.js';
 export { findNextWidget, queryDecorator, queryInput } from './src/utils/dom.js';

package/es/components/form-render/src/components/renderer/select.js

@@ -5,7 +5,7 @@ import { useCommonInjection, useSelectOptionProps } from '../../hooks/useCommonI
 import { InjectionAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index.js';
 import '../../../../../shared/utils/index.js';
 import '../../../index.js';
-import { createUrlConfigParams, formRenderLog, optionMatcher } from '../../utils/index.js';
+import { createUrlConfigParams, formRenderLog, optionMatcherWithKeyword } from '../../utils/index.js';
 import { useFormField } from '../../hooks/useFormField.js';
 import '../../../../../shared/utils/tapable/SyncHook.js';
 import '../../../../../shared/utils/tapable/SyncBailHook.js';
@@ -91,10 +91,10 @@ const script = defineComponent({
     }, 300);
     const parsedOptions = computed(() => {
       if (remoteOptions.value)
-        return optionMatcher(remoteOptions.value, lastSearch.value, labelKey.value);
+        return optionMatcherWithKeyword(remoteOptions.value, lastSearch.value, labelKey.value);
       if (!Array.isArray(props.options))
         return [];
-      return optionMatcher(props.options, lastSearch.value, labelKey.value);
+      return optionMatcherWithKeyword(props.options, lastSearch.value, labelKey.value);
     });
     const changeContextCollector = inject(InjectionChangeContextCollector);
     changeContextCollector.setContext(fieldKey.value, (v) => {

package/es/components/form-render/src/hooks/useAutographOptions.js

@@ -3,7 +3,7 @@ import { isString, isEqual } from 'lodash-es';
 import { getCurrentInstance, inject, computed, ref, watch } from 'vue';
 import '../../index.js';
 import { InjectionAsyncQueue } from '../constants/index.js';
-import { formRenderLog, optionMatcher } from '../utils/index.js';
+import { formRenderLog, optionMatcherWithKeyword } from '../utils/index.js';
 import { useFormField } from './useFormField.js';
 import { useFormRequest } from './useFormRequest.js';
 
@@ -50,7 +50,7 @@ function useAutographOptions(props, valueRef) {
   }, 300);
   const options = computed(() => {
     var _a;
-    return remoteOptions.value ? optionMatcher(remoteOptions.value, lastSearch.value, labelKey.value) : (_a = props.options) != null ? _a : [];
+    return remoteOptions.value ? optionMatcherWithKeyword(remoteOptions.value, lastSearch.value, labelKey.value) : (_a = props.options) != null ? _a : [];
   });
   watch(
     () => props.wordbook,

package/es/components/form-render/src/utils/index.d.ts

@@ -13,8 +13,8 @@ export declare function createSlot(renderer: unknown, props: AnyObject, defaultR
     default(): any;
 };
 export declare function createInputSlot(props: AnyObject, defaultRenderer?: (v: unknown) => unknown[]): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}>>>;
-export declare function presetRequestHandler(res: unknown): any;
-export declare function optionMatcher(options: AnyObject[], input: Nullable<string>, key: string, matcherOption?: {
+export declare function presetRequestHandler(res: unknown): AnyObject[];
+export declare function optionMatcherWithKeyword(options: AnyObject[], input: Nullable<string>, key: string, matcherOption?: {
     keyword?: string;
 }): AnyObject[];
 export declare function validateMessageParser(message: string, fieldItem: Omit<FieldItem, 'reactions'>): string;

package/es/components/form-render/src/utils/index.js

@@ -83,7 +83,10 @@ function createInputSlot(props, defaultRenderer) {
 function presetRequestHandler(res) {
   if (!isObject(res))
     throw res;
-  return res.result && res.map ? handlerSearch(res) : handlerSelect(res);
+  return isSearchResult(res) ? handlerSearch(res) : isRecommendResult(res) ? handlerRecommend(res) : isSelectResult(res) ? handlerSelect(res) : [];
+  function isSelectResult(res2) {
+    return Reflect.has(res2, "data") && Reflect.has(res2, "success");
+  }
   function handlerSelect(res2) {
     const {
       data,
@@ -93,6 +96,9 @@ function presetRequestHandler(res) {
       throw res2;
     return data;
   }
+  function isSearchResult(res2) {
+    return Reflect.has(res2, "map") && Reflect.has(res2, "result");
+  }
   function handlerSearch(res2) {
     const {
       result,
@@ -102,6 +108,24 @@ function presetRequestHandler(res) {
       throw res2;
     return map.rows;
   }
+  function isRecommendResult(res2) {
+    return Reflect.has(res2, "result") && Reflect.has(res2, "obj");
+  }
+  function handlerRecommend(res2) {
+    const {
+      obj,
+      result
+    } = res2;
+    if (result !== "SUCCESS" || !isObject(obj))
+      throw res2;
+    return Object.entries(obj).reduce((res3, [type, list]) => {
+      list.forEach((item) => res3.push({
+        ...item,
+        type
+      }));
+      return res3;
+    }, []);
+  }
 }
 const keywordMatcher = useMemoize(function(text, keyword) {
   if (!isString(keyword) || !isString(text))
@@ -114,7 +138,7 @@ const keywordMatcher = useMemoize(function(text, keyword) {
     }, "");
   }
 });
-function optionMatcher(options, input, key, matcherOption = {
+function optionMatcherWithKeyword(options, input, key, matcherOption = {
   keyword: "keyword"
 }) {
   if (!input)
@@ -228,4 +252,4 @@ async function createUrlConfigParams({
   };
 }
 
-export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser };
+export { combineExtendKey, createInputSlot, createSlot, createUrlConfigParams, formRenderLog, injectOrProvide, isNestedFieldType, isNestedType, mergeDeepProperties, optionMatcherWithKeyword, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser };