sun-biz 0.0.4-beta.52 → 0.0.4-beta.54

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 (6) hide show
  1. package/dist/components/biz-select/biz-unit-select/api.d.ts +1 -0
  2. package/dist/components/biz-select/department-select/api.d.ts +1 -0
  3. package/dist/components/biz-select/ward-select/api.d.ts +1 -0
  4. package/dist/components/index.js +27 -22
  5. package/dist/index.js +27 -22
  6. package/package.json +1 -1
package/dist/components/biz-select/biz-unit-select/api.d.ts CHANGED
@@ -6,6 +6,7 @@ export type BizUnitQueryParams = {
6
6
  orgIds?: string[];
7
7
  encounterTypeCode?: string;
8
8
  deptId?: string;
9
+ orgLocationId?: string;
9
10
  };
10
11
  export type BizUnitItem = {
11
12
  orgId: string;
package/dist/components/biz-select/department-select/api.d.ts CHANGED
@@ -4,6 +4,7 @@ export type DepartmentQueryParams = {
4
4
  hospitalId: string;
5
5
  deptTypeCodes?: string[];
6
6
  encounterTypeCode?: string;
7
+ orgLocationId?: string;
7
8
  };
8
9
  export type DepartmentItem = {
9
10
  orgId: string;
package/dist/components/biz-select/ward-select/api.d.ts CHANGED
@@ -3,6 +3,7 @@ export type WardQueryParams = {
3
3
  enabledFlag?: number;
4
4
  deptId?: string;
5
5
  hospitalId: string;
6
+ orgLocationId?: string;
6
7
  };
7
8
  export type WardItem = {
8
9
  orgId: string;
package/dist/components/index.js CHANGED
@@ -2860,26 +2860,22 @@ const SELECTION = 'selection';
2860
2860
  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,
2861
2861
  ...cur
2862
2862
  }));
2863
- return result;
2864
- });
2865
- /**
2866
- * 处理接口和本地的columns
2867
- */ const commonColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
2868
- let propsColumns = [
2869
- ...props.columns
2870
- ];
2871
- if (props.couldSortFieldList && props.couldSortFieldList?.length) propsColumns = propsColumns.map((item)=>{
2863
+ if (props.couldSortFieldList && props.couldSortFieldList?.length) result = result.map((item)=>{
2872
2864
  let supportSort = !!(props.couldSortFieldList || []).find((cur)=>cur.fieldName === item.prop);
2873
2865
  return {
2874
2866
  sortable: !!supportSort && (props.pagination ? 'custom' : supportSort),
2875
2867
  ...item
2876
2868
  };
2877
2869
  });
2878
- if (!(props.componentNo || serveColumns.value?.length)) return propsColumns;
2879
- {
2880
- let result = [
2881
- ...defaultColumns.value
2882
- ];
2870
+ return result;
2871
+ });
2872
+ /**
2873
+ * 处理接口和本地的columns
2874
+ */ const commonColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
2875
+ let result = [
2876
+ ...defaultColumns.value
2877
+ ];
2878
+ if (props.componentNo || serveColumns.value?.length) {
2883
2879
  if (serveColumns.value?.length) {
2884
2880
  result = result.map((item, index)=>{
2885
2881
  let findObj = serveColumns.value.find((cur)=>cur.prop === item.prop) || {
@@ -2898,8 +2894,8 @@ const SELECTION = 'selection';
2898
2894
  });
2899
2895
  result.sort((a, b)=>Number(a.sort) - Number(b.sort));
2900
2896
  }
2901
- return result;
2902
2897
  }
2898
+ return result;
2903
2899
  });
2904
2900
  /**
2905
2901
  * 处理 Element Plus 表格的滚动事件
@@ -7249,7 +7245,7 @@ const user_selectvue_type_script_lang_tsx_name_UserSelect_setup_true_hoisted_1 =
7249
7245
  }
7250
7246
  };
7251
7247
  const user_selectvue_type_script_lang_tsx_name_UserSelect_setup_true_hoisted_2 = {
7252
- class: "border-t pt-2 px-2"
7248
+ class: "border-t px-2 pt-2"
7253
7249
  };
7254
7250
  // 全局事件：用于关闭其他实例的 popover
7255
7251
  const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
@@ -7442,7 +7438,9 @@ const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
7442
7438
  label: item.userName,
7443
7439
  value: item.userId
7444
7440
  })); // 保留已选中的项，确保选中状态能正确回显
7445
- if (selectedRows.value?.length) {
7441
+ // 只有在非搜索状态下（没有关键字）才合并选中项，搜索时以搜索结果为准
7442
+ const isSearch = !!data?.keyWord;
7443
+ if (!isSearch && selectedRows.value?.length) {
7446
7444
  const selectedList = selectedRows.value.map((item)=>({
7447
7445
  ...item,
7448
7446
  userId: item.value || item.userId,
@@ -7454,7 +7452,7 @@ const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
7454
7452
  ...list,
7455
7453
  ...selectedList
7456
7454
  ], 'userId');
7457
- } else if (attrs.modelValue && Array.isArray(props.defaultValue) && props.defaultValue.length) {
7455
+ } else if (!isSearch && attrs.modelValue && Array.isArray(props.defaultValue) && props.defaultValue.length) {
7458
7456
  const defaultList = props.defaultValue.map((item)=>({
7459
7457
  ...item,
7460
7458
  userId: item.value || item.userId,
@@ -7878,6 +7876,7 @@ const biz_unit_selectvue_type_script_lang_tsx_name_BizUnitSelect_setup_true_CLOS
7878
7876
  keyWord: {},
7879
7877
  hospitalId: {},
7880
7878
  orgTypeCodes: {},
7879
+ orgLocationId: {},
7881
7880
  multiSelectFlag: {
7882
7881
  type: Boolean
7883
7882
  },
@@ -8006,7 +8005,8 @@ const biz_unit_selectvue_type_script_lang_tsx_name_BizUnitSelect_setup_true_CLOS
8006
8005
  orgTypeCodes: props.orgTypeCodes,
8007
8006
  enabledFlag: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES,
8008
8007
  encounterTypeCode: props.encounterTypeCode,
8009
- deptId: props.deptId
8008
+ deptId: props.deptId,
8009
+ orgLocationId: props.orgLocationId
8010
8010
  });
8011
8011
  loading.value = false;
8012
8012
  if (res?.success) {
@@ -8413,6 +8413,7 @@ const biz_unit_select_exports_ = biz_unit_selectvue_type_script_lang_tsx_name_Bi
8413
8413
  multiSelectFlag: {
8414
8414
  type: Boolean
8415
8415
  },
8416
+ orgLocationId: {},
8416
8417
  defaultValue: {},
8417
8418
  disabledValueIds: {},
8418
8419
  tableProps: {},
@@ -8506,7 +8507,8 @@ const biz_unit_select_exports_ = biz_unit_selectvue_type_script_lang_tsx_name_Bi
8506
8507
  enabledFlag: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES,
8507
8508
  deptTypeCodes: props.deptTypeCodes,
8508
8509
  encounterTypeCode: props.encounterTypeCode,
8509
- hospitalId: props.hospitalId
8510
+ hospitalId: props.hospitalId,
8511
+ orgLocationId: props.orgLocationId
8510
8512
  });
8511
8513
  loading.value = false;
8512
8514
  if (res?.success) {
@@ -8880,6 +8882,7 @@ const department_select_exports_ = department_selectvue_type_script_setup_true_l
8880
8882
  },
8881
8883
  defaultValue: {},
8882
8884
  disabledValueIds: {},
8885
+ orgLocationId: {},
8883
8886
  tableProps: {},
8884
8887
  selectProps: {}
8885
8888
  },
@@ -8965,7 +8968,8 @@ const department_select_exports_ = department_selectvue_type_script_setup_true_l
8965
8968
  ...data,
8966
8969
  enabledFlag: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES,
8967
8970
  deptId: props.deptId,
8968
- hospitalId: props.hospitalId
8971
+ hospitalId: props.hospitalId,
8972
+ orgLocationId: props.orgLocationId
8969
8973
  });
8970
8974
  loading.value = false;
8971
8975
  if (res?.success) {
@@ -9451,7 +9455,8 @@ const FormUnitvue_type_script_setup_true_lang_ts_name_formUnit_hoisted_1 = {
9451
9455
  class: "overflow-hidden"
9452
9456
  };
9453
9457
  const FormUnitvue_type_script_setup_true_lang_ts_name_formUnit_hoisted_2 = {
9454
- key: 1
9458
+ key: 1,
9459
+ class: "text-base"
9455
9460
  };
9456
9461
  const DICT_SELECT = 'dictSelect';
9457
9462
  /* ESM default export */ const FormUnitvue_type_script_setup_true_lang_ts_name_formUnit = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
package/dist/index.js CHANGED
@@ -2896,26 +2896,22 @@ const SELECTION = 'selection';
2896
2896
  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,
2897
2897
  ...cur
2898
2898
  }));
2899
- return result;
2900
- });
2901
- /**
2902
- * 处理接口和本地的columns
2903
- */ const commonColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
2904
- let propsColumns = [
2905
- ...props.columns
2906
- ];
2907
- if (props.couldSortFieldList && props.couldSortFieldList?.length) propsColumns = propsColumns.map((item)=>{
2899
+ if (props.couldSortFieldList && props.couldSortFieldList?.length) result = result.map((item)=>{
2908
2900
  let supportSort = !!(props.couldSortFieldList || []).find((cur)=>cur.fieldName === item.prop);
2909
2901
  return {
2910
2902
  sortable: !!supportSort && (props.pagination ? 'custom' : supportSort),
2911
2903
  ...item
2912
2904
  };
2913
2905
  });
2914
- if (!(props.componentNo || serveColumns.value?.length)) return propsColumns;
2915
- {
2916
- let result = [
2917
- ...defaultColumns.value
2918
- ];
2906
+ return result;
2907
+ });
2908
+ /**
2909
+ * 处理接口和本地的columns
2910
+ */ const commonColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
2911
+ let result = [
2912
+ ...defaultColumns.value
2913
+ ];
2914
+ if (props.componentNo || serveColumns.value?.length) {
2919
2915
  if (serveColumns.value?.length) {
2920
2916
  result = result.map((item, index)=>{
2921
2917
  let findObj = serveColumns.value.find((cur)=>cur.prop === item.prop) || {
@@ -2934,8 +2930,8 @@ const SELECTION = 'selection';
2934
2930
  });
2935
2931
  result.sort((a, b)=>Number(a.sort) - Number(b.sort));
2936
2932
  }
2937
- return result;
2938
2933
  }
2934
+ return result;
2939
2935
  });
2940
2936
  /**
2941
2937
  * 处理 Element Plus 表格的滚动事件
@@ -7918,7 +7914,7 @@ const user_selectvue_type_script_lang_tsx_name_UserSelect_setup_true_hoisted_1 =
7918
7914
  }
7919
7915
  };
7920
7916
  const user_selectvue_type_script_lang_tsx_name_UserSelect_setup_true_hoisted_2 = {
7921
- class: "border-t pt-2 px-2"
7917
+ class: "border-t px-2 pt-2"
7922
7918
  };
7923
7919
  // 全局事件：用于关闭其他实例的 popover
7924
7920
  const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
@@ -8111,7 +8107,9 @@ const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
8111
8107
  label: item.userName,
8112
8108
  value: item.userId
8113
8109
  })); // 保留已选中的项，确保选中状态能正确回显
8114
- if (selectedRows.value?.length) {
8110
+ // 只有在非搜索状态下（没有关键字）才合并选中项，搜索时以搜索结果为准
8111
+ const isSearch = !!data?.keyWord;
8112
+ if (!isSearch && selectedRows.value?.length) {
8115
8113
  const selectedList = selectedRows.value.map((item)=>({
8116
8114
  ...item,
8117
8115
  userId: item.value || item.userId,
@@ -8123,7 +8121,7 @@ const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
8123
8121
  ...list,
8124
8122
  ...selectedList
8125
8123
  ], 'userId');
8126
- } else if (attrs.modelValue && Array.isArray(props.defaultValue) && props.defaultValue.length) {
8124
+ } else if (!isSearch && attrs.modelValue && Array.isArray(props.defaultValue) && props.defaultValue.length) {
8127
8125
  const defaultList = props.defaultValue.map((item)=>({
8128
8126
  ...item,
8129
8127
  userId: item.value || item.userId,
@@ -8547,6 +8545,7 @@ const biz_unit_selectvue_type_script_lang_tsx_name_BizUnitSelect_setup_true_CLOS
8547
8545
  keyWord: {},
8548
8546
  hospitalId: {},
8549
8547
  orgTypeCodes: {},
8548
+ orgLocationId: {},
8550
8549
  multiSelectFlag: {
8551
8550
  type: Boolean
8552
8551
  },
@@ -8675,7 +8674,8 @@ const biz_unit_selectvue_type_script_lang_tsx_name_BizUnitSelect_setup_true_CLOS
8675
8674
  orgTypeCodes: props.orgTypeCodes,
8676
8675
  enabledFlag: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES,
8677
8676
  encounterTypeCode: props.encounterTypeCode,
8678
- deptId: props.deptId
8677
+ deptId: props.deptId,
8678
+ orgLocationId: props.orgLocationId
8679
8679
  });
8680
8680
  loading.value = false;
8681
8681
  if (res?.success) {
@@ -9082,6 +9082,7 @@ const biz_unit_select_exports_ = biz_unit_selectvue_type_script_lang_tsx_name_Bi
9082
9082
  multiSelectFlag: {
9083
9083
  type: Boolean
9084
9084
  },
9085
+ orgLocationId: {},
9085
9086
  defaultValue: {},
9086
9087
  disabledValueIds: {},
9087
9088
  tableProps: {},
@@ -9175,7 +9176,8 @@ const biz_unit_select_exports_ = biz_unit_selectvue_type_script_lang_tsx_name_Bi
9175
9176
  enabledFlag: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES,
9176
9177
  deptTypeCodes: props.deptTypeCodes,
9177
9178
  encounterTypeCode: props.encounterTypeCode,
9178
- hospitalId: props.hospitalId
9179
+ hospitalId: props.hospitalId,
9180
+ orgLocationId: props.orgLocationId
9179
9181
  });
9180
9182
  loading.value = false;
9181
9183
  if (res?.success) {
@@ -9549,6 +9551,7 @@ const department_select_exports_ = department_selectvue_type_script_setup_true_l
9549
9551
  },
9550
9552
  defaultValue: {},
9551
9553
  disabledValueIds: {},
9554
+ orgLocationId: {},
9552
9555
  tableProps: {},
9553
9556
  selectProps: {}
9554
9557
  },
@@ -9634,7 +9637,8 @@ const department_select_exports_ = department_selectvue_type_script_setup_true_l
9634
9637
  ...data,
9635
9638
  enabledFlag: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES,
9636
9639
  deptId: props.deptId,
9637
- hospitalId: props.hospitalId
9640
+ hospitalId: props.hospitalId,
9641
+ orgLocationId: props.orgLocationId
9638
9642
  });
9639
9643
  loading.value = false;
9640
9644
  if (res?.success) {
@@ -10393,7 +10397,8 @@ const FormUnitvue_type_script_setup_true_lang_ts_name_formUnit_hoisted_1 = {
10393
10397
  class: "overflow-hidden"
10394
10398
  };
10395
10399
  const FormUnitvue_type_script_setup_true_lang_ts_name_formUnit_hoisted_2 = {
10396
- key: 1
10400
+ key: 1,
10401
+ class: "text-base"
10397
10402
  };
10398
10403
  const DICT_SELECT = 'dictSelect';
10399
10404
  /* ESM default export */ const FormUnitvue_type_script_setup_true_lang_ts_name_formUnit = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sun-biz",
3
- "version": "0.0.4-beta.52",
3
+ "version": "0.0.4-beta.54",
4
4
  "type": "module",
5
5
  "workspaces": [
6
6
  "src/*",