sun-biz 0.0.3-beta.24 → 0.0.3-beta.26

package/dist/components/biz-select/dict-select/api.d.ts

@@ -19,7 +19,7 @@ export declare const queryDictDataListByExample: (params: {
     codeSystemNo?: string;
     keyWord?: string;
     hospitalId: string;
-    sysMenuId: string;
+    menuId: string;
     pageNumber: number;
     pageSize: number;
 }) => Promise<[import("@sun-toolkit/request").SunApiResultData<null> | undefined, import("@sun-toolkit/request").SunApiResultData<ReqDictDataListByExample> | undefined]>;

package/dist/components/form-design-render/utils.d.ts

@@ -40,19 +40,16 @@ export declare function expansionGroup(data: FormDesignDetailInfo[], result?: Fo
  */
 export declare function getComponentType(item: FormDesignDetailInfo): string;
 export declare function getPlaceholder(item: FormDesignDetailInfo): string;
-export declare function getExtraProps(item: FormDesignDetailInfo, dataValueNames?: {
+export declare function getExtraProps(item: FormDesignDetailInfo, parentFormCtlNo: string, afterValueChange: ((key: string, model: unknown, parentFormCtlNo: string) => void) | undefined, dataValueNames?: {
     [key: string]: [];
 }, modelValue?: {
     [key: string]: unknown;
 }): {
-    [x: string]: unknown;
+    onBlur: () => void;
 };
-export declare function useGetFromConfigData(result: FormDesignDetailInfo[], layoutTypeCode: number, parentFormCtlNo: string, afterValueChange: ((key: string, value: unknown, model: unknown, parentFormCtlNo: string) => void) | undefined): {
+export declare function useGetFromConfigData(result: FormDesignDetailInfo[], layoutTypeCode: number): {
     label: string | undefined;
     name: string;
-    onModelChange: (value: unknown, model: {
-        [key: string]: unknown;
-    }) => void;
     component: string;
     placeholder: string;
     defaultValue: {};
@@ -61,7 +58,7 @@ export declare function useGetFromConfigData(result: FormDesignDetailInfo[], lay
     rules: {
         required: boolean;
         message: string;
-        trigger: string;
+        trigger: string[];
     }[];
     extraProps: {
         [key: string]: unknown;

package/dist/components/index.js

@@ -1062,7 +1062,7 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                     componentId.value = result.data[0].componentId || '';
                     serveDbgridComponentSettingList.value = result.data[0].dbgridComponentSettingList || [];
                     if (serveDbgridComponentSettingList.value.length) {
-                        if (!isAdmin) {
+                        if (!isAdmin || userInfo?.userJobCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG_STR.NO) {
                             influenceScopeCode.value = __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.INFLUENCE_SCOPE_CODE.PRiVATE;
                             bizId.value = userInfo?.userId || '';
                             userList.value = [
@@ -1450,7 +1450,7 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
 const dbgrid_component_setting_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dbgrid_component_settingvue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-71f309b8"
+        "data-v-1e6d29ee"
     ]
 ]);
 /* ESM default export */ const dbgrid_component_setting = dbgrid_component_setting_exports_;
@@ -3413,7 +3413,7 @@ const patient_accessvue_type_script_setup_true_lang_ts_hoisted_1 = {
  */ const getComponentConfig = async ()=>{
             loading.value = true;
             const [, res] = await queryPatientAccessConfig({
-                sysMenuId: __props.menuId,
+                menuId: __props.menuId,
                 componentCode: __props.code,
                 enabledFlag: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES
             });
@@ -4576,7 +4576,7 @@ const createPrint = ()=>{
     };
     /** 校验参数是否都传了 */ const validateParams = (params)=>{
         if (!validateRequired(params?.designFlag, "设计时标志不能为空")) return;
-        if (!validateRequired(params?.sysMenuId, "系统菜单标识不能为空")) return;
+        if (!validateRequired(params?.menuId, "系统菜单标识不能为空")) return;
         if (!validateRequired(params?.receiptId, "单据标识不能为空")) return;
         if (!validateRequired(params?.bizIdTypeCode, "业务标识类型代码不能为空")) return;
         if (!validateRequired(params?.bizIds, "业务标识集合不能为空")) return;
@@ -4643,7 +4643,7 @@ const createPrint = ()=>{
         if (!receiptPrintRuleCode) return;
         let code = receiptPrintCategCode;
         if (receiptPrintRuleCode === constant_RECEIPT_PRINT_RULE_CODE.MENU) {
-            const menuReceiptInfo = menuXReceiptList?.find((item)=>item.sysXMenuId === defaultContext.printParams?.sysMenuId);
+            const menuReceiptInfo = menuXReceiptList?.find((item)=>item.menuId === defaultContext.printParams?.menuId);
             code = menuReceiptInfo?.receiptPrintCategCode || receiptPrintCategCode;
         }
         const isConfirmed = await messageBoxAskJudge(code, receiptNameDisplay);
@@ -4743,7 +4743,7 @@ const createPrint = ()=>{
                 }
                 const [err, res] = await (0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_request__.interfaceInvoke)({
                     interfaceId: defaultContext?.printParams?.invoiceInfo?.invoiceInterfaceId ?? defaultContext?.receiptInfo?.invoiceInterfaceId,
-                    menuId: defaultContext?.printParams?.sysMenuId,
+                    menuId: defaultContext?.printParams?.menuId,
                     tradeCode: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.INVOICE_CODE.INV001,
                     params: {
                         receiptId: defaultContext?.printParams?.receiptId,
@@ -4779,7 +4779,7 @@ const createPrint = ()=>{
                 }));
             const [err, res] = await (0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_request__.interfaceInvoke)({
                 interfaceId: defaultContext?.printParams?.invoiceInfo?.invoiceInterfaceId ?? defaultContext?.receiptInfo?.invoiceInterfaceId,
-                menuId: defaultContext?.printParams?.sysMenuId,
+                menuId: defaultContext?.printParams?.menuId,
                 tradeCode: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.INVOICE_CODE.INV101,
                 params: {
                     invoiceAllotId: defaultContext?.printParams?.invoiceInfo?.invoiceAllotId ?? void 0,
@@ -4801,7 +4801,7 @@ const createPrint = ()=>{
         if (defaultContext?.printParams?.invoiceInfo?.invOperateTypeCode === constant_INV_OPERATE_TYPE_CODE.REOPEN) {
             const [error, res] = await (0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_request__.interfaceInvoke)({
                 interfaceId: defaultContext?.printParams?.invoiceInfo?.invoiceInterfaceId ?? defaultContext?.receiptInfo?.invoiceInterfaceId,
-                menuId: defaultContext?.printParams?.sysMenuId,
+                menuId: defaultContext?.printParams?.menuId,
                 tradeCode: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.INVOICE_CODE.INV104,
                 params: {
                     invoiceAllotId: defaultContext?.printParams?.invoiceInfo?.invoiceAllotId,
@@ -4818,7 +4818,7 @@ const createPrint = ()=>{
         if (defaultContext?.printParams?.invoiceInfo?.invOperateTypeCode === constant_INV_OPERATE_TYPE_CODE.CHANGE) {
             const [err, res] = await (0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_request__.interfaceInvoke)({
                 interfaceId: defaultContext?.printParams?.invoiceInfo?.invoiceInterfaceId ?? defaultContext?.receiptInfo?.invoiceInterfaceId,
-                menuId: defaultContext?.printParams?.sysMenuId,
+                menuId: defaultContext?.printParams?.menuId,
                 tradeCode: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.INVOICE_CODE.INV103,
                 params: {
                     invoiceAllotId: defaultContext?.printParams?.invoiceInfo?.invoiceAllotId,
@@ -4835,7 +4835,7 @@ const createPrint = ()=>{
         if (defaultContext?.printParams?.invoiceInfo?.invOperateTypeCode === constant_INV_OPERATE_TYPE_CODE.RED) {
             const [err, res] = await (0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_request__.interfaceInvoke)({
                 interfaceId: defaultContext?.printParams?.invoiceInfo?.invoiceInterfaceId ?? defaultContext?.receiptInfo?.invoiceInterfaceId,
-                menuId: defaultContext?.printParams?.sysMenuId,
+                menuId: defaultContext?.printParams?.menuId,
                 tradeCode: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.INVOICE_CODE.INV102,
                 params: {
                     invoiceAllotId: defaultContext?.printParams?.invoiceInfo?.invoiceAllotId,
@@ -5078,7 +5078,7 @@ const Title_exports_ = Titlevue_type_script_setup_true_lang_ts_name_sunTitle;
  * [1-10098-1]根据条件查询表单设计内容
  * @param params
  * @returns
- */ const queryDictDataListByExample = (params)=>(0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_request__.dictRequest)('/dictCommon/queryDictDataListByExample', params);
+ */ const queryDictDataListByExample = (params)=>(0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_request__.dictRequest)("/dictCommon/queryDictDataListByExample", params);
 /* ESM default export */ const dict_selectvue_type_script_setup_true_lang_ts = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
     __name: 'index',
     props: {
@@ -5098,7 +5098,7 @@ const Title_exports_ = Titlevue_type_script_setup_true_lang_ts_name_sunTitle;
         }
     },
     emits: [
-        'change'
+        "change"
     ],
     setup (__props, { emit: __emit }) {
         const { menuId, currentOrg } = use_app_config([
@@ -5126,12 +5126,12 @@ const Title_exports_ = Titlevue_type_script_setup_true_lang_ts_name_sunTitle;
             if (props.codeSystemNo) params.codeSystemNo = props.codeSystemNo;
             if (props.dataDictionaryId) params.dataDictionaryId = props.dataDictionaryId;
             let [, result] = await queryDictDataListByExample({
-                dataSearchBizIdTypeCode: props.dataSearchBizIdTypeCode || '',
+                dataSearchBizIdTypeCode: props.dataSearchBizIdTypeCode || "",
                 keyWord: value,
-                sysMenuId: menuId || '',
+                menuId: menuId || "",
                 pageNumber: 1,
                 pageSize: 100,
-                hospitalId: currentOrg?.orgId || '',
+                hospitalId: currentOrg?.orgId || "",
                 ...params
             });
             loading.value = false;
@@ -5144,11 +5144,11 @@ const Title_exports_ = Titlevue_type_script_setup_true_lang_ts_name_sunTitle;
             }
         }
         /**
-   *
-   * @param value 下拉框选择
-   */ function change(value) {
-            let name = (tableData.value.find((item)=>item.value === value) || {})['label'];
-            emit('change', value, name);
+ *
+ * @param value 下拉框选择
+ */ function change(value) {
+            let name = (tableData.value.find((item)=>item.value === value) || {})["label"];
+            emit("change", value, name);
         }
         return (_ctx, _cache)=>{
             const _component_el_option = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-option");
@@ -5190,7 +5190,7 @@ const Title_exports_ = Titlevue_type_script_setup_true_lang_ts_name_sunTitle;
 const dict_select_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dict_selectvue_type_script_setup_true_lang_ts, [
     [
         '__scopeId',
-        "data-v-04804e6c"
+        "data-v-10687e3e"
     ]
 ]);
 /* ESM default export */ const dict_select = dict_select_exports_;
@@ -5801,20 +5801,8 @@ const COMMA = ',';
 }
 function getPlaceholder(item) {
     return item.hintMsg || `请${item.controlTypeCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.INPUT ? '输入' : '选择'}${item.labelNameDisplay || item.labelName}`;
-// return (
-//   item.hintMsg ||
-//   t(
-//     `global:placeholder.${
-//       item.controlTypeCode === CONTROL_TYPE_CODE.INPUT ? 'input' : 'select'
-//     }.template`,
-//     {
-//       name: item.labelNameDisplay || item.labelName,
-//       content: item.labelNameDisplay || item.labelName,
-//     }
-//   )
-// );
 }
-function getExtraProps(item, dataValueNames, modelValue) {
+function getExtraProps(item, parentFormCtlNo, afterValueChange, dataValueNames, modelValue) {
     const initObj = {
         defaultValue: item.defaultValue,
         defaultValueName: item.defaultValueName
@@ -5854,17 +5842,17 @@ function getExtraProps(item, dataValueNames, modelValue) {
         'inactive-value': __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.NO
     };
     return {
+        onBlur: ()=>{
+            if (afterValueChange) afterValueChange(item.bindingFieldNo, modelValue, parentFormCtlNo); // 调用函数并传递参数
+        },
         ...resultObj,
         ...item.extraProps || {}
     };
 }
-function useGetFromConfigData(result, layoutTypeCode, parentFormCtlNo, afterValueChange) {
+function useGetFromConfigData(result, layoutTypeCode) {
     return result.map((item)=>({
             label: item.labelNameDisplay || item.labelName,
             name: item.bindingFieldNo,
-            onModelChange: (value, model)=>{
-                if (afterValueChange) afterValueChange(item.bindingFieldNo, value, model, parentFormCtlNo); // 调用函数并传递参数
-            },
             component: getComponentType(item),
             placeholder: getPlaceholder(item),
             defaultValue: item.defaultValue || '',
@@ -5874,7 +5862,10 @@ function useGetFromConfigData(result, layoutTypeCode, parentFormCtlNo, afterValu
                 {
                     required: item.mustInputFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES,
                     message: getPlaceholder(item),
-                    trigger: 'change'
+                    trigger: [
+                        'blur',
+                        'change'
+                    ]
                 }
             ],
             extraProps: item.extraProps || {}
@@ -5962,13 +5953,13 @@ function useGetFromConfigData(result, layoutTypeCode, parentFormCtlNo, afterValu
         ], ()=>{
             const { result: initList, hideData: hideObj } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
             hideData.value = hideObj; /**
-     * 初次渲染
-     */ 
-            const initData = useGetFromConfigData(initList, props.layoutTypeCode, props.designDetailInfo.formCtlNo, afterValueChange);
+       * 初次渲染
+       */ 
+            const initData = useGetFromConfigData(initList, props.layoutTypeCode);
             formData.value = initData.map((item, index)=>({
                     ...item,
                     labelWidth: 110,
-                    extraProps: getExtraProps(initList[index] || {}, props.dataValueNames, modelValue.value)
+                    extraProps: getExtraProps(initList[index] || {}, props.designDetailInfo.formCtlNo, afterValueChange, props.dataValueNames, modelValue.value)
                 }));
         }, {
             immediate: true,
@@ -5990,46 +5981,41 @@ function useGetFromConfigData(result, layoutTypeCode, parentFormCtlNo, afterValu
             },
             getCurrentValue: ()=>modelValue.value
         });
-        return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, [
-                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(Title), {
-                    class: "mb-4",
-                    title: props.designDetailInfo.labelName
-                }, null, 8, [
-                    "title"
-                ]),
-                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(pro_form), {
-                    ref_key: "formRef",
-                    ref: formRef,
-                    modelValue: modelValue.value,
-                    "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>modelValue.value = $event),
-                    class: "ml-4 mr-4",
-                    disabled: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled),
-                    column: props.layoutTypeCode,
-                    data: formData.value
-                }, null, 8, [
-                    "modelValue",
-                    "disabled",
-                    "column",
-                    "data"
-                ])
-            ], 64));
+        return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(pro_form), {
+                ref_key: "formRef",
+                ref: formRef,
+                modelValue: modelValue.value,
+                "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>modelValue.value = $event),
+                class: "mr-2",
+                disabled: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled),
+                column: props.layoutTypeCode,
+                data: formData.value
+            }, null, 8, [
+                "modelValue",
+                "disabled",
+                "column",
+                "data"
+            ]));
     }
 });
 const Collapse_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Collapsevue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-39478274"
+        "data-v-359580de"
     ]
 ]);
 /* ESM default export */ const Collapse = Collapse_exports_;
 const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
-    class: "mb-4 mt-4"
+    class: "relative mb-3 mt-2 overflow-hidden pr-2 pl-2"
 };
 /* ESM default export */ const Tablevue_type_script_setup_true_lang_tsx = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
     __name: 'Table',
     props: {
         designDetailInfo: {},
-        dataValueNames: {}
+        dataValueNames: {
+            default: ()=>({})
+        },
+        changeCurData: {}
     },
     setup (__props, { expose: __expose }) {
         const props = __props;
@@ -6037,10 +6023,11 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
         const tableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const settingList = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
         const disabled = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('disabled');
+        const afterValueChange = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('afterValueChange');
         function useGetTableColumnData() {
             let { result, hideData: hideObj } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
             hideData.value = hideObj;
-            return result.map((item)=>({
+            let data = result.map((item)=>({
                     label: item.labelNameDisplay || item.labelName,
                     prop: item.bindingFieldNo,
                     editable: true,
@@ -6057,7 +6044,7 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                         }
                     ],
                     render: (row)=>{
-                        const extraProps = getExtraProps(item, props.dataValueNames, row);
+                        const extraProps = getExtraProps(item, props.designDetailInfo.formCtlNo, afterValueChange, props.dataValueNames, row);
                         return (0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(FormUnit, {
                             component: getComponentType(item),
                             label: item.labelNameDisplay || item.labelName,
@@ -6067,12 +6054,50 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                             'onUpdate:modelValue': (value)=>{
                                 row[item.bindingFieldNo] = value;
                             },
-                            disabled: extraProps.disabled || disabled
+                            disabled: extraProps.disabled || disabled,
+                            onChange: ()=>{
+                                props.changeCurData({
+                                    [props.designDetailInfo.bindingFieldNo]: settingList.value
+                                });
+                            }
                         });
                     }
                 }));
+            return [
+                ...data,
+                {
+                    label: '操作',
+                    prop: 'operation',
+                    width: 130,
+                    fixed: 'right',
+                    defaultValue: '',
+                    render: (row, index)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-button"), {
+                            type: "primary",
+                            link: true,
+                            onClick: ()=>{
+                                onDeleteItem(index);
+                            }
+                        }, {
+                            default: ()=>[
+                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-icon"), null, {
+                                        default: ()=>[
+                                                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(__WEBPACK_EXTERNAL_MODULE__element_sun_icons_vue__.Delete, null, null)
+                                            ]
+                                    })
+                                ]
+                        }, 8, [
+                            "onClick"
+                        ])
+                }
+            ];
         }
         const tableColumn = useGetTableColumnData();
+        function onDeleteItem(index) {
+            settingList.value = settingList.value.filter((cur, i)=>index !== i);
+            props.changeCurData({
+                [props.designDetailInfo.bindingFieldNo]: settingList.value
+            });
+        }
         function onAddItem() {
             let newObj = {
                 editable: true
@@ -6081,6 +6106,9 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                 if (item.defaultValue) newObj[item.prop] = item.defaultValue;
             });
             settingList.value.push(newObj);
+            props.changeCurData({
+                [props.designDetailInfo.bindingFieldNo]: settingList.value
+            });
         }
         __expose({
             submit: async ()=>{
@@ -6107,12 +6135,6 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
             const _component_el_icon = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-icon");
             const _component_el_button = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-button");
             return (0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", Tablevue_type_script_setup_true_lang_tsx_hoisted_1, [
-                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(Title), {
-                    class: "mb-4",
-                    title: props.designDetailInfo.labelName
-                }, null, 8, [
-                    "title"
-                ]),
                 (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(pro_table), {
                     ref_key: "tableRef",
                     ref: tableRef,
@@ -6126,8 +6148,10 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                 ]),
                 (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled) ? (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true) : ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(_component_el_button, {
                     key: 0,
-                    class: "w-full border-t-0",
-                    onClick: onAddItem
+                    type: "primary",
+                    class: "absolute right-4 top-1.5 z-50",
+                    onClick: onAddItem,
+                    link: true
                 }, {
                     default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
                             (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(_component_el_icon, null, {
@@ -6146,7 +6170,7 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
 const form_design_render_composables_Table_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Tablevue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-7c43a384"
+        "data-v-116d99e2"
     ]
 ]);
 /* ESM default export */ const form_design_render_composables_Table = form_design_render_composables_Table_exports_;
@@ -6171,13 +6195,13 @@ const form_design_render_composables_Table_exports_ = /*#__PURE__*/ (0, exportHe
         ], ()=>{
             const { result: initList, hideData: hideObj } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
             hideData.value = hideObj; /**
-     * 初次渲染
-     */ 
-            const initData = useGetFromConfigData(initList, props.layoutTypeCode, props.designDetailInfo.formCtlNo, afterValueChange);
+       * 初次渲染
+       */ 
+            const initData = useGetFromConfigData(initList, props.layoutTypeCode);
             formData.value = initData.map((item, index)=>({
                     ...item,
                     labelWidth: 110,
-                    extraProps: getExtraProps(initList[index] || {}, props.dataValueNames, modelValue.value)
+                    extraProps: getExtraProps(initList[index] || {}, props.designDetailInfo.formCtlNo, afterValueChange, props.dataValueNames, modelValue.value)
                 }));
         }, {
             immediate: true,
@@ -6205,35 +6229,27 @@ const form_design_render_composables_Table_exports_ = /*#__PURE__*/ (0, exportHe
                     [props.designDetailInfo.formCtlNo]: modelValue.value
                 })
         });
-        return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, [
-                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(Title), {
-                    class: "mb-4",
-                    title: props.designDetailInfo.labelName
-                }, null, 8, [
-                    "title"
-                ]),
-                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(pro_form), {
-                    ref_key: "formRef",
-                    ref: formRef,
-                    disabled: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled),
-                    modelValue: modelValue.value,
-                    "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>modelValue.value = $event),
-                    class: "ml-4 mr-4",
-                    column: props.layoutTypeCode,
-                    data: formData.value
-                }, null, 8, [
-                    "disabled",
-                    "modelValue",
-                    "column",
-                    "data"
-                ])
-            ], 64));
+        return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(pro_form), {
+                ref_key: "formRef",
+                ref: formRef,
+                disabled: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled),
+                modelValue: modelValue.value,
+                "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>modelValue.value = $event),
+                class: "mr-2",
+                column: props.layoutTypeCode,
+                data: formData.value
+            }, null, 8, [
+                "disabled",
+                "modelValue",
+                "column",
+                "data"
+            ]));
     }
 });
 const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_script_setup_true_lang_tsx_name_Set, [
     [
         '__scopeId',
-        "data-v-2b1a8223"
+        "data-v-5537cf67"
     ]
 ]);
 /* ESM default export */ const Set = Set_exports_;
@@ -6254,13 +6270,13 @@ const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_scri
    */ 
         const initData = useGetFromConfigData([
             props.designDetailInfo
-        ], props.layoutTypeCode, props.designDetailInfo.formCtlNo, afterValueChange); /**
+        ], props.layoutTypeCode); /**
    * 数据更新后获取对应的name
    */ 
         const formData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>initData.map((item)=>({
                     ...item,
                     labelWidth: 110,
-                    extraProps: getExtraProps(props.designDetailInfo, props.dataValueNames, modelValue.value)
+                    extraProps: getExtraProps(props.designDetailInfo, props.designDetailInfo.formCtlNo, afterValueChange, props.dataValueNames, modelValue.value)
                 })));
         __expose({
             submit: async ()=>{
@@ -6283,7 +6299,7 @@ const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_scri
                 disabled: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(disabled),
                 modelValue: modelValue.value,
                 "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>modelValue.value = $event),
-                class: "ml-4 mr-4",
+                class: "mr-2",
                 column: props.layoutTypeCode,
                 data: formData.value
             }, null, 8, [
@@ -6297,7 +6313,7 @@ const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_scri
 const Other_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Othervue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-76b2af85"
+        "data-v-605220c2"
     ]
 ]);
 /* ESM default export */ const Other = Other_exports_;
@@ -6391,6 +6407,7 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
             type: Function,
             default: ()=>{}
         },
+        changeCurData: {},
         rules: {
             default: ()=>({})
         }
@@ -6439,14 +6456,14 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
             if (result?.success) dataValueNames.value = result.data || {};
         }
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.provide)('disabled', props.disabled);
-        (0, __WEBPACK_EXTERNAL_MODULE_vue__.provide)('afterValueChange', (name, value, model, parentFormCtlNo)=>{
-            if (props.afterValueChange) props.afterValueChange(name, value, model, parentFormCtlNo);
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.provide)('afterValueChange', (name, model, parentFormCtlNo)=>{
+            if (props.afterValueChange) props.afterValueChange(name, model, parentFormCtlNo);
         });
         function setValue(data, loading) {
             let queryList = [];
             configList.value.forEach((item)=>{
                 if (loading) return;
-                const { result: list } = expansionGroup(item?.subFormControlList || [], []);
+                const { result: list = [] } = expansionGroup(item?.subFormControlList || [], []);
                 let result = {};
                 let otherDefaultValue = void 0 === getDefaultValue(data, item.bindingFieldNo) ? item.defaultValue : getDefaultValue(data, item.bindingFieldNo);
                 switch(item.controlTypeCode){
@@ -6462,7 +6479,7 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
                         });
                         break;
                     case __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.SET:
-                        list.forEach((cur)=>{
+                        (list || []).forEach((cur)=>{
                             let defaultValue = void 0 === getDefaultValue(data[item.formCtlNo] || {}, cur.bindingFieldNo) ? cur.defaultValue : getDefaultValue(data[item.formCtlNo] || {}, cur.bindingFieldNo);
                             result[cur.bindingFieldNo] = defaultValue || void 0;
                             if (cur.dataSearchBizIdTypeCode) queryList.push({
@@ -6625,11 +6642,13 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
                                         ref: (el)=>setRef(el, item),
                                         "layout-type-code": layoutTypeCode.value,
                                         "data-value-names": dataValueNames.value,
+                                        "change-cur-data": props.changeCurData,
                                         key: item.formControlId,
                                         "design-detail-info": item
                                     }, null, 8, [
                                         "layout-type-code",
                                         "data-value-names",
+                                        "change-cur-data",
                                         "design-detail-info"
                                     ]))), 128))
                             ]),
@@ -6672,7 +6691,7 @@ const FIELD_REF = 'fieldRef_'; // 存储动态 ref 的对象
 const form_design_render_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(form_design_rendervue_type_script_setup_true_lang_tsx_name_FormDesignRender, [
     [
         '__scopeId',
-        "data-v-702a5020"
+        "data-v-35271fd4"
     ]
 ]);
 /* ESM default export */ const form_design_render = form_design_render_exports_;

package/dist/components/static/css/index.css

@@ -31,5 +31,7 @@
 
 
 
-
+[data-v-35271fd4] .el-form-item {
+  margin-bottom: 12px !important;
+}
 

package/dist/hooks/index.d.ts

@@ -2,6 +2,6 @@ export { default as useRequest } from "./use-request/index.ts";
 export { default as useAppConfigData, MAIN_APP_CONFIG, } from "./use-app-config/index.ts";
 export type { PreferenceData } from "./use-app-config/index.ts";
 export { default as useDirectionSelect } from "./use-direction-select/index.ts";
-export { default as useFetchDataset } from "./use-fetch-dataset/index.ts";
+export { default as useFetchDataset, queryDataSetByCodeSystemCodes, type CodeSystem } from "./use-fetch-dataset/index.ts";
 export { default as useEditableTable } from './use-editable-table/index.ts';
 export { useColumnConfig, useFormConfig, } from "./use-column&form-config/index.ts";