jtui3.0 1.0.52 → 1.0.53

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.
@@ -85793,14 +85793,14 @@ function useFilterData() {
85793
85793
  /*
85794
85794
  * @Author: leevan
85795
85795
  * @Date: 2022-07-12 16:59:44
85796
- * @LastEditTime: 2023-08-21 11:18:17
85796
+ * @LastEditTime: 2023-08-31 14:40:14
85797
85797
  * @LastEditors: leevan
85798
85798
  * @FilePath: /jtui3.0/packages/tables/hooks/useFormatter.js
85799
85799
  */
85800
85800
  function useFormatter() {
85801
85801
  function objectTxt(cellValue, column) {
85802
85802
  if (column.editRender && column.editRender.name == 'cascader-select') {
85803
- return cellValue.label;
85803
+ return Object.prototype.toString.call(cellValue) === '[object Object]' ? cellValue.label : cellValue;
85804
85804
  }
85805
85805
 
85806
85806
  return typeof cellValue == 'object' && cellValue != null ? JSON.stringify(cellValue) : cellValue;
@@ -90559,6 +90559,13 @@ Sortable.mount(Remove, Revert);
90559
90559
  /* harmony default export */ var sortable_esm = (Sortable);
90560
90560
 
90561
90561
  ;// CONCATENATED MODULE: ./packages/tables/hooks/useSortable.js
90562
+ /*
90563
+ * @Author: leevan
90564
+ * @Date: 2023-06-12 15:50:57
90565
+ * @LastEditTime: 2023-08-31 14:55:47
90566
+ * @LastEditors: leevan
90567
+ * @FilePath: /jtui3.0/packages/tables/hooks/useSortable.js
90568
+ */
90562
90569
 
90563
90570
 
90564
90571
  function useSortable(vm, emit) {
@@ -90575,10 +90582,18 @@ function useSortable(vm, emit) {
90575
90582
 
90576
90583
  const newIndex = sortableEvent.newIndex;
90577
90584
  const oldIndex = sortableEvent.oldIndex;
90578
- const currRow = vm.value.getTableData().tableData.splice(oldIndex, 1)[0];
90579
- vm.value.getTableData().tableData.splice(newIndex, 0, currRow);
90585
+
90586
+ if (!('dataCopy' in vm.value)) {
90587
+ vm.value.dataCopy = JSON.parse(JSON.stringify(vm.value.data));
90588
+ }
90589
+
90590
+ const currRow = vm.value.dataCopy.splice(oldIndex, 1)[0];
90591
+ vm.value.dataCopy.splice(newIndex, 0, currRow);
90580
90592
  timeId = setTimeout(() => {
90581
- emit('customEvents', 'sortable', vm.value.getTableData());
90593
+ emit('customEvents', 'sortable', {
90594
+ newdData: vm.value.dataCopy,
90595
+ oldData: vm.value.getTableData().tableData
90596
+ });
90582
90597
  }, 3000);
90583
90598
  }
90584
90599
  });
@@ -85803,14 +85803,14 @@ function useFilterData() {
85803
85803
  /*
85804
85804
  * @Author: leevan
85805
85805
  * @Date: 2022-07-12 16:59:44
85806
- * @LastEditTime: 2023-08-21 11:18:17
85806
+ * @LastEditTime: 2023-08-31 14:40:14
85807
85807
  * @LastEditors: leevan
85808
85808
  * @FilePath: /jtui3.0/packages/tables/hooks/useFormatter.js
85809
85809
  */
85810
85810
  function useFormatter() {
85811
85811
  function objectTxt(cellValue, column) {
85812
85812
  if (column.editRender && column.editRender.name == 'cascader-select') {
85813
- return cellValue.label;
85813
+ return Object.prototype.toString.call(cellValue) === '[object Object]' ? cellValue.label : cellValue;
85814
85814
  }
85815
85815
 
85816
85816
  return typeof cellValue == 'object' && cellValue != null ? JSON.stringify(cellValue) : cellValue;
@@ -90569,6 +90569,13 @@ Sortable.mount(Remove, Revert);
90569
90569
  /* harmony default export */ var sortable_esm = (Sortable);
90570
90570
 
90571
90571
  ;// CONCATENATED MODULE: ./packages/tables/hooks/useSortable.js
90572
+ /*
90573
+ * @Author: leevan
90574
+ * @Date: 2023-06-12 15:50:57
90575
+ * @LastEditTime: 2023-08-31 14:55:47
90576
+ * @LastEditors: leevan
90577
+ * @FilePath: /jtui3.0/packages/tables/hooks/useSortable.js
90578
+ */
90572
90579
 
90573
90580
 
90574
90581
  function useSortable(vm, emit) {
@@ -90585,10 +90592,18 @@ function useSortable(vm, emit) {
90585
90592
 
90586
90593
  const newIndex = sortableEvent.newIndex;
90587
90594
  const oldIndex = sortableEvent.oldIndex;
90588
- const currRow = vm.value.getTableData().tableData.splice(oldIndex, 1)[0];
90589
- vm.value.getTableData().tableData.splice(newIndex, 0, currRow);
90595
+
90596
+ if (!('dataCopy' in vm.value)) {
90597
+ vm.value.dataCopy = JSON.parse(JSON.stringify(vm.value.data));
90598
+ }
90599
+
90600
+ const currRow = vm.value.dataCopy.splice(oldIndex, 1)[0];
90601
+ vm.value.dataCopy.splice(newIndex, 0, currRow);
90590
90602
  timeId = setTimeout(() => {
90591
- emit('customEvents', 'sortable', vm.value.getTableData());
90603
+ emit('customEvents', 'sortable', {
90604
+ newdData: vm.value.dataCopy,
90605
+ oldData: vm.value.getTableData().tableData
90606
+ });
90592
90607
  }, 3000);
90593
90608
  }
90594
90609
  });