sun-biz 0.0.3-beta.30 → 0.0.3-beta.31

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.
@@ -1446,7 +1446,8 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
1446
1446
  let findObj = serverColum.find((i)=>i.prop === item.prop);
1447
1447
  return {
1448
1448
  ...item,
1449
- ...findObj || {}
1449
+ ...findObj || {},
1450
+ sortable: item.sortable
1450
1451
  };
1451
1452
  });
1452
1453
  sourceData.value.sort((a, b)=>a.sort - b.sort);
@@ -1797,7 +1798,7 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
1797
1798
  const dbgrid_component_setting_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dbgrid_component_settingvue_type_script_setup_true_lang_tsx, [
1798
1799
  [
1799
1800
  '__scopeId',
1800
- "data-v-ee531832"
1801
+ "data-v-0a8babe7"
1801
1802
  ]
1802
1803
  ]);
1803
1804
  /* ESM default export */ const dbgrid_component_setting = dbgrid_component_setting_exports_;
@@ -2274,7 +2275,7 @@ const SELECTION = 'selection';
2274
2275
  },
2275
2276
  isShowDragTips: {
2276
2277
  type: Boolean,
2277
- default: false
2278
+ default: true
2278
2279
  },
2279
2280
  dragTipsCustomStyle: {
2280
2281
  default: {}
@@ -2545,7 +2546,8 @@ const SELECTION = 'selection';
2545
2546
  sort: index + 1,
2546
2547
  ...findObj,
2547
2548
  label: item.label || findObj.label,
2548
- isHidden: item.isHidden || findObj.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO
2549
+ isHidden: item.isHidden || findObj.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO,
2550
+ sortable: item.sortable
2549
2551
  };
2550
2552
  });
2551
2553
  result.sort((a, b)=>Number(a.sort) - Number(b.sort));
@@ -2575,6 +2577,13 @@ const SELECTION = 'selection';
2575
2577
  }
2576
2578
  return result.filter((item)=>!item.isHidden && !(props.componentNo && !serveColumns.value?.length && item.defaultDisplayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO));
2577
2579
  });
2580
+ /**
2581
+ *
2582
+ * 是否展示当前拖拽提示
2583
+ */ const draggableTips = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
2584
+ const isTips = !!props?.draggable && (!!props?.isShowDragTips || false);
2585
+ return isTips;
2586
+ });
2578
2587
  function sortChange({ column, order, prop }) {
2579
2588
  if (!props.couldSortFieldList?.length) return emit('sort-change', {
2580
2589
  column,
@@ -2602,7 +2611,7 @@ const SELECTION = 'selection';
2602
2611
  ];
2603
2612
  }
2604
2613
  return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1, [
2605
- props?.draggable || props?.isShowDragTips ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", {
2614
+ draggableTips.value ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", {
2606
2615
  key: 0,
2607
2616
  style: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeStyle)({
2608
2617
  color: '#f7ba2a',
package/dist/index.js CHANGED
@@ -1447,7 +1447,8 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
1447
1447
  let findObj = serverColum.find((i)=>i.prop === item.prop);
1448
1448
  return {
1449
1449
  ...item,
1450
- ...findObj || {}
1450
+ ...findObj || {},
1451
+ sortable: item.sortable
1451
1452
  };
1452
1453
  });
1453
1454
  sourceData.value.sort((a, b)=>a.sort - b.sort);
@@ -1798,7 +1799,7 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
1798
1799
  const dbgrid_component_setting_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dbgrid_component_settingvue_type_script_setup_true_lang_tsx, [
1799
1800
  [
1800
1801
  '__scopeId',
1801
- "data-v-ee531832"
1802
+ "data-v-0a8babe7"
1802
1803
  ]
1803
1804
  ]);
1804
1805
  /* ESM default export */ const dbgrid_component_setting = dbgrid_component_setting_exports_;
@@ -2275,7 +2276,7 @@ const SELECTION = 'selection';
2275
2276
  },
2276
2277
  isShowDragTips: {
2277
2278
  type: Boolean,
2278
- default: false
2279
+ default: true
2279
2280
  },
2280
2281
  dragTipsCustomStyle: {
2281
2282
  default: {}
@@ -2546,7 +2547,8 @@ const SELECTION = 'selection';
2546
2547
  sort: index + 1,
2547
2548
  ...findObj,
2548
2549
  label: item.label || findObj.label,
2549
- isHidden: item.isHidden || findObj.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO
2550
+ isHidden: item.isHidden || findObj.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO,
2551
+ sortable: item.sortable
2550
2552
  };
2551
2553
  });
2552
2554
  result.sort((a, b)=>Number(a.sort) - Number(b.sort));
@@ -2576,6 +2578,13 @@ const SELECTION = 'selection';
2576
2578
  }
2577
2579
  return result.filter((item)=>!item.isHidden && !(props.componentNo && !serveColumns.value?.length && item.defaultDisplayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO));
2578
2580
  });
2581
+ /**
2582
+ *
2583
+ * 是否展示当前拖拽提示
2584
+ */ const draggableTips = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
2585
+ const isTips = !!props?.draggable && (!!props?.isShowDragTips || false);
2586
+ return isTips;
2587
+ });
2579
2588
  function sortChange({ column, order, prop }) {
2580
2589
  if (!props.couldSortFieldList?.length) return emit('sort-change', {
2581
2590
  column,
@@ -2603,7 +2612,7 @@ const SELECTION = 'selection';
2603
2612
  ];
2604
2613
  }
2605
2614
  return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1, [
2606
- props?.draggable || props?.isShowDragTips ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", {
2615
+ draggableTips.value ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", {
2607
2616
  key: 0,
2608
2617
  style: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeStyle)({
2609
2618
  color: '#f7ba2a',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sun-biz",
3
- "version": "0.0.3-beta.30",
3
+ "version": "0.0.3-beta.31",
4
4
  "type": "module",
5
5
  "workspaces": [
6
6
  "src/*",