npm - sun-biz - Versions diffs - 0.0.2-beta.11 → 0.0.2-beta.12 - Mend

sun-biz 0.0.2-beta.11 → 0.0.2-beta.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/dist/components/form-design-render/utils.d.ts +3 -1
package/dist/components/index.js +67 -44
package/dist/components/patient-access/api.d.ts +2 -2
package/dist/components/pro-table/interface/index.d.ts +1 -0
package/dist/hooks/index.js +2 -1
package/dist/hooks/use-direction-select/index.d.ts +2 -2
package/dist/index.js +67 -44
package/package.json +1 -1

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

@@ -78,10 +78,12 @@ export declare function integrateData(initData: {
 };
 /**
  * 传入地址类似的值 ，拼接
+ * 如果接口返回了这个字段。 展示接口返回对应的vaule
+ *  没有的话则展示默认值
  * @param data
  * @param key
  * @returns
  */
 export declare function getDefaultValue(data: {
     [key: string]: unknown;
-}, key: string): string | undefined;
+}, key: string): string;

package/dist/components/index.js CHANGED Viewed

@@ -895,8 +895,12 @@ const _hoisted_3 = {
             });
             if (res?.success) userList.value = res.data || [];
         }
-        (0, __WEBPACK_EXTERNAL_MODULE_vue__.onMounted)(()=>{
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)(()=>props.componentNo, ()=>{
             fetchDbgridComponent();
+        }, {
+            immediate: true
+        });
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.onMounted)(()=>{
             featchUserList();
         });
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)([
@@ -1171,7 +1175,7 @@ const _hoisted_3 = {
 const dbgrid_component_setting_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dbgrid_component_settingvue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-8c01f31c"
+        "data-v-1e494f3f"
     ]
 ]);
 /* ESM default export */ const dbgrid_component_setting = dbgrid_component_setting_exports_;
@@ -1276,7 +1280,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             default: void 0
         },
         componentNo: {
-            default: ""
+            default: ''
         },
         fetchData: {
             type: Function,
@@ -1291,7 +1295,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             default: false
         },
         rowKey: {
-            default: "id"
+            default: 'id'
         },
         loading: {
             type: Boolean,
@@ -1332,11 +1336,11 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
         });
         const serveColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
         const columnTypes = [
-            "selection",
-            "radio",
-            "index",
-            "expand",
-            "sort"
+            'selection',
+            'radio',
+            'index',
+            'expand',
+            'sort'
         ];
         const dbgridComponentSettingRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const formRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
@@ -1356,7 +1360,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
                     sortData.curData = item;
                     sortData.result = data;
                 }
-                if (item?.[attrs?.["tree-props"]?.children]) getDragSortData(newIndex, item?.[attrs?.["tree-props"]?.children], startIndexObj, sortData);
+                if (item?.[attrs?.['tree-props']?.children]) getDragSortData(newIndex, item?.[attrs?.['tree-props']?.children], startIndexObj, sortData);
             });
             return sortData;
         }
@@ -1366,7 +1370,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             let data = [
                 ...state.tableData
             ];
-            if (attrs?.["tree-props"]) {
+            if (attrs?.['tree-props']) {
                 let { result, curIndex: newCurIndex, curData: newCurData } = getDragSortData(newIndex, data, {
                     startIndex: -1
                 }, {
@@ -1382,7 +1386,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
                     curData: {}
                 });
                 if (newCurData.belongGroupElementId !== oldCurData.belongGroupElementId) {
-                    __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning("暂不支持跨层级拖拽配置");
+                    __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning('暂不支持跨层级拖拽配置');
                     return [];
                 }
                 const [removedItem] = result.splice(oldCurIndex, 1);
@@ -1398,16 +1402,16 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
  * 表格拖拽排序
  **/ const initDragSort = ()=>{
             const tbody = document.querySelector(`#${uuid.value} tbody`);
-            let initialHTML = ""; //暂不支持跨层级拖拽
+            let initialHTML = ''; //暂不支持跨层级拖拽
             if (tbody) __WEBPACK_EXTERNAL_MODULE_sortablejs__["default"].create(tbody, {
-                handle: ".cursor-move",
+                handle: '.cursor-move',
                 animation: 300,
                 onEnd (evt) {
                     const { newIndex, oldIndex } = evt;
                     if (newIndex === oldIndex || void 0 === newIndex || void 0 === oldIndex) return;
                     //获取拖动后的排序
                     let data = getSortableResult(newIndex, oldIndex);
-                    if (data.length) emit("drag-end", data);
+                    if (data.length) emit('drag-end', data);
                     else evt.from.innerHTML = initialHTML;
                 },
                 onStart (evt) {
@@ -1422,7 +1426,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
         });
         async function fetchDbgridComponent() {
             let [, result] = await queryDbgridComponentByExample({
-                componentNo: props.componentNo || ""
+                componentNo: props.componentNo || ''
             });
             if (result?.success) try {
                 let column = result.data.dbgridSettingValue && JSON.parse(result.data.dbgridSettingValue) || [];
@@ -1431,12 +1435,16 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
                 console.log(error);
             }
         }
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)(()=>props.componentNo, ()=>{
+            if (props.componentNo) fetchDbgridComponent();
+        }, {
+            immediate: true
+        });
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.onMounted)(()=>{
             // 支持拖拽排序
             if (props.draggable) (0, __WEBPACK_EXTERNAL_MODULE_vue__.nextTick)(()=>{
                 initDragSort();
             });
-            if (props.componentNo) fetchDbgridComponent();
             if (props.pagination && props?.fetchData) fetchList();
         });
         /**
@@ -1455,7 +1463,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
                 state.pageInfo.pageNumber = 1;
                 state.pageInfo.pageSize = val;
                 fetchList();
-            } else emit("size-page-change", val);
+            } else emit('size-page-change', val);
         };
         /**
  * 分页组件改变 当前页数 事件
@@ -1463,7 +1471,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             if (props.fetchData) {
                 state.pageInfo.pageNumber = val;
                 fetchList();
-            } else emit("current-page-change", val);
+            } else emit('current-page-change', val);
         }
         // 超级表格 ref
         const proTableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
@@ -1480,7 +1488,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             if (Object.keys(props.filterObj).length) return [
                 ...state.tableData
             ].filter((item)=>Object.keys(props.filterObj).every((cur)=>!props.filterObj[cur] && [
-                        "",
+                        '',
                         void 0,
                         null
                     ].includes(props.filterObj[cur]) || item[cur] === props.filterObj[cur]));
@@ -1527,7 +1535,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             if (!props.componentNo) return props.columns;
             {
                 if (!serveColumns.value?.length) return props.columns.map((cur)=>({
-                        displayFlag: cur.isHidden ? __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO : __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.YES,
+                        displayFlag: cur.isHidden || cur.defaultDisplayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO ? __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO : __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.YES,
                         ...cur
                     }));
                 let curColumns = [
@@ -1582,7 +1590,13 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
                                 border: ""
                             }, _ctx.$attrs), {
                                 default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
-                                        ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(true), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderList)(tableColumns.value.filter((item)=>!item.isHidden), (item, index)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, [
+                                        ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(true), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderList)(tableColumns.value.filter((item)=>{
+                                            /**
+             * defaultDisplayFlag: 默认显示标识，0：不显示，1：显示
+             * serveColumns ：服务端返回的列配置
+             */ if (props.componentNo && !serveColumns.value.length && item.defaultDisplayFlag === (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG).NO) return false;
+                                            return !item.isHidden;
+                                        }), (item, index)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, [
                                                 item.type && columnTypes.includes(item.type) ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElTableColumn), (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
                                                     key: 0,
                                                     ref_for: true
@@ -1731,7 +1745,8 @@ function unrefElement(elRef) {
     return plain?.$el ?? plain;
 }
 function findActiveIndexByDirection(options) {
-    const { data, direction, column, activeItem, rowKey, scrollTo } = options;
+    const { data, direction, column, activeItem, rowKey: rowKeyValue, scrollTo } = options;
+    const rowKey = (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(rowKeyValue);
     let currentIndex = data.findIndex((item)=>item[rowKey] === activeItem?.[rowKey]);
     const isYDirection = "ArrowUp" === direction || "ArrowDown" === direction;
     if (column) {
@@ -1824,15 +1839,14 @@ function useSelectByDirectionEvent(options) {
                     label: item.title,
                     prop: item.dataIndex
                 })));
-        const patientList = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>__props.accessResult.data);
         const setCurrentRow = (row)=>{
             currentRow.value = row;
             tableRef.value?.setCurrentRow(row);
         };
         /** 监听键盘方向事件 支持方向盘上下切换table 目标行 */ use_direction_select({
             triggerRef: inputRef,
-            rowKey: 'patientId',
-            data: patientList,
+            rowKey: (0, __WEBPACK_EXTERNAL_MODULE_vue__.toRef)(()=>__props.accessResult.primaryKey),
+            data: (0, __WEBPACK_EXTERNAL_MODULE_vue__.toRef)(()=>__props.accessResult.data),
             activeItem: currentRow,
             setCurrentItem: setCurrentRow,
             scrollTo: (params)=>{
@@ -1926,7 +1940,7 @@ function useSelectByDirectionEvent(options) {
                             ref: tableRef,
                             loading: _ctx.searchLoading,
                             columns: columns.value,
-                            data: patientList.value,
+                            data: _ctx.accessResult.data,
                             "row-key": _ctx.accessResult.primaryKey,
                             "highlight-current-row": "",
                             "max-height": "480px",
@@ -2187,6 +2201,7 @@ const patient_accessvue_type_script_setup_true_lang_ts_hoisted_1 = {
             emits('change', {
                 inputInfo: {
                     value: inputValue.value,
+                    primaryKey: accessResult.value.primaryKey,
                     searchTypeCode: activeAccessWay.value.searchTypeCode,
                     indexTypeCode: activeAccessWay.value.indexTypeCode,
                     triggerTypeCode: activeAccessWay.value.triggerTypeCode
@@ -2222,7 +2237,7 @@ const patient_accessvue_type_script_setup_true_lang_ts_hoisted_1 = {
             } else if (cardInfo?.indexNo || activeAccessWay.value?.indexTypeCode) handleChange({
                 cardInfo
             });
-            else __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning('未检索到患者信息');
+            else __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning('未检索到数据');
         };
         /** 触发患者检索 */ const triggerSearchAccess = async (data, cardInfo)=>{
             searchLoading.value = true;
@@ -3119,7 +3134,7 @@ function getExtraProps(item, dataValueNames, modelValue) {
             width: '100%'
         },
         filterable: true,
-        maxlength: item.maxLength,
+        maxLength: item.maxLength,
         'automatic-dropdown': item.focusAutoDropDownFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES,
         disabled: item.disabledFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES,
         codeSystemNo: item.codeSystemNo,
@@ -3207,6 +3222,8 @@ function useGetFromConfigData(result, layoutTypeCode, parentFormCtlNo, afterValu
 }
 /**
  * 传入地址类似的值 ，拼接
+ * 如果接口返回了这个字段。 展示接口返回对应的vaule
+ *  没有的话则展示默认值
  * @param data
  * @param key
  * @returns
@@ -3216,13 +3233,13 @@ function useGetFromConfigData(result, layoutTypeCode, parentFormCtlNo, afterValu
         return key.split(COMMA).reduce((pre, cur)=>{
             if (data[cur]) return `${pre}${pre ? COMMA : ''}${data[cur]}`;
             return pre;
-        }, '') || void 0;
+        }, '');
     }
     if ((key || '').startsWith(GROUP)) {
         const list = key.split(SEPARATOR);
         return (data[list[1]] || {})[list[2]];
     }
-    return data[key] || void 0;
+    return data[key];
 }
 /* ESM default export */ const Collapsevue_type_script_setup_true_lang_tsx = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
     __name: 'Collapse',
@@ -3238,12 +3255,13 @@ function useGetFromConfigData(result, layoutTypeCode, parentFormCtlNo, afterValu
         const formData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
         const hideData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({});
         const afterValueChange = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('afterValueChange');
+        const disabled = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('disabled');
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)([
             ()=>props.designDetailInfo.subFormControlList,
             ()=>props.dataValueNames
         ], ()=>{
-            const { result: initList, hideData } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
-            hideData.value = hideData; /**
+            const { result: initList, hideData: hideObj } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
+            hideData.value = hideObj; /**
      * 初次渲染
      */
             const initData = useGetFromConfigData(initList, props.layoutTypeCode, props.designDetailInfo.formCtlNo, afterValueChange);
@@ -3285,10 +3303,12 @@ function useGetFromConfigData(result, layoutTypeCode, parentFormCtlNo, afterValu
                     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"
                 ])
@@ -3298,7 +3318,7 @@ function useGetFromConfigData(result, layoutTypeCode, parentFormCtlNo, afterValu
 const Collapse_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Collapsevue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-555088b4"
+        "data-v-39478274"
     ]
 ]);
 /* ESM default export */ const Collapse = Collapse_exports_;
@@ -3336,17 +3356,20 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                             trigger: 'change'
                         }
                     ],
-                    render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(FormUnit, {
-                            disabled: disabled,
+                    render: (row)=>{
+                        const extraProps = getExtraProps(item, props.dataValueNames, row);
+                        return (0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(FormUnit, {
                             component: getComponentType(item),
                             label: item.labelNameDisplay || item.labelName,
                             placeholder: getPlaceholder(item),
-                            ...getExtraProps(item, props.dataValueNames, row),
+                            ...extraProps,
                             modelValue: row[item.bindingFieldNo],
                             'onUpdate:modelValue': (value)=>{
                                 row[item.bindingFieldNo] = value;
-                            }
-                        })
+                            },
+                            disabled: extraProps.disabled || disabled
+                        });
+                    }
                 }));
         }
         const tableColumn = useGetTableColumnData();
@@ -3423,7 +3446,7 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
 const Table_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Tablevue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-d25acd4c"
+        "data-v-7c43a384"
     ]
 ]);
 /* ESM default export */ const Table = Table_exports_;
@@ -3446,8 +3469,8 @@ const Table_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Tablevue_type_
             ()=>props.designDetailInfo.subFormControlList,
             ()=>props.dataValueNames
         ], ()=>{
-            const { result: initList, hideData } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
-            hideData.value = hideData; /**
+            const { result: initList, hideData: hideObj } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
+            hideData.value = hideObj; /**
      * 初次渲染
      */
             const initData = useGetFromConfigData(initList, props.layoutTypeCode, props.designDetailInfo.formCtlNo, afterValueChange);
@@ -3465,7 +3488,7 @@ const Table_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Tablevue_type_
                 let result = await formRef.value?.ref.validate();
                 if (result) return {
                     [props.designDetailInfo.bindingFieldNo]: utils_integrateData({
-                        ...hideData,
+                        ...hideData.value,
                         ...modelValue.value
                     }),
                     bindingFieldNo: props.designDetailInfo.bindingFieldNo,
@@ -3510,7 +3533,7 @@ const Table_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Tablevue_type_
 const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_script_setup_true_lang_tsx_name_Set, [
     [
         '__scopeId',
-        "data-v-c006ef0c"
+        "data-v-2b1a8223"
     ]
 ]);
 /* ESM default export */ const Set = Set_exports_;

package/dist/components/patient-access/api.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { ConfigReqParams, SearchReqParams, AccessConfig } from './types.d';
+import type { ConfigReqParams, SearchReqParams, AccessConfig, TPatient } from './types.d';
 /**
  * 1-10115-1 根据条件查询菜单的检索方式列表（业务态）
  * @param params
@@ -13,6 +13,6 @@ export declare const queryBizDataList: (params: SearchReqParams) => Promise<[imp
         display: string;
     }[];
     data: {
-        data: unknown[];
+        data: TPatient[];
     };
 }> | undefined]>;

package/dist/components/pro-table/interface/index.d.ts CHANGED Viewed

@@ -35,6 +35,7 @@ export type HeaderRenderScope<T> = {
     [key: string]: any;
 };
 export interface ColumnProps<T = any> extends Partial<Omit<TableColumnCtx<T>, 'type' | 'children' | 'renderCell' | 'renderHeader'>> {
+    defaultDisplayFlag?: number;
     required?: boolean | undefined;
     autoFormatterNumber?: boolean;
     columnClass?: string;

package/dist/hooks/index.js CHANGED Viewed

@@ -371,7 +371,8 @@ function unrefElement(elRef) {
     return plain?.$el ?? plain;
 }
 function findActiveIndexByDirection(options) {
-    const { data, direction, column, activeItem, rowKey, scrollTo } = options;
+    const { data, direction, column, activeItem, rowKey: rowKeyValue, scrollTo } = options;
+    const rowKey = (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(rowKeyValue);
     let currentIndex = data.findIndex((item)=>item[rowKey] === activeItem?.[rowKey]);
     const isYDirection = "ArrowUp" === direction || "ArrowDown" === direction;
     if (column) {

package/dist/hooks/use-direction-select/index.d.ts CHANGED Viewed

@@ -37,7 +37,7 @@ export declare function unrefElement<T extends MaybeElement>(elRef: MaybeRefOrGe
 export declare function findActiveIndexByDirection<T extends Record<string, any>>(options: {
     data: T[];
     activeItem?: T;
-    rowKey: keyof T;
+    rowKey: keyof T | Ref<keyof T>;
     direction: string;
     containerElement?: HTMLElement;
     scrollHeight?: number;
@@ -48,7 +48,7 @@ export interface UseSelectByDirectionEventOptions<T> {
     triggerRef: MaybeElementRef;
     data: MaybeRef<T[] | undefined>;
     activeItem: MaybeRef<T | undefined>;
-    rowKey: keyof T;
+    rowKey: string | Ref<string>;
     column?: number;
     rowHeight?: number;
     setCurrentItem: (item: T) => void;

package/dist/index.js CHANGED Viewed

@@ -864,8 +864,12 @@ const _hoisted_3 = {
             });
             if (res?.success) userList.value = res.data || [];
         }
-        (0, __WEBPACK_EXTERNAL_MODULE_vue__.onMounted)(()=>{
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)(()=>props.componentNo, ()=>{
             fetchDbgridComponent();
+        }, {
+            immediate: true
+        });
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.onMounted)(()=>{
             featchUserList();
         });
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)([
@@ -1140,7 +1144,7 @@ const _hoisted_3 = {
 const dbgrid_component_setting_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dbgrid_component_settingvue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-8c01f31c"
+        "data-v-1e494f3f"
     ]
 ]);
 /* ESM default export */ const dbgrid_component_setting = dbgrid_component_setting_exports_;
@@ -1245,7 +1249,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             default: void 0
         },
         componentNo: {
-            default: ""
+            default: ''
         },
         fetchData: {
             type: Function,
@@ -1260,7 +1264,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             default: false
         },
         rowKey: {
-            default: "id"
+            default: 'id'
         },
         loading: {
             type: Boolean,
@@ -1301,11 +1305,11 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
         });
         const serveColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
         const columnTypes = [
-            "selection",
-            "radio",
-            "index",
-            "expand",
-            "sort"
+            'selection',
+            'radio',
+            'index',
+            'expand',
+            'sort'
         ];
         const dbgridComponentSettingRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const formRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
@@ -1325,7 +1329,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
                     sortData.curData = item;
                     sortData.result = data;
                 }
-                if (item?.[attrs?.["tree-props"]?.children]) getDragSortData(newIndex, item?.[attrs?.["tree-props"]?.children], startIndexObj, sortData);
+                if (item?.[attrs?.['tree-props']?.children]) getDragSortData(newIndex, item?.[attrs?.['tree-props']?.children], startIndexObj, sortData);
             });
             return sortData;
         }
@@ -1335,7 +1339,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             let data = [
                 ...state.tableData
             ];
-            if (attrs?.["tree-props"]) {
+            if (attrs?.['tree-props']) {
                 let { result, curIndex: newCurIndex, curData: newCurData } = getDragSortData(newIndex, data, {
                     startIndex: -1
                 }, {
@@ -1351,7 +1355,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
                     curData: {}
                 });
                 if (newCurData.belongGroupElementId !== oldCurData.belongGroupElementId) {
-                    __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning("暂不支持跨层级拖拽配置");
+                    __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning('暂不支持跨层级拖拽配置');
                     return [];
                 }
                 const [removedItem] = result.splice(oldCurIndex, 1);
@@ -1367,16 +1371,16 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
  * 表格拖拽排序
  **/ const initDragSort = ()=>{
             const tbody = document.querySelector(`#${uuid.value} tbody`);
-            let initialHTML = ""; //暂不支持跨层级拖拽
+            let initialHTML = ''; //暂不支持跨层级拖拽
             if (tbody) __WEBPACK_EXTERNAL_MODULE_sortablejs__["default"].create(tbody, {
-                handle: ".cursor-move",
+                handle: '.cursor-move',
                 animation: 300,
                 onEnd (evt) {
                     const { newIndex, oldIndex } = evt;
                     if (newIndex === oldIndex || void 0 === newIndex || void 0 === oldIndex) return;
                     //获取拖动后的排序
                     let data = getSortableResult(newIndex, oldIndex);
-                    if (data.length) emit("drag-end", data);
+                    if (data.length) emit('drag-end', data);
                     else evt.from.innerHTML = initialHTML;
                 },
                 onStart (evt) {
@@ -1391,7 +1395,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
         });
         async function fetchDbgridComponent() {
             let [, result] = await queryDbgridComponentByExample({
-                componentNo: props.componentNo || ""
+                componentNo: props.componentNo || ''
             });
             if (result?.success) try {
                 let column = result.data.dbgridSettingValue && JSON.parse(result.data.dbgridSettingValue) || [];
@@ -1400,12 +1404,16 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
                 console.log(error);
             }
         }
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)(()=>props.componentNo, ()=>{
+            if (props.componentNo) fetchDbgridComponent();
+        }, {
+            immediate: true
+        });
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.onMounted)(()=>{
             // 支持拖拽排序
             if (props.draggable) (0, __WEBPACK_EXTERNAL_MODULE_vue__.nextTick)(()=>{
                 initDragSort();
             });
-            if (props.componentNo) fetchDbgridComponent();
             if (props.pagination && props?.fetchData) fetchList();
         });
         /**
@@ -1424,7 +1432,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
                 state.pageInfo.pageNumber = 1;
                 state.pageInfo.pageSize = val;
                 fetchList();
-            } else emit("size-page-change", val);
+            } else emit('size-page-change', val);
         };
         /**
  * 分页组件改变 当前页数 事件
@@ -1432,7 +1440,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             if (props.fetchData) {
                 state.pageInfo.pageNumber = val;
                 fetchList();
-            } else emit("current-page-change", val);
+            } else emit('current-page-change', val);
         }
         // 超级表格 ref
         const proTableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
@@ -1449,7 +1457,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             if (Object.keys(props.filterObj).length) return [
                 ...state.tableData
             ].filter((item)=>Object.keys(props.filterObj).every((cur)=>!props.filterObj[cur] && [
-                        "",
+                        '',
                         void 0,
                         null
                     ].includes(props.filterObj[cur]) || item[cur] === props.filterObj[cur]));
@@ -1496,7 +1504,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
             if (!props.componentNo) return props.columns;
             {
                 if (!serveColumns.value?.length) return props.columns.map((cur)=>({
-                        displayFlag: cur.isHidden ? __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO : __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.YES,
+                        displayFlag: cur.isHidden || cur.defaultDisplayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO ? __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO : __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.YES,
                         ...cur
                     }));
                 let curColumns = [
@@ -1551,7 +1559,13 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
                                 border: ""
                             }, _ctx.$attrs), {
                                 default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
-                                        ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(true), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderList)(tableColumns.value.filter((item)=>!item.isHidden), (item, index)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, [
+                                        ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(true), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderList)(tableColumns.value.filter((item)=>{
+                                            /**
+             * defaultDisplayFlag: 默认显示标识，0：不显示，1：显示
+             * serveColumns ：服务端返回的列配置
+             */ if (props.componentNo && !serveColumns.value.length && item.defaultDisplayFlag === (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG).NO) return false;
+                                            return !item.isHidden;
+                                        }), (item, index)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, [
                                                 item.type && columnTypes.includes(item.type) ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElTableColumn), (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
                                                     key: 0,
                                                     ref_for: true
@@ -2029,7 +2043,8 @@ function unrefElement(elRef) {
     return plain?.$el ?? plain;
 }
 function findActiveIndexByDirection(options) {
-    const { data, direction, column, activeItem, rowKey, scrollTo } = options;
+    const { data, direction, column, activeItem, rowKey: rowKeyValue, scrollTo } = options;
+    const rowKey = (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(rowKeyValue);
     let currentIndex = data.findIndex((item)=>item[rowKey] === activeItem?.[rowKey]);
     const isYDirection = "ArrowUp" === direction || "ArrowDown" === direction;
     if (column) {
@@ -2129,15 +2144,14 @@ function useColumnConfig(options) {
                     label: item.title,
                     prop: item.dataIndex
                 })));
-        const patientList = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>__props.accessResult.data);
         const setCurrentRow = (row)=>{
             currentRow.value = row;
             tableRef.value?.setCurrentRow(row);
         };
         /** 监听键盘方向事件 支持方向盘上下切换table 目标行 */ use_direction_select({
             triggerRef: inputRef,
-            rowKey: 'patientId',
-            data: patientList,
+            rowKey: (0, __WEBPACK_EXTERNAL_MODULE_vue__.toRef)(()=>__props.accessResult.primaryKey),
+            data: (0, __WEBPACK_EXTERNAL_MODULE_vue__.toRef)(()=>__props.accessResult.data),
             activeItem: currentRow,
             setCurrentItem: setCurrentRow,
             scrollTo: (params)=>{
@@ -2231,7 +2245,7 @@ function useColumnConfig(options) {
                             ref: tableRef,
                             loading: _ctx.searchLoading,
                             columns: columns.value,
-                            data: patientList.value,
+                            data: _ctx.accessResult.data,
                             "row-key": _ctx.accessResult.primaryKey,
                             "highlight-current-row": "",
                             "max-height": "480px",
@@ -2492,6 +2506,7 @@ const patient_accessvue_type_script_setup_true_lang_ts_hoisted_1 = {
             emits('change', {
                 inputInfo: {
                     value: inputValue.value,
+                    primaryKey: accessResult.value.primaryKey,
                     searchTypeCode: activeAccessWay.value.searchTypeCode,
                     indexTypeCode: activeAccessWay.value.indexTypeCode,
                     triggerTypeCode: activeAccessWay.value.triggerTypeCode
@@ -2527,7 +2542,7 @@ const patient_accessvue_type_script_setup_true_lang_ts_hoisted_1 = {
             } else if (cardInfo?.indexNo || activeAccessWay.value?.indexTypeCode) handleChange({
                 cardInfo
             });
-            else __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning('未检索到患者信息');
+            else __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning('未检索到数据');
         };
         /** 触发患者检索 */ const triggerSearchAccess = async (data, cardInfo)=>{
             searchLoading.value = true;
@@ -3424,7 +3439,7 @@ function getExtraProps(item, dataValueNames, modelValue) {
             width: '100%'
         },
         filterable: true,
-        maxlength: item.maxLength,
+        maxLength: item.maxLength,
         'automatic-dropdown': item.focusAutoDropDownFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES,
         disabled: item.disabledFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES,
         codeSystemNo: item.codeSystemNo,
@@ -3512,6 +3527,8 @@ function useGetFromConfigData(result, layoutTypeCode, parentFormCtlNo, afterValu
 }
 /**
  * 传入地址类似的值 ，拼接
+ * 如果接口返回了这个字段。 展示接口返回对应的vaule
+ *  没有的话则展示默认值
  * @param data
  * @param key
  * @returns
@@ -3521,13 +3538,13 @@ function useGetFromConfigData(result, layoutTypeCode, parentFormCtlNo, afterValu
         return key.split(COMMA).reduce((pre, cur)=>{
             if (data[cur]) return `${pre}${pre ? COMMA : ''}${data[cur]}`;
             return pre;
-        }, '') || void 0;
+        }, '');
     }
     if ((key || '').startsWith(GROUP)) {
         const list = key.split(SEPARATOR);
         return (data[list[1]] || {})[list[2]];
     }
-    return data[key] || void 0;
+    return data[key];
 }
 // import { translation } from "@sun-core/micro-app";
 /**
@@ -4165,12 +4182,13 @@ const print_component_print = async (options)=>{
         const formData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
         const hideData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)({});
         const afterValueChange = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('afterValueChange');
+        const disabled = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('disabled');
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)([
             ()=>props.designDetailInfo.subFormControlList,
             ()=>props.dataValueNames
         ], ()=>{
-            const { result: initList, hideData } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
-            hideData.value = hideData; /**
+            const { result: initList, hideData: hideObj } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
+            hideData.value = hideObj; /**
      * 初次渲染
      */
             const initData = useGetFromConfigData(initList, props.layoutTypeCode, props.designDetailInfo.formCtlNo, afterValueChange);
@@ -4212,10 +4230,12 @@ const print_component_print = async (options)=>{
                     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"
                 ])
@@ -4225,7 +4245,7 @@ const print_component_print = async (options)=>{
 const Collapse_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Collapsevue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-555088b4"
+        "data-v-39478274"
     ]
 ]);
 /* ESM default export */ const Collapse = Collapse_exports_;
@@ -4263,17 +4283,20 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
                             trigger: 'change'
                         }
                     ],
-                    render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(FormUnit, {
-                            disabled: disabled,
+                    render: (row)=>{
+                        const extraProps = getExtraProps(item, props.dataValueNames, row);
+                        return (0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(FormUnit, {
                             component: getComponentType(item),
                             label: item.labelNameDisplay || item.labelName,
                             placeholder: getPlaceholder(item),
-                            ...getExtraProps(item, props.dataValueNames, row),
+                            ...extraProps,
                             modelValue: row[item.bindingFieldNo],
                             'onUpdate:modelValue': (value)=>{
                                 row[item.bindingFieldNo] = value;
-                            }
-                        })
+                            },
+                            disabled: extraProps.disabled || disabled
+                        });
+                    }
                 }));
         }
         const tableColumn = useGetTableColumnData();
@@ -4350,7 +4373,7 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
 const Table_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Tablevue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-d25acd4c"
+        "data-v-7c43a384"
     ]
 ]);
 /* ESM default export */ const Table = Table_exports_;
@@ -4373,8 +4396,8 @@ const Table_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Tablevue_type_
             ()=>props.designDetailInfo.subFormControlList,
             ()=>props.dataValueNames
         ], ()=>{
-            const { result: initList, hideData } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
-            hideData.value = hideData; /**
+            const { result: initList, hideData: hideObj } = expansionGroup(props.designDetailInfo.subFormControlList || [], []);
+            hideData.value = hideObj; /**
      * 初次渲染
      */
             const initData = useGetFromConfigData(initList, props.layoutTypeCode, props.designDetailInfo.formCtlNo, afterValueChange);
@@ -4392,7 +4415,7 @@ const Table_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Tablevue_type_
                 let result = await formRef.value?.ref.validate();
                 if (result) return {
                     [props.designDetailInfo.bindingFieldNo]: utils_integrateData({
-                        ...hideData,
+                        ...hideData.value,
                         ...modelValue.value
                     }),
                     bindingFieldNo: props.designDetailInfo.bindingFieldNo,
@@ -4437,7 +4460,7 @@ const Table_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Tablevue_type_
 const Set_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Setvue_type_script_setup_true_lang_tsx_name_Set, [
     [
         '__scopeId',
-        "data-v-c006ef0c"
+        "data-v-2b1a8223"
     ]
 ]);
 /* ESM default export */ const Set = Set_exports_;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "sun-biz",
-  "version": "0.0.2-beta.11",
+  "version": "0.0.2-beta.12",
   "type": "module",
   "exports": {
     ".": {