sun-biz 0.0.4-beta.27 → 0.0.4-beta.28

package/dist/components/index.js

@@ -4910,6 +4910,7 @@ const TAG_MARGIN = 1; // 1rem
         return (_ctx, _cache)=>{
             const _component_el_button = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-button");
             const _component_el_popover = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-popover");
+            const _component_el_icon = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-icon");
             return (0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", {
                 ref_key: "containerRef",
                 ref: containerRef,
@@ -4922,7 +4923,10 @@ const TAG_MARGIN = 1; // 1rem
                             key: item,
                             style: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeStyle)({
                                 background: allTagsMap.value.get(item)?.background,
-                                color: allTagsMap.value.get(item)?.color
+                                color: allTagsMap.value.get(item)?.color,
+                                borderColor: allTagsMap.value.get(item)?.color,
+                                '--el-tag-text-color': allTagsMap.value.get(item)?.color,
+                                '--el-tag-hover-color': allTagsMap.value.get(item)?.color
                             }),
                             closable: !props.disabled,
                             class: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeClass)([
@@ -4968,7 +4972,10 @@ const TAG_MARGIN = 1; // 1rem
                                             key: item,
                                             style: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeStyle)({
                                                 background: allTagsMap.value.get(item)?.background,
-                                                color: allTagsMap.value.get(item)?.color
+                                                color: allTagsMap.value.get(item)?.color,
+                                                borderColor: allTagsMap.value.get(item)?.color,
+                                                '--el-tag-text-color': allTagsMap.value.get(item)?.color,
+                                                '--el-tag-hover-color': allTagsMap.value.get(item)?.color
                                             }),
                                             closable: !props.disabled,
                                             size: props.tagSize,
@@ -5024,9 +5031,16 @@ const TAG_MARGIN = 1; // 1rem
                         }),
                         onClick: showSelect
                     }, {
-                        default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>_cache[3] || (_cache[3] = [
-                                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)(" + ")
-                            ])),
+                        default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(_component_el_icon, null, {
+                                    default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE__element_sun_icons_vue__.Plus), {
+                                                class: "text-primary"
+                                            })
+                                        ]),
+                                    _: 1
+                                })
+                            ]),
                         _: 1
                     }, 8, [
                         "class"
@@ -5175,7 +5189,8 @@ const PERSON = "PERSON"; //应该放到BIZ_ID_TYPE_CODE这个里面
             }
             const [, res] = await getBannerDataByBizId({
                 menuId: __props.menuId,
-                bizId: __props.bizId ?? void 0,
+                designFlag: __props.bizId ? __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.NO : void 0,
+                bizId: __props.bizId ? __props.bizId : "0",
                 bizIdTypeCode: BANNER_COMPONENT_CONFIG[__props.code].bizIdTypeCode,
                 componentId: BANNER_COMPONENT_CONFIG[__props.code].componentId
             });
@@ -6466,7 +6481,7 @@ const print = async (params)=>{
 const printReceiptBtn_exports_ = printReceiptBtnvue_type_script_setup_true_lang_ts_name_printReceipt;
 /* ESM default export */ const printReceiptBtn = printReceiptBtn_exports_;
 const Titlevue_type_script_setup_true_lang_ts_name_sunTitle_hoisted_1 = {
-    class: "relative pl-4 before:absolute before:left-0 before:top-[20%] before:h-2/3 before:w-1 before:bg-primary"
+    class: "relative pl-4 font-semibold before:absolute before:left-0 before:top-1/2 before:h-2/3 before:w-1 before:-translate-y-1/2 before:bg-primary"
 };
 /* ESM default export */ const Titlevue_type_script_setup_true_lang_ts_name_sunTitle = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
     __name: 'Title',
@@ -7031,20 +7046,20 @@ const user_select_exports_ = user_selectvue_type_script_setup_true_lang_ts_name_
                         isHidden: !props.multiSelectFlag,
                         selectable: (row)=>!(props.disabledValueIds?.length && row.orgId && props.disabledValueIds.includes(row.orgId)) && true
                     },
-                    {
-                        label: t('bizUnitSelect.table.orgTypeDescDisplay', '组织类型'),
-                        prop: 'orgTypeDescDisplay',
-                        minWidth: 80
-                    },
                     {
                         label: t('bizUnitSelect.table.orgNo', '编码'),
                         prop: 'orgNo',
-                        minWidth: 80
+                        minWidth: 100
                     },
                     {
                         label: t('bizUnitSelect.table.orgNameDisplay', '名称'),
                         prop: 'orgNameDisplay',
-                        minWidth: 80
+                        minWidth: 200
+                    },
+                    {
+                        label: t('bizUnitSelect.table.orgTypeDescDisplay', '组织类型'),
+                        prop: 'orgTypeDescDisplay',
+                        minWidth: 100
                     }
                 ]
         });
@@ -7099,7 +7114,7 @@ const user_select_exports_ = user_selectvue_type_script_setup_true_lang_ts_name_
         const handleChange = ()=>{
             let value = selectedRows.value.map((item)=>item.value || item.orgId);
             if (attrs['onUpdate:modelValue']) attrs['onUpdate:modelValue'](props.multiSelectFlag ? value : value[0]);
-            if (props.multiSelectFlag) emit('change', value);
+            if (props.multiSelectFlag) emit('change', value, selectedRows.value);
             else {
                 const data = value[0] ? bizUnitList.value.find((item)=>item.value === value[0] || item.orgId === value[0]) : void 0;
                 emit('change', value[0], data);
@@ -7266,7 +7281,7 @@ const user_select_exports_ = user_selectvue_type_script_setup_true_lang_ts_name_
                     visible: popoverVisible.value,
                     ref_key: "popoverRef",
                     ref: popoverRef,
-                    width: "1000",
+                    width: "auto",
                     trigger: "click",
                     placement: "bottom",
                     onShow: handlePopoverShow
@@ -7429,17 +7444,17 @@ const biz_unit_select_exports_ = biz_unit_selectvue_type_script_setup_true_lang_
                     {
                         label: t('departmentSelect.table.orgNo', '科室编码'),
                         prop: 'orgNo',
-                        minWidth: 80
+                        minWidth: 100
                     },
                     {
                         label: t('departmentSelect.table.orgName', '科室名称'),
                         prop: 'orgName',
-                        minWidth: 80
+                        minWidth: 200
                     },
                     {
                         label: t('departmentSelect.table.deptTypeDesc', '科室类型'),
                         prop: 'deptTypeDesc',
-                        minWidth: 80
+                        minWidth: 100
                     }
                 ]
         });
@@ -7510,7 +7525,7 @@ const biz_unit_select_exports_ = biz_unit_selectvue_type_script_setup_true_lang_
         const handleChange = ()=>{
             let value = selectedRows.value.map((item)=>item.value || item.orgId);
             if (attrs['onUpdate:modelValue']) attrs['onUpdate:modelValue'](props.multiSelectFlag ? value : value[0]);
-            if (props.multiSelectFlag) emit('change', value);
+            if (props.multiSelectFlag) emit('change', value, selectedRows.value);
             else {
                 const data = value[0] ? departmentList.value.find((item)=>item.value === value[0] || item.orgId === value[0]) : void 0;
                 emit('change', value[0], data);
@@ -7677,7 +7692,7 @@ const biz_unit_select_exports_ = biz_unit_selectvue_type_script_setup_true_lang_
                     visible: popoverVisible.value,
                     ref_key: "popoverRef",
                     ref: popoverRef,
-                    width: "1000",
+                    width: "auto",
                     trigger: "click",
                     placement: "bottom",
                     onShow: handlePopoverShow
@@ -7839,12 +7854,12 @@ const department_select_exports_ = department_selectvue_type_script_setup_true_l
                     {
                         label: t('wardSelect.table.orgNo', '病区编码'),
                         prop: 'orgNo',
-                        minWidth: 80
+                        minWidth: 100
                     },
                     {
                         label: t('wardSelect.table.orgName', '病区名称'),
                         prop: 'orgName',
-                        minWidth: 80
+                        minWidth: 200
                     }
                 ]
         });
@@ -7914,7 +7929,7 @@ const department_select_exports_ = department_selectvue_type_script_setup_true_l
         const handleChange = ()=>{
             let value = selectedRows.value.map((item)=>item.value || item.orgId);
             if (attrs['onUpdate:modelValue']) attrs['onUpdate:modelValue'](props.multiSelectFlag ? value : value[0]);
-            if (props.multiSelectFlag) emit('change', value);
+            if (props.multiSelectFlag) emit('change', value, selectedRows.value);
             else {
                 const data = value[0] ? wardList.value.find((item)=>item.value === value[0] || item.orgId === value[0]) : void 0;
                 emit('change', value[0], data);
@@ -8081,7 +8096,7 @@ const department_select_exports_ = department_selectvue_type_script_setup_true_l
                     visible: popoverVisible.value,
                     ref_key: "popoverRef",
                     ref: popoverRef,
-                    width: "1000",
+                    width: "auto",
                     trigger: "click",
                     placement: "bottom",
                     onShow: handlePopoverShow
@@ -10136,60 +10151,75 @@ if ('undefined' != typeof window) {
 }
 // 设置 hotkeys-js 全局 filter，无论焦点在何处都响应快捷键
 hotkeys_esm_hotkeys.filter = ()=>true;
-// 禁用浏览器默认快捷键的函数
-function disableBrowserShortcuts() {
-    // 需要禁用的浏览器默认快捷键列表
-    const browserShortcuts = [
+// 生成浏览器快捷键列表的函数
+function generateBrowserShortcuts() {
+    const shortcuts = [];
+    // 基础功能键
+    const basicKeys = [
         'f1',
         'f2',
         'f3',
         'f6',
-        'f7',
-        'ctrl+f',
-        'ctrl+r',
-        'ctrl+shift+r',
-        'ctrl+u',
-        'ctrl+shift+i',
-        'ctrl+shift+c',
-        'ctrl+shift+j',
-        'ctrl+shift+m',
-        'ctrl+shift+k',
-        'ctrl+shift+s',
-        'ctrl+shift+o',
-        'ctrl+shift+p',
-        'ctrl+shift+e',
-        'ctrl+shift+f',
-        'ctrl+shift+g',
-        'ctrl+shift+h',
-        'ctrl+shift+t',
-        'ctrl+shift+w',
-        'ctrl+shift+x',
-        'ctrl+shift+y',
-        'ctrl+shift+z',
-        'ctrl+shift+a',
-        'ctrl+shift+b',
-        'ctrl+shift+d',
-        'ctrl+shift+l',
-        'ctrl+shift+n',
-        'ctrl+shift+q',
-        'ctrl+shift+v',
-        'ctrl+shift+1',
-        'ctrl+shift+2',
-        'ctrl+shift+3',
-        'ctrl+shift+4',
-        'ctrl+shift+5',
-        'ctrl+shift+6',
-        'ctrl+shift+7',
-        'ctrl+shift+8',
-        'ctrl+shift+9',
-        'ctrl+shift+0'
+        'f7'
+    ];
+    shortcuts.push(...basicKeys);
+    // 基础组合键
+    const basicCombos = [
+        'f',
+        'r',
+        'u'
     ];
-    // 为每个快捷键绑定一个空函数来阻止默认行为
+    basicCombos.forEach((key)=>{
+        shortcuts.push(`ctrl+${key}`);
+        shortcuts.push(`cmd+${key}`);
+    });
+    // 开发者工具相关快捷键
+    const devToolsKeys = [
+        'i',
+        'j',
+        'm',
+        'k',
+        's',
+        'o',
+        'p',
+        'e',
+        'f',
+        'g',
+        'h',
+        't',
+        'w',
+        'x',
+        'y',
+        'z',
+        'a',
+        'b',
+        'd',
+        'l',
+        'n',
+        'q',
+        'v'
+    ];
+    devToolsKeys.forEach((key)=>{
+        shortcuts.push(`ctrl+shift+${key}`);
+        shortcuts.push(`cmd+shift+${key}`);
+    });
+    // 数字面板快捷键
+    for(let i = 0; i <= 9; i++){
+        shortcuts.push(`ctrl+shift+${i}`);
+        shortcuts.push(`cmd+shift+${i}`);
+    }
+    return shortcuts;
+}
+// 禁用浏览器默认快捷键的函数
+function disableBrowserShortcuts() {
+    const browserShortcuts = generateBrowserShortcuts();
+    // 方法1: 使用 hotkeys-js 绑定阻止函数
     browserShortcuts.forEach((shortcut)=>{
         hotkeys_esm_hotkeys(shortcut, (event)=>{
             // 阻止默认行为
             event.preventDefault();
             event.stopPropagation();
+            event.stopImmediatePropagation();
             return false;
         });
     });
@@ -10198,9 +10228,9 @@ function disableBrowserShortcuts() {
 // 在模块加载时直接禁用浏览器快捷键
 disableBrowserShortcuts();
 // 从 sessionStorage 获取 preferSetting
-function getPreferSettingFromStorage() {
+function getPreferSettingFromStorage(key) {
     try {
-        const stored = JSON.parse(sessionStorage.getItem('sun-app')).shortcuts;
+        const stored = JSON.parse(sessionStorage.getItem('sun-app'))[key];
         return stored || [];
     } catch (error) {
         console.warn('从 sessionStorage 获取 preferSetting 失败:', error);
@@ -10208,8 +10238,8 @@ function getPreferSettingFromStorage() {
     }
 }
 // 暴露给外部使用的查找方法
-function findKeyboardValue(commandNo, defaultMenuId, bizId) {
-    const preferSetting = getPreferSettingFromStorage();
+function findKeyCommandConfig(commandNo, defaultMenuId, bizId) {
+    const preferSetting = getPreferSettingFromStorage('shortcuts');
     // 查找匹配的 commandNo
     let commands = preferSetting.filter((item)=>item.commandNo === commandNo);
     // 如果提供了默认 menuId，优先使用它进行过滤
@@ -10219,17 +10249,26 @@ function findKeyboardValue(commandNo, defaultMenuId, bizId) {
     }
     if (0 === commands.length) {
         console.warn(`未找到 commandNo: ${commandNo}${defaultMenuId ? `, menuId: ${defaultMenuId}` : ''} 的配置`);
-        return null;
+        return {
+            keyboardValue: null,
+            menuId: null
+        };
     }
     // 如果找到多个匹配项，优先使用第一个（可以根据需要调整优先级逻辑）
     const command = commands[0];
     // 如果提供了 bizId，在 commandDetailList 中查找
     if (bizId) {
         const detail = command.commandDetailList.find((item)=>item.bizId === bizId);
-        if (detail && detail.keyboardValue) return detail.keyboardValue;
+        if (detail && detail.keyboardValue) return {
+            keyboardValue: detail.keyboardValue,
+            menuId: command.menuId || null
+        };
     }
     // 如果没有找到 detail 或没有提供 bizId，使用 command 的 keyboardValue
-    return command.keyboardValue || null;
+    return {
+        keyboardValue: command.keyboardValue || null,
+        menuId: command.menuId || null
+    };
 }
 /* ESM default export */ const keyboard_valuevue_type_script_setup_true_lang_ts = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
     __name: 'index',
@@ -10242,7 +10281,7 @@ function findKeyboardValue(commandNo, defaultMenuId, bizId) {
             use_app_config_MAIN_APP_CONFIG.MENU_ID
         ]);
         const props = __props;
-        const value = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>findKeyboardValue(props.commandNo, menuId, props.bizId));
+        const value = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>findKeyCommandConfig(props.commandNo, menuId, props.bizId)?.keyboardValue);
         return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("span", null, (0, __WEBPACK_EXTERNAL_MODULE_vue__.toDisplayString)(value.value ? `（${value.value}）` : ''), 1));
     }
 });

package/dist/directives/index.d.ts

@@ -1 +1 @@
-export { createShortcutDirective, findKeyboardValue, type ShortcutOptions, } from './shortcut.ts';
+export { createShortcutDirective, findKeyCommandConfig, type ShortcutOptions, } from './shortcut.ts';

package/dist/directives/shortcut.d.ts

@@ -5,6 +5,9 @@ export interface ShortcutOptions {
     handler?: (e: KeyboardEvent) => void;
     autoDisplay?: boolean;
 }
-export declare function findKeyboardValue(commandNo: string, defaultMenuId?: string, bizId?: string): string | null;
+export declare function findKeyCommandConfig(commandNo: string, defaultMenuId?: string, bizId?: string): {
+    keyboardValue: string | null;
+    menuId: string | null;
+};
 declare function createShortcutDirective(menuId?: string): ObjectDirective;
 export { createShortcutDirective };

package/dist/hooks/index.js

@@ -549,7 +549,7 @@ function useFetchParams(options) {
    * @param row
    */ const cancelEdit = (row, index, deleteWithoutId = true)=>{
         const targetData = cachedEditData[row[getRowKey(row)]];
-        if ((row?.[id] || cancelToDelete || !deleteWithoutId) && targetData) Object.keys(row).forEach((key)=>{
+        if ((row?.[id] || cancelToDelete || !deleteWithoutId) && targetData) Object.keys(targetData).forEach((key)=>{
             row[key] = targetData[key];
         });
         else tableData.value.splice(index, 1);

package/dist/index.d.ts

@@ -25,5 +25,5 @@ export type { TableRef } from './hooks/use-editable-table';
 export * from './hooks/use-fetch-data/index.ts';
 export { useColumnConfig, useFormConfig } from './hooks/use-column&form-config';
 export { useDataChangeDetector } from './hooks/use-data-change-detector';
-export { createShortcutDirective, findKeyboardValue, type ShortcutOptions, } from './directives/index.ts';
+export { createShortcutDirective, findKeyCommandConfig, type ShortcutOptions, } from './directives/index.ts';
 export { debounce, isNumber, decimalCount, formatDecimalNumber } from './utils';

package/dist/index.js

@@ -4068,7 +4068,7 @@ function useSelectByDirectionEvent(options) {
    * @param row
    */ const cancelEdit = (row, index, deleteWithoutId = true)=>{
         const targetData = cachedEditData[row[getRowKey(row)]];
-        if ((row?.[id] || cancelToDelete || !deleteWithoutId) && targetData) Object.keys(row).forEach((key)=>{
+        if ((row?.[id] || cancelToDelete || !deleteWithoutId) && targetData) Object.keys(targetData).forEach((key)=>{
             row[key] = targetData[key];
         });
         else tableData.value.splice(index, 1);
@@ -5402,6 +5402,7 @@ const TAG_MARGIN = 1; // 1rem
         return (_ctx, _cache)=>{
             const _component_el_button = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-button");
             const _component_el_popover = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-popover");
+            const _component_el_icon = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-icon");
             return (0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", {
                 ref_key: "containerRef",
                 ref: containerRef,
@@ -5414,7 +5415,10 @@ const TAG_MARGIN = 1; // 1rem
                             key: item,
                             style: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeStyle)({
                                 background: allTagsMap.value.get(item)?.background,
-                                color: allTagsMap.value.get(item)?.color
+                                color: allTagsMap.value.get(item)?.color,
+                                borderColor: allTagsMap.value.get(item)?.color,
+                                '--el-tag-text-color': allTagsMap.value.get(item)?.color,
+                                '--el-tag-hover-color': allTagsMap.value.get(item)?.color
                             }),
                             closable: !props.disabled,
                             class: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeClass)([
@@ -5460,7 +5464,10 @@ const TAG_MARGIN = 1; // 1rem
                                             key: item,
                                             style: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeStyle)({
                                                 background: allTagsMap.value.get(item)?.background,
-                                                color: allTagsMap.value.get(item)?.color
+                                                color: allTagsMap.value.get(item)?.color,
+                                                borderColor: allTagsMap.value.get(item)?.color,
+                                                '--el-tag-text-color': allTagsMap.value.get(item)?.color,
+                                                '--el-tag-hover-color': allTagsMap.value.get(item)?.color
                                             }),
                                             closable: !props.disabled,
                                             size: props.tagSize,
@@ -5516,9 +5523,16 @@ const TAG_MARGIN = 1; // 1rem
                         }),
                         onClick: showSelect
                     }, {
-                        default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>_cache[3] || (_cache[3] = [
-                                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)(" + ")
-                            ])),
+                        default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(_component_el_icon, null, {
+                                    default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE__element_sun_icons_vue__.Plus), {
+                                                class: "text-primary"
+                                            })
+                                        ]),
+                                    _: 1
+                                })
+                            ]),
                         _: 1
                     }, 8, [
                         "class"
@@ -5667,7 +5681,8 @@ const PERSON = "PERSON"; //应该放到BIZ_ID_TYPE_CODE这个里面
             }
             const [, res] = await getBannerDataByBizId({
                 menuId: __props.menuId,
-                bizId: __props.bizId ?? void 0,
+                designFlag: __props.bizId ? __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.NO : void 0,
+                bizId: __props.bizId ? __props.bizId : "0",
                 bizIdTypeCode: BANNER_COMPONENT_CONFIG[__props.code].bizIdTypeCode,
                 componentId: BANNER_COMPONENT_CONFIG[__props.code].componentId
             });
@@ -7802,20 +7817,20 @@ const user_select_exports_ = user_selectvue_type_script_setup_true_lang_ts_name_
                         isHidden: !props.multiSelectFlag,
                         selectable: (row)=>!(props.disabledValueIds?.length && row.orgId && props.disabledValueIds.includes(row.orgId)) && true
                     },
-                    {
-                        label: t('bizUnitSelect.table.orgTypeDescDisplay', '组织类型'),
-                        prop: 'orgTypeDescDisplay',
-                        minWidth: 80
-                    },
                     {
                         label: t('bizUnitSelect.table.orgNo', '编码'),
                         prop: 'orgNo',
-                        minWidth: 80
+                        minWidth: 100
                     },
                     {
                         label: t('bizUnitSelect.table.orgNameDisplay', '名称'),
                         prop: 'orgNameDisplay',
-                        minWidth: 80
+                        minWidth: 200
+                    },
+                    {
+                        label: t('bizUnitSelect.table.orgTypeDescDisplay', '组织类型'),
+                        prop: 'orgTypeDescDisplay',
+                        minWidth: 100
                     }
                 ]
         });
@@ -7870,7 +7885,7 @@ const user_select_exports_ = user_selectvue_type_script_setup_true_lang_ts_name_
         const handleChange = ()=>{
             let value = selectedRows.value.map((item)=>item.value || item.orgId);
             if (attrs['onUpdate:modelValue']) attrs['onUpdate:modelValue'](props.multiSelectFlag ? value : value[0]);
-            if (props.multiSelectFlag) emit('change', value);
+            if (props.multiSelectFlag) emit('change', value, selectedRows.value);
             else {
                 const data = value[0] ? bizUnitList.value.find((item)=>item.value === value[0] || item.orgId === value[0]) : void 0;
                 emit('change', value[0], data);
@@ -8037,7 +8052,7 @@ const user_select_exports_ = user_selectvue_type_script_setup_true_lang_ts_name_
                     visible: popoverVisible.value,
                     ref_key: "popoverRef",
                     ref: popoverRef,
-                    width: "1000",
+                    width: "auto",
                     trigger: "click",
                     placement: "bottom",
                     onShow: handlePopoverShow
@@ -8200,17 +8215,17 @@ const biz_unit_select_exports_ = biz_unit_selectvue_type_script_setup_true_lang_
                     {
                         label: t('departmentSelect.table.orgNo', '科室编码'),
                         prop: 'orgNo',
-                        minWidth: 80
+                        minWidth: 100
                     },
                     {
                         label: t('departmentSelect.table.orgName', '科室名称'),
                         prop: 'orgName',
-                        minWidth: 80
+                        minWidth: 200
                     },
                     {
                         label: t('departmentSelect.table.deptTypeDesc', '科室类型'),
                         prop: 'deptTypeDesc',
-                        minWidth: 80
+                        minWidth: 100
                     }
                 ]
         });
@@ -8281,7 +8296,7 @@ const biz_unit_select_exports_ = biz_unit_selectvue_type_script_setup_true_lang_
         const handleChange = ()=>{
             let value = selectedRows.value.map((item)=>item.value || item.orgId);
             if (attrs['onUpdate:modelValue']) attrs['onUpdate:modelValue'](props.multiSelectFlag ? value : value[0]);
-            if (props.multiSelectFlag) emit('change', value);
+            if (props.multiSelectFlag) emit('change', value, selectedRows.value);
             else {
                 const data = value[0] ? departmentList.value.find((item)=>item.value === value[0] || item.orgId === value[0]) : void 0;
                 emit('change', value[0], data);
@@ -8448,7 +8463,7 @@ const biz_unit_select_exports_ = biz_unit_selectvue_type_script_setup_true_lang_
                     visible: popoverVisible.value,
                     ref_key: "popoverRef",
                     ref: popoverRef,
-                    width: "1000",
+                    width: "auto",
                     trigger: "click",
                     placement: "bottom",
                     onShow: handlePopoverShow
@@ -8610,12 +8625,12 @@ const department_select_exports_ = department_selectvue_type_script_setup_true_l
                     {
                         label: t('wardSelect.table.orgNo', '病区编码'),
                         prop: 'orgNo',
-                        minWidth: 80
+                        minWidth: 100
                     },
                     {
                         label: t('wardSelect.table.orgName', '病区名称'),
                         prop: 'orgName',
-                        minWidth: 80
+                        minWidth: 200
                     }
                 ]
         });
@@ -8685,7 +8700,7 @@ const department_select_exports_ = department_selectvue_type_script_setup_true_l
         const handleChange = ()=>{
             let value = selectedRows.value.map((item)=>item.value || item.orgId);
             if (attrs['onUpdate:modelValue']) attrs['onUpdate:modelValue'](props.multiSelectFlag ? value : value[0]);
-            if (props.multiSelectFlag) emit('change', value);
+            if (props.multiSelectFlag) emit('change', value, selectedRows.value);
             else {
                 const data = value[0] ? wardList.value.find((item)=>item.value === value[0] || item.orgId === value[0]) : void 0;
                 emit('change', value[0], data);
@@ -8852,7 +8867,7 @@ const department_select_exports_ = department_selectvue_type_script_setup_true_l
                     visible: popoverVisible.value,
                     ref_key: "popoverRef",
                     ref: popoverRef,
-                    width: "1000",
+                    width: "auto",
                     trigger: "click",
                     placement: "bottom",
                     onShow: handlePopoverShow
@@ -9279,7 +9294,7 @@ const WB_NO = "wbNo";
 const pro_form_exports_ = pro_formvue_type_script_setup_true_lang_ts_name_ProForm;
 /* ESM default export */ const pro_form = pro_form_exports_;
 const Titlevue_type_script_setup_true_lang_ts_name_sunTitle_hoisted_1 = {
-    class: "relative pl-4 before:absolute before:left-0 before:top-[20%] before:h-2/3 before:w-1 before:bg-primary"
+    class: "relative pl-4 font-semibold before:absolute before:left-0 before:top-1/2 before:h-2/3 before:w-1 before:-translate-y-1/2 before:bg-primary"
 };
 /* ESM default export */ const Titlevue_type_script_setup_true_lang_ts_name_sunTitle = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
     __name: 'Title',
@@ -10619,62 +10634,78 @@ if ('undefined' != typeof window) {
     };
     window.hotkeys = hotkeys;
 }
+const COMMON_MENU_ID = '1644891388162187264';
 // 设置 hotkeys-js 全局 filter，无论焦点在何处都响应快捷键
 hotkeys.filter = ()=>true;
-// 禁用浏览器默认快捷键的函数
-function disableBrowserShortcuts() {
-    // 需要禁用的浏览器默认快捷键列表
-    const browserShortcuts = [
+// 生成浏览器快捷键列表的函数
+function generateBrowserShortcuts() {
+    const shortcuts = [];
+    // 基础功能键
+    const basicKeys = [
         'f1',
         'f2',
         'f3',
         'f6',
-        'f7',
-        'ctrl+f',
-        'ctrl+r',
-        'ctrl+shift+r',
-        'ctrl+u',
-        'ctrl+shift+i',
-        'ctrl+shift+c',
-        'ctrl+shift+j',
-        'ctrl+shift+m',
-        'ctrl+shift+k',
-        'ctrl+shift+s',
-        'ctrl+shift+o',
-        'ctrl+shift+p',
-        'ctrl+shift+e',
-        'ctrl+shift+f',
-        'ctrl+shift+g',
-        'ctrl+shift+h',
-        'ctrl+shift+t',
-        'ctrl+shift+w',
-        'ctrl+shift+x',
-        'ctrl+shift+y',
-        'ctrl+shift+z',
-        'ctrl+shift+a',
-        'ctrl+shift+b',
-        'ctrl+shift+d',
-        'ctrl+shift+l',
-        'ctrl+shift+n',
-        'ctrl+shift+q',
-        'ctrl+shift+v',
-        'ctrl+shift+1',
-        'ctrl+shift+2',
-        'ctrl+shift+3',
-        'ctrl+shift+4',
-        'ctrl+shift+5',
-        'ctrl+shift+6',
-        'ctrl+shift+7',
-        'ctrl+shift+8',
-        'ctrl+shift+9',
-        'ctrl+shift+0'
+        'f7'
+    ];
+    shortcuts.push(...basicKeys);
+    // 基础组合键
+    const basicCombos = [
+        'f',
+        'r',
+        'u'
+    ];
+    basicCombos.forEach((key)=>{
+        shortcuts.push(`ctrl+${key}`);
+        shortcuts.push(`cmd+${key}`);
+    });
+    // 开发者工具相关快捷键
+    const devToolsKeys = [
+        'i',
+        'j',
+        'm',
+        'k',
+        's',
+        'o',
+        'p',
+        'e',
+        'f',
+        'g',
+        'h',
+        't',
+        'w',
+        'x',
+        'y',
+        'z',
+        'a',
+        'b',
+        'd',
+        'l',
+        'n',
+        'q',
+        'v'
     ];
-    // 为每个快捷键绑定一个空函数来阻止默认行为
+    devToolsKeys.forEach((key)=>{
+        shortcuts.push(`ctrl+shift+${key}`);
+        shortcuts.push(`cmd+shift+${key}`);
+    });
+    // 数字面板快捷键
+    for(let i = 0; i <= 9; i++){
+        shortcuts.push(`ctrl+shift+${i}`);
+        shortcuts.push(`cmd+shift+${i}`);
+    }
+    return shortcuts;
+}
+// 禁用浏览器默认快捷键的函数
+function disableBrowserShortcuts() {
+    const browserShortcuts = generateBrowserShortcuts();
+    // 方法1: 使用 hotkeys-js 绑定阻止函数
     browserShortcuts.forEach((shortcut)=>{
         hotkeys(shortcut, (event)=>{
             // 阻止默认行为
             event.preventDefault();
             event.stopPropagation();
+            event.stopImmediatePropagation();
             return false;
         });
     });
@@ -10683,9 +10714,9 @@ function disableBrowserShortcuts() {
 // 在模块加载时直接禁用浏览器快捷键
 disableBrowserShortcuts();
 // 从 sessionStorage 获取 preferSetting
-function getPreferSettingFromStorage() {
+function getPreferSettingFromStorage(key) {
     try {
-        const stored = JSON.parse(sessionStorage.getItem('sun-app')).shortcuts;
+        const stored = JSON.parse(sessionStorage.getItem('sun-app'))[key];
         return stored || [];
     } catch (error) {
         console.warn('从 sessionStorage 获取 preferSetting 失败:', error);
@@ -10693,8 +10724,8 @@ function getPreferSettingFromStorage() {
     }
 }
 // 暴露给外部使用的查找方法
-function findKeyboardValue(commandNo, defaultMenuId, bizId) {
-    const preferSetting = getPreferSettingFromStorage();
+function findKeyCommandConfig(commandNo, defaultMenuId, bizId) {
+    const preferSetting = getPreferSettingFromStorage('shortcuts');
     // 查找匹配的 commandNo
     let commands = preferSetting.filter((item)=>item.commandNo === commandNo);
     // 如果提供了默认 menuId，优先使用它进行过滤
@@ -10704,17 +10735,26 @@ function findKeyboardValue(commandNo, defaultMenuId, bizId) {
     }
     if (0 === commands.length) {
         console.warn(`未找到 commandNo: ${commandNo}${defaultMenuId ? `, menuId: ${defaultMenuId}` : ''} 的配置`);
-        return null;
+        return {
+            keyboardValue: null,
+            menuId: null
+        };
     }
     // 如果找到多个匹配项，优先使用第一个（可以根据需要调整优先级逻辑）
     const command = commands[0];
     // 如果提供了 bizId，在 commandDetailList 中查找
     if (bizId) {
         const detail = command.commandDetailList.find((item)=>item.bizId === bizId);
-        if (detail && detail.keyboardValue) return detail.keyboardValue;
+        if (detail && detail.keyboardValue) return {
+            keyboardValue: detail.keyboardValue,
+            menuId: command.menuId || null
+        };
     }
     // 如果没有找到 detail 或没有提供 bizId，使用 command 的 keyboardValue
-    return command.keyboardValue || null;
+    return {
+        keyboardValue: command.keyboardValue || null,
+        menuId: command.menuId || null
+    };
 }
 // 自动在元素文本中显示快捷键
 async function updateElementText(el, keyboardValue) {
@@ -10728,7 +10768,7 @@ function parseBinding(binding, defaultMenuId) {
     };
     const opts = binding.value;
     // 通过 preferSetting 查找 keyboardValue
-    const keyboardValue = findKeyboardValue(opts.commandNo, defaultMenuId, opts.bizId);
+    const keyboardValue = findKeyCommandConfig(opts.commandNo, defaultMenuId, opts.bizId)?.keyboardValue;
     if (!keyboardValue) {
         console.warn(`未找到 commandNo: ${opts.commandNo}, menuId: ${defaultMenuId || '未指定'}, bizId: ${opts.bizId || '未指定'} 对应的 keyboardValue`);
         return null;
@@ -10752,6 +10792,10 @@ function createShortcutDirective(menuId) {
             if (parsed.autoDisplay && parsed.key) updateElementText(el, parsed.key);
             // 记录 handler 以便卸载时解绑
             const handler = (e)=>{
+                const currentMenuId = getPreferSettingFromStorage('activeMenuItem')?.menuId;
+                const opts = binding.value;
+                const configMenuId = findKeyCommandConfig(opts.commandNo, menuId, opts.bizId)?.menuId;
+                if (configMenuId !== COMMON_MENU_ID && menuId !== currentMenuId) return;
                 if ('function' == typeof parsed.handler) parsed.handler(e);
                 else el.click?.();
             };
@@ -10779,7 +10823,7 @@ function createShortcutDirective(menuId) {
             use_app_config_MAIN_APP_CONFIG.MENU_ID
         ]);
         const props = __props;
-        const value = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>findKeyboardValue(props.commandNo, menuId, props.bizId));
+        const value = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>findKeyCommandConfig(props.commandNo, menuId, props.bizId)?.keyboardValue);
         return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("span", null, (0, __WEBPACK_EXTERNAL_MODULE_vue__.toDisplayString)(value.value ? `（${value.value}）` : ''), 1));
     }
 });
@@ -11614,4 +11658,4 @@ const form_design_render_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(f
 ]);
 /* ESM default export */ const form_design_render = form_design_render_exports_;
 /** components **/ /** hooks ** */ var __webpack_exports__COMPONENT_CODE = __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.COMPONENT_CODE;
-export { utils_AVATAR_TYPE_CODE as AVATAR_TYPE_CODE, access_info as AccessInfo, BANNER_COMPONENT_CONFIG, BannerInfo, biz_unit_select as BizUnitSelect, copy_text_with_tooltip as CopyTextWithTooltip, constant_DATA_SOURCE_CONTENT_TYPE_CODE as DATA_SOURCE_CONTENT_TYPE_CODE, dbgrid_component_setting as DbgridComponentSetting, department_select as DepartmentSelect, dict_select as DictSelect, dml_button as DmlButton, flag_select as FlagSelect, form_design_render as FormDesignRender, FormUnit, hospital_select as HospitalSelect, keyboard_value as KeyboardValue, use_app_config_MAIN_APP_CONFIG as MAIN_APP_CONFIG, patient_access as PatientAccess, PatientInfo, printReceiptBtn as PrintReceiptBtn, pro_avatar as ProAvatar, pro_dialog as ProDialog, pro_form as ProForm, invoice as ProInvoice, pro_table as ProTable, pro_table_v2 as ProTableV2, tag_select as TagSelect, Title, user_select as UserSelect, ward_select as WardSelect, convertToSpellNo, convertToWbNo, createShortcutDirective, debounce, decimalCount, findKeyboardValue, formatDecimalNumber, getSystemTime, isNumber, print, queryDataSetByCodeSystemCodes, queryParamListByNos, use_app_config as useAppConfigData, useColumnConfig, useDataChangeDetector, use_direction_select as useDirectionSelect, useEditableTable, use_fetch_dataset as useFetchDataset, useFetchParams, useFetchSystemTime, useFormConfig, usePrintReceipt, use_request as useRequest, __webpack_exports__COMPONENT_CODE as COMPONENT_CODE };
+export { utils_AVATAR_TYPE_CODE as AVATAR_TYPE_CODE, access_info as AccessInfo, BANNER_COMPONENT_CONFIG, BannerInfo, biz_unit_select as BizUnitSelect, copy_text_with_tooltip as CopyTextWithTooltip, constant_DATA_SOURCE_CONTENT_TYPE_CODE as DATA_SOURCE_CONTENT_TYPE_CODE, dbgrid_component_setting as DbgridComponentSetting, department_select as DepartmentSelect, dict_select as DictSelect, dml_button as DmlButton, flag_select as FlagSelect, form_design_render as FormDesignRender, FormUnit, hospital_select as HospitalSelect, keyboard_value as KeyboardValue, use_app_config_MAIN_APP_CONFIG as MAIN_APP_CONFIG, patient_access as PatientAccess, PatientInfo, printReceiptBtn as PrintReceiptBtn, pro_avatar as ProAvatar, pro_dialog as ProDialog, pro_form as ProForm, invoice as ProInvoice, pro_table as ProTable, pro_table_v2 as ProTableV2, tag_select as TagSelect, Title, user_select as UserSelect, ward_select as WardSelect, convertToSpellNo, convertToWbNo, createShortcutDirective, debounce, decimalCount, findKeyCommandConfig, formatDecimalNumber, getSystemTime, isNumber, print, queryDataSetByCodeSystemCodes, queryParamListByNos, use_app_config as useAppConfigData, useColumnConfig, useDataChangeDetector, use_direction_select as useDirectionSelect, useEditableTable, use_fetch_dataset as useFetchDataset, useFetchParams, useFetchSystemTime, useFormConfig, usePrintReceipt, use_request as useRequest, __webpack_exports__COMPONENT_CODE as COMPONENT_CODE };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sun-biz",
-  "version": "0.0.4-beta.27",
+  "version": "0.0.4-beta.28",
   "type": "module",
   "workspaces": [
     "src/*",