cnhis-design-vue 3.1.23-beta.1 → 3.1.23-beta.12

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

@@ -79,8 +79,7 @@ function useFieldListAdaptor(collector) {
     function bindAutoGraphProps(schema2, item2) {
       schema2["x-component"] = "SEARCH";
       Object.assign(schema2["x-component-props"], {
-        ...pick(item2, ["wordbook", "lazyRequest"]),
-        autograph: item2.autograph
+        ...pick(item2, ["wordbook", "lazyRequest", "autograph"])
       });
     }
     function bindUrlProps(schema2, item2) {
@@ -106,7 +105,7 @@ function useFieldListAdaptor(collector) {
     });
     return schema;
   };
-  const createCascaderSchema = (item) => {
+  const createSearchCascadeSchema = (item) => {
     var _a;
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
@@ -116,6 +115,13 @@ function useFieldListAdaptor(collector) {
     });
     return schema;
   };
+  const createLevelSearchCascadeSchema = (item) => {
+    const schema = createStandardSchema(item);
+    Object.assign(schema["x-component-props"], {
+      ...pick(item, ["wordbook", "lazyRequest", "autograph"])
+    });
+    return schema;
+  };
   const createSwitchSchema = (item) => {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
@@ -210,7 +216,8 @@ function useFieldListAdaptor(collector) {
     ["INPUT_NUMBER", createInputNumberSchema],
     ["SELECT", createSelectSchema],
     ["DATE", createDateSchema],
-    ["SEARCH_CASCADE", createCascaderSchema],
+    ["LEVEL_SEARCH_CASCADE", createLevelSearchCascadeSchema],
+    ["SEARCH_CASCADE", createSearchCascadeSchema],
     ["COMBINATION", createCombinationSchema],
     ["RADIO", createRadioSchema],
     ["CHECKBOX", createRadioSchema],

package/es/components/form-render/src/hooks/useFormRequest.d.ts

@@ -4,6 +4,7 @@ declare type RequestInstance = Record<string, Func>;
 declare type SearchRequestInfo = {
     method: FormRequestType;
     url: string;
+    primaryKeyUrl?: string;
 };
 export declare function useFormRequest(): {
     getHttpInstance: () => Nullable<RequestInstance>;
@@ -11,6 +12,7 @@ export declare function useFormRequest(): {
     getSearchRequestInfo: () => {
         method: FormRequestType;
         url: string;
+        primaryKeyUrl?: string | undefined;
     };
     registGlobSearchInfo: (info: SearchRequestInfo) => void;
 };

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

@@ -1,5 +1,5 @@
 let http = null;
-const searchRequestInfo = { method: "post", url: "" };
+const searchRequestInfo = { method: "post", url: "", primaryKeyUrl: "" };
 function useFormRequest() {
   function getHttpInstance() {
     return http;

package/es/components/form-render/src/types/fieldItem.d.ts

@@ -72,8 +72,15 @@ export declare type FormWordbook = Partial<{
     name: string;
     render_key: string[];
     search_key: string[];
+    primary_key: string;
     type: string;
     value_key: string;
+    level_key: string;
+    link_key: string;
+    link_key_split: string;
+    show_key: string[];
+    conObj: AnyObject[];
+    conObjFirstLevel: AnyObject[];
 }>;
 export declare type FieldItem = {
     /**

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

@@ -27,16 +27,13 @@ function traverseDependKey(dependKeys, handler) {
       return handler(dependKey, valueKey);
     handler(dependKey, valueKey.key, valueKey.required);
   });
-  Object.entries(createDependKeyMap()).forEach(([dependKey, valueKey]) => {
-    handler(dependKey, valueKey);
-  });
   function createDependKeyMap() {
     const result = /* @__PURE__ */ new Map();
     if (isArray(dependKeys)) {
       dependKeys.forEach((k) => {
         var _a;
         if (isObject(k)) {
-          result.set(k.paramName, { key: (_a = k.paramName) != null ? _a : k.paramValue, required: k.required });
+          result.set(k.paramName, { key: (_a = k.paramValue) != null ? _a : k.paramName, required: k.required });
         } else {
           result.set(k, k);
         }