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

package/es/components/form-config/index.d.ts

@@ -938,6 +938,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 name?: string | undefined;
                 render_key?: string[] | undefined;
                 search_key?: string[] | undefined;
+                primary_key?: string | undefined;
                 type?: string | undefined;
                 value_key?: string | undefined;
                 level_key?: string | undefined;

package/es/components/form-config/src/FormConfig.vue.d.ts

@@ -940,6 +940,7 @@ declare const _default: import("vue").DefineComponent<{
                 name?: string | undefined;
                 render_key?: string[] | undefined;
                 search_key?: string[] | undefined;
+                primary_key?: string | undefined;
                 type?: string | undefined;
                 value_key?: string | undefined;
                 level_key?: string | undefined;

package/es/components/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -67,6 +67,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             name?: string | undefined;
             render_key?: string[] | undefined;
             search_key?: string[] | undefined;
+            primary_key?: string | undefined;
             type?: string | undefined;
             value_key?: string | undefined;
             level_key?: string | undefined;

package/es/components/form-render/src/components/renderer/levelSearchCascade.d.ts

@@ -24,6 +24,7 @@ export declare const LEVEL_SEARCH_CASCADE: import("vue").DefineComponent<{
             name: string;
             render_key: string[];
             search_key: string[];
+            primary_key: string;
             type: string;
             value_key: string;
             level_key: string;
@@ -62,6 +63,7 @@ export declare const LEVEL_SEARCH_CASCADE: import("vue").DefineComponent<{
             name: string;
             render_key: string[];
             search_key: string[];
+            primary_key: string;
             type: string;
             value_key: string;
             level_key: string;

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

@@ -1,5 +1,4 @@
 import { defineComponent, computed, ref, inject, watch, createVNode } from 'vue';
-import { arrayed } from '../../../../../shared/utils/index2.js';
 import { isEqual, isString, isEmpty } from 'lodash-es';
 import '../../../index2.js';
 import { InjectAsyncQueue } from '../../constants/index2.js';
@@ -74,7 +73,7 @@ const script = defineComponent({
           valueRef.value = createOptionValue(node);
           return;
         }
-        const result = await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, field.value, fieldKey.value));
+        const result = await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, field.value, node, fieldKey.value));
         if (!node) {
           optionsRef.value = result.map((option) => {
             option.__keyword = !!keyword;
@@ -137,13 +136,15 @@ const script = defineComponent({
       function parseLinkFromString2List(linkString) {
         return linkString.split("_").filter((s) => s);
       }
-      function createParams(wordbook, autograph, field2, key2) {
+      function createParams(wordbook, autograph, field2, node2, key2) {
         const params = {
           autograph,
           wordbookId: wordbook.id,
           wordbookType: wordbook.type,
           fieldKeys: wordbook.search_key ? JSON.stringify(wordbook.search_key) : void 0,
-          conObj: wordbook.conObj ? JSON.stringify(enrichConObj(wordbook.conObj, node)) : void 0,
+          conObj: JSON.stringify(createConfigObject(wordbook), node2),
+          primaryKey: wordbook.primary_key,
+          levelKey: wordbook.level_key,
           keyword,
           page: 1
         };
@@ -152,19 +153,24 @@ const script = defineComponent({
           params,
           key: key2
         };
-        function enrichConObj(conObj, node2) {
-          return arrayed(conObj).map((item) => ({
-            ...item,
-            value: node2 == null ? void 0 : node2[valueKey.value]
-          }));
-        }
+      }
+      function createConfigObject(wordbook, node2) {
+        if (!node2)
+          return wordbook.conObjFirstLevel || [];
+        return [{
+          con: "EQ",
+          is_compare_field: false,
+          field_key: wordbook.level_key,
+          value: node2[valueKey.value]
+        }];
       }
     }
     async function fetchPrimaryKeyValue(primaryKeys) {
       if (!getSearchRequestInfo().primaryKeyUrl)
         return [];
       try {
-        return await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, primaryKeys, fieldKey.value));
+        const params = createParams(props.wordbook, props.autograph, primaryKeys, fieldKey.value);
+        return await asyncQueue.addAsync(params);
       } catch (e) {
         isString(e) && formRenderLog(e);
       }
@@ -172,10 +178,12 @@ const script = defineComponent({
         const requestInfo = getSearchRequestInfo();
         return {
           key: key2,
-          autograph,
-          tableId: wordbook.id,
-          primaryKeyValue: primaryKeys2.join(","),
-          page: 1,
+          params: {
+            autograph,
+            tableId: wordbook.id,
+            primaryKeyValue: primaryKeys2.join(","),
+            page: 1
+          },
           ...requestInfo,
           url: requestInfo.primaryKeyUrl
         };

package/es/components/form-render/src/components/renderer/search.d.ts

@@ -19,6 +19,7 @@ export declare const SEARCH: import("vue").DefineComponent<{
             name: string;
             render_key: string[];
             search_key: string[];
+            primary_key: string;
             type: string;
             value_key: string;
             level_key: string;
@@ -53,6 +54,7 @@ export declare const SEARCH: import("vue").DefineComponent<{
             name: string;
             render_key: string[];
             search_key: string[];
+            primary_key: string;
             type: string;
             value_key: string;
             level_key: string;

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

@@ -3,6 +3,7 @@ import { useDebounceFn } from '@vueuse/core';
 import { isString, cloneDeep, isEqual } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { InjectAsyncQueue, InjectionChangeContextCollector } from '../../constants/index2.js';
+import '../../../../../shared/utils/index2.js';
 import '../../../index2.js';
 import { formRenderLog, optionMatcher } from '../../utils/index.js';
 import { useFormRequest } from '../../hooks/useFormRequest2.js';

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

@@ -3,6 +3,7 @@ import { isField } from '@formily/core';
 import { isEqual, isArray } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { InjectAsyncQueue } from '../../constants/index2.js';
+import '../../../../../shared/utils/index2.js';
 import '@vueuse/core';
 import '../../../index2.js';
 import '../../utils/index.js';

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

@@ -4,6 +4,7 @@ import { useDebounceFn } from '@vueuse/core';
 import { isString, cloneDeep, isEqual } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { InjectAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index2.js';
+import '../../../../../shared/utils/index2.js';
 import '../../../index2.js';
 import { formRenderLog, optionMatcher } from '../../utils/index.js';
 import { useFormField } from '../../hooks/useFormField2.js';

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

@@ -72,6 +72,7 @@ export declare type FormWordbook = Partial<{
     name: string;
     render_key: string[];
     search_key: string[];
+    primary_key: string;
     type: string;
     value_key: string;
     level_key: string;