@itfin/components 1.4.28 → 1.4.33

package/src/components/panels/PanelItemEdit.vue

@@ -1,19 +1,19 @@
 <template>
-  <div v-loading="loading" class="px-3 pt-2 h-100 d-flex flex-column">
+  <div v-loading="loading" class="px-3 pt-2 h-100">
     <itf-form
       ref="editForm"
-      class="d-flex flex-column justify-content-between flex-grow-1"
+      class="d-flex flex-column justify-content-between h-100"
       @keydown.native.shift.enter.stop.prevent="onSaveClick"
       @keydown.native.esc.stop.prevent="$emit('cancel')"
     >
       <slot></slot>
       <div class="py-3 justify-content-end d-flex align-items-center sticky-container">
         <div v-if="!hideFooter">
-          <itf-button v-tooltip.delay="'Hot key: Esc'" secondary squircle :loading="loading" :disabled="loading" @click="$emit('cancel')">
-            <span>{{ cancelBtnText }}</span>
+          <itf-button v-tooltip.delay="'Hot key: Esc'" secondary :loading="loading" :disabled="loading" @click="$emit('cancel')">
+            <span>{{ $t('components.modal.cancel') }}</span>
           </itf-button>
-          <itf-button v-tooltip.delay="'Hot key: Shift + Enter'" primary squircle :loading="loading" :disabled="loading" @click="onSaveClick">
-            <span>{{ saveBtnText }}</span>
+          <itf-button v-tooltip.delay="'Hot key: Shift + Enter'" primary :loading="loading" :disabled="loading" @click="onSaveClick">
+            <span>{{ $t('components.modal.save') }}</span>
           </itf-button>
         </div>
       </div>
@@ -51,8 +51,6 @@ import itfButton from '../button/Button.vue';
 export default class PanelItemEdit extends Vue {
   @Prop(Boolean) loading;
   @Prop(Boolean) hideFooter;
-  @Prop({ type: String, default: function() { return this.$t('components.modal.save') } }) saveBtnText;
-  @Prop({ type: String, default: function() { return this.$t('components.modal.cancel') } }) cancelBtnText;
 
   onSaveClick() {
     if (this.$refs.editForm && !this.$refs.editForm.doValidation()) {

package/src/components/panels/PanelLink.vue

@@ -5,7 +5,6 @@
 import { Vue, Component, Inject, Prop } from 'vue-property-decorator';
 import { IPanel } from './PanelList.vue';
 import {stackToHash} from "@itfin/components/src/components/panels/helpers";
-import {getRootPanelList} from "@itfin/components/src/components/panels";
 
 @Component({
   components: {
@@ -16,6 +15,7 @@ import {getRootPanelList} from "@itfin/components/src/components/panels";
   }
 })
 export default class PanelLink extends Vue {
+  @Inject({ default: null }) panelList;
   @Inject({ default: null }) currentPanel;
 
   @Prop(Boolean) global: boolean;
@@ -25,7 +25,6 @@ export default class PanelLink extends Vue {
   @Prop() list;
   @Prop({ type: String, default: 'active' }) activeClass: string;
   @Prop(Boolean) append: boolean;
-  @Prop(Boolean) replace: boolean;
 
   get on() {
     const handlers = {};
@@ -36,7 +35,7 @@ export default class PanelLink extends Vue {
   }
 
   get activeList() {
-    return this.list ?? getRootPanelList();
+    return this.list ?? this.panelList;
   }
 
   get isActive() {
@@ -52,9 +51,6 @@ export default class PanelLink extends Vue {
     if (!this.append) {
       stack = stack.splice(0, this.currentPanel?.index + 1);
     }
-    if (this.replace) {
-      stack = [];
-    }
     const hash = stackToHash([
       ...stack,
       {
@@ -66,18 +62,13 @@ export default class PanelLink extends Vue {
   }
 
   onClick(e) {
-    e.preventDefault();
-    e.stopPropagation();
-    const index = this.replace ? 0 : (this.append ? undefined : this.currentPanel?.index + 1);
-    this.$emit('open', {
-      panel: this.panel,
-      payload: this.payload || {},
-      index
-    });
+    console.info(this.activeList);
     if (!this.activeList) {
       return;
     }
-    this.activeList.openPanel(this.panel, this.payload || {}, index);
+    e.preventDefault();
+    e.stopPropagation();
+    this.activeList.openPanel(this.panel, this.payload || {}, this.append ? undefined : this.currentPanel?.index + 1);
   }
 }
 </script>

package/src/components/panels/PanelList.vue

@@ -218,6 +218,7 @@ export default class PanelList extends Vue {
   @Prop() panels: Record<string, Component>;
   @Prop({ default: () => {} }) searchPanel: (type: string) => boolean;
   @Prop({ type: String, default: 'path' }) routeType: string;
+  @Prop({ type: String, default: '' }) routePrefix: string;
 
   panelsStack:IPanel[] = [];
 
@@ -228,6 +229,7 @@ export default class PanelList extends Vue {
     if (this.firstPanel) {
       this.internalOpenPanel(this.firstPanel.type, this.firstPanel.payload);
     }
+    console.info('created');
     this.parsePanelHash(); // щоб панелі змінювались при перезавантаженні
     window.addEventListener('popstate', this.handlePopState); // щоб панелі змінювались при навігації
   }
@@ -466,9 +468,9 @@ export default class PanelList extends Vue {
   }
 
   setPanelHash() {
-    const hash = stackToHash(this.panelsStack, this.routeType === 'path').replace(/^#/, '');
+    const hash = stackToHash(this.panelsStack, this.routePrefix).replace(/^#/, '');
     if (this.routeType === 'path') {
-      this.$router.push({ path: `/${hash}` });
+      this.$router.push({ path: hash });
     } else {
       this.$router.push({ hash });
     }
@@ -478,7 +480,7 @@ export default class PanelList extends Vue {
   async parsePanelHash() {
     const hash = this.routeType === 'path' ? location.pathname : location.hash;
     if (hash) {
-      const panels = hashToStack(hash, this.routeType === 'path');
+      const panels = hashToStack(hash, this.routePrefix);
       const newStack = [];
       this.panelsStack = [];
       for (const panelIndex in panels) {
@@ -498,12 +500,14 @@ export default class PanelList extends Vue {
         }
       }
       this.panelsStack = newStack;
+      console.info('set', newStack);
       this.emitEvent('panels.changed', this.panelsStack);
       this.updateTitle();
     }
   }
 
   handlePopState() {
+    console.info('handlePopState')
     this.parsePanelHash();
     // виправляє проблему відкритої панелі при натисканні кнопки "назад" до першої панелі
     if (this.panelsStack.length === 2) {

package/src/components/panels/helpers.ts

@@ -10,19 +10,25 @@ export interface IPanel {
 const COLLAPSE_SYMBOL = '~'
 const PARAMS_SYMBOL = ';'
 
-export function stackToHash(stack: IPanel[]) {
-  const hash = stack.map(panel => {
+export function stackToHash(stack: IPanel[], prefix: string = '') {
+  let hash = stack.map(panel => {
     let json = JSON5.stringify(panel.payload || {});
     json = json.substring(1, json.length - 1); // Remove the outer {}
     return `${panel.type}${panel.isCollapsed ? COLLAPSE_SYMBOL : ''}${json ? PARAMS_SYMBOL : ''}${json}`;
   }).join(isPathType() ? '/' : '&');
+  if (prefix) {
+    hash = `${prefix}/${hash}`;
+  }
   return isPathType() ? `/${hash}` : `#${hash}`;
 }
 
 
-export function hashToStack(hash: string|undefined): IPanel[] {
+export function hashToStack(hash: string|undefined, prefix: string = ''): IPanel[] {
   let stack:IPanel[] = [];
-  const str = hash.replace(isPathType() ? /^\// : /^#/, '');
+  let str = hash.replace(isPathType() ? /^\// : /^#/, '');
+  if (str && prefix) {
+    str = str.replace(new RegExp(`^${prefix}\/?`), '');
+  }
   if (str) {
     stack = str.split(isPathType() ? '/' : '&').map(item => {
       if (!item.includes(PARAMS_SYMBOL)) {

package/src/components/table/Table2.vue

@@ -7,11 +7,9 @@
     'permanent-checkboxes': selectedIds.length
   }" :style="{ '--indicator-area-width': `${indicatorType === 'none' ? 1 : indicatorWidth}px`, '--shadow-area-width': `${shadowWidth}px` }">
     <itf-notice-popout :visible="showGroupOperations" class="rounded-3 bg-black text-white">
-      <div class="d-flex gap-2 ps-2 align-items-center small itf-table2_mass-operations">
-        <slot name="group-operations-count">
-          <div>{{$tc('components.table.selectedItems', selectedIds.length, { n: selectedIds.length })}}</div>
-          <div class="opacity-50">•</div>
-        </slot>
+      <div class="d-flex gap-2 ps-3 align-items-center small itf-table2_mass-operations">
+        <div>{{$tc('components.table.selectedItems', selectedIds.length, { n: selectedIds.length })}}</div>
+        <div class="opacity-50">•</div>
         <a href="" class="me-3 opacity-50 text-white text-decoration-none" @click.stop.prevent="selectedIds = []">{{$t('components.table.cancelSelected')}}</a>
         <div>
           <slot name="group-operations"></slot>
@@ -19,61 +17,64 @@
       </div>
     </itf-notice-popout>
     <div class="scrollable scrollable-x">
-      <itf-checkbox-group v-model="selectedIds">
-        <template v-for="(group, index) in groups">
-          <div class="table-view-body">
-            <itf-table-group
-              :key="index"
-              @update="$emit('update', { ...$event, group, groupIndex: index })"
-              @row-click="$emit('row-click', $event)"
-              :id-property="idProperty"
-              :columns="columns"
-              @update:columns="onColumnsUpdate"
-              :rows="group.rows"
-              :title="group.name"
-              :selected-ids.sync="selectedIds"
-              :add-new-rows="addNewRows"
-              :shadow-width="shadowWidth"
-              :column-sorting="columnSorting"
-              :column-resizing="columnResizing"
-              :show-grouping="showGrouping"
-              :show-summary="showSummary"
-              :show-add-column="showAddColumn"
-              :show-actions="showActions"
-              :show-header="!noHeader"
-              :schema="schema"
-              :editable="editable"
-              :no-column-menu="noColumnMenu"
-              :no-select-all="noSelectAll"
-              :currencies="currencies"
-              :currency="currency"
-              :subrows-property="subrowsProperty"
-              :divider-property="dividerProperty"
-              :indicator-type="indicatorType"
-              :expanded-all="expandedAll"
-              :indicatorWidth="indicatorWidth"
-              :striped="striped"
-              :expanded-ids="expandedIds"
-              :css-property="cssProperty"
-              :sticky-header="stickyHeader"
-              :editable-property="editableProperty"
-              :sorting.sync="_sorting"
-              :active="active"
-              @update:expanded-ids="$emit('update:expanded-ids', $event)"
-              @new="$emit('new', $event)"
-              @filter="$emit('filter', $event)"
-              @add-column="$emit('add-column', $event)"
-            >
-              <template v-for="(_, name) in $slots" #[name]="slotData">
-                <slot :name="name" v-bind="slotData || {}" />
-              </template>
-              <template v-for="(_, name) in $scopedSlots" #[name]="slotData">
-                <slot :name="name" v-bind="slotData || {}" />
-              </template>
-            </itf-table-group>
-          </div>
-        </template>
-      </itf-checkbox-group>
+    <itf-checkbox-group v-model="selectedIds">
+      <template v-for="(group, index) in groups">
+        <div class="table-view-body">
+          <itf-table-group
+            :key="index"
+            @update="$emit('update', { ...$event, group, groupIndex: index })"
+            @row-click="$emit('row-click', $event)"
+            :id-property="idProperty"
+            :columns="columns"
+            @update:columns="onColumnsUpdate"
+            :rows="group.rows"
+            :title="group.name"
+            :selected-ids.sync="selectedIds"
+            :add-new-rows="addNewRows"
+            :shadow-width="shadowWidth"
+            :column-sorting="columnSorting"
+            :column-resizing="columnResizing"
+            :show-grouping="showGrouping"
+            :show-summary="showSummary"
+            :show-add-column="showAddColumn"
+            :show-actions="showActions"
+            :show-header="!noHeader"
+            :schema="schema"
+            :editable="editable"
+            :no-column-menu="noColumnMenu"
+            :no-select-all="noSelectAll"
+            :currencies="currencies"
+            :currency="currency"
+            :subrows-property="subrowsProperty"
+            :async-subrows-property="asyncSubrowsProperty"
+            :divider-property="dividerProperty"
+            :indicator-type="indicatorType"
+            :expanded-all="expandedAll"
+            :indicatorWidth="indicatorWidth"
+            :striped="striped"
+            :expanded-ids="expandedIds"
+            :css-property="cssProperty"
+            :sticky-header="stickyHeader"
+            :editable-property="editableProperty"
+            :sorting.sync="_sorting"
+            :sort-as-string="sortAsString"
+            :active="active"
+            @loadChildren="$emit('loadChildren', $event)"
+            @update:expanded-ids="$emit('update:expanded-ids', $event)"
+            @new="$emit('new', $event)"
+            @filter="$emit('filter', $event)"
+            @add-column="$emit('add-column', $event)"
+          >
+            <template v-for="(_, name) in $slots" #[name]="slotData">
+              <slot :name="name" v-bind="slotData || {}" />
+            </template>
+            <template v-for="(_, name) in $scopedSlots" #[name]="slotData">
+              <slot :name="name" v-bind="slotData || {}" />
+            </template>
+          </itf-table-group>
+        </div>
+      </template>
+    </itf-checkbox-group>
     </div>
   </div>
 
@@ -104,11 +105,13 @@ export default @Component({
 })
 class itfTable2 extends Vue {
   // @Prop({ required: true, type: Array }) columns;
+  @Prop(Boolean) sortAsString;
   @Prop({ required: true, type: Array }) rows;
   @Prop({ type: String, default: null }) groupBy;
   @Prop({ type: String, default: null }) idProperty;
   @Prop({ type: String, default: null }) cssProperty;
   @Prop({ type: String, default: null }) subrowsProperty;
+  @Prop({ type: String, default: null }) asyncSubrowsProperty;
   @Prop({ type: String, default: null }) dividerProperty;
   @Prop({ type: String, default: null }) editableProperty;
   @Prop({ default: null }) active;
@@ -244,7 +247,8 @@ class itfTable2 extends Vue {
   @Watch('selectedIds')
   onSelectedIdsUpdate(selectedIds) {
     this.state.selectedIds = selectedIds;
-    this.saveTableState();
+    // метод saveTableState не зберігає selectedIds в localStorage, не впевнений що він тут треба
+    // this.saveTableState();
   }
 
   onColumnsUpdate(columns) {

package/src/components/table/TableBody.vue

@@ -7,6 +7,7 @@
       :columns="columns"
       :id-property="idProperty"
       :subrows-property="subrowsProperty"
+      :async-subrows-property="asyncSubrowsProperty"
       :divider-property="dividerProperty"
       :show-add-column="showAddColumn"
       :show-actions="showActions"
@@ -144,6 +145,7 @@ class itfTableBody extends Vue {
   @Prop() rows;
   @Prop() idProperty;
   @Prop() subrowsProperty;
+  @Prop() asyncSubrowsProperty;
   @Prop() dividerProperty;
   @Prop() active;
   @Prop(Boolean) showAddColumn;
@@ -164,6 +166,10 @@ class itfTableBody extends Vue {
     this.$emit('update:expanded-ids', this.expandedIds.includes(item[this.idProperty])
       ? this.expandedIds.filter((id) => id !== item[this.idProperty])
       : [...this.expandedIds, item[this.idProperty]]);
+
+    if (this.asyncSubrowsProperty && item[this.asyncSubrowsProperty] && item[this.asyncSubrowsProperty]) {
+      this.$emit('loadChildren', item);
+    }
   }
 }
 </script>

package/src/components/table/TableGroup.vue

@@ -17,7 +17,7 @@
               <div class="shadow-area"></div>
               <div class="header-wrapper" :class="{'header-additional-column': showAddColumn}" @click.prevent="toggleGroup">
                 <a class="header-content position-sticky d-flex align-items-center">
-                  <itf-button squircle icon small secondary class="collapse-arrow">
+                  <itf-button icon small secondary class="collapse-arrow">
                     <itf-icon :name="isShowTable ? 'chevron_down' : 'chevron_right'"/>
                   </itf-button>
                   <span class="d-flex align-items-center line-overflow group-header-value text-primary"
@@ -39,6 +39,7 @@
             :show-add-column="showAddColumn"
             :show-actions="showActions"
             :id-property="idProperty"
+            :sort-as-string="sortAsString"
             :rows="rows"
             :schema="schema"
             :editable="editable"
@@ -61,11 +62,13 @@
             @row-click="$emit('row-click', $event)"
             :id-property="idProperty"
             :subrows-property="subrowsProperty"
+            :async-subrows-property="asyncSubrowsProperty"
             :divider-property="dividerProperty"
             :rows="rows"
             :editable="editable"
             :currency="currency"
             :currencies="currencies"
+            :sort-as-string="sortAsString"
             :columns="visibleColumns"
             :no-select-all="noSelectAll"
             :selected-ids="selectedIds"
@@ -78,6 +81,7 @@
             :css-property="cssProperty"
             :editable-property="editableProperty"
             :active="active"
+            @loadChildren="$emit('loadChildren', $event)"
             @update:expanded-ids="$emit('update:expanded-ids', $event)"
           >
             <template v-for="(_, name) in $slots" #[name]="slotData">
@@ -91,11 +95,11 @@
 
         <!-- Лінія додати нову -->
         <div v-if="isShowTable && addNewRows"
-             class="table-row-template d-flex align-items-stretch">
+             class="table-row-template table-row-template__new-row d-flex align-items-stretch">
           <div class="shadow-area"></div>
           <a href="" @click.prevent="$emit('new', title)" data-test="table-add-new-item"
              class="d-flex align-items-center flex-grow-1 table-add-new-item text-decoration-none">
-            <span class="d-sticky d-flex align-items-center py-1">
+            <span class="d-sticky d-flex align-items-center py-1 px-2 small">
               <itf-icon name="plus"/>
               <span>{{ newLabel }}</span>
             </span>
@@ -264,7 +268,11 @@
     min-height: var(--table-small-row-size);
   }
 
+  .table-row-template.table-row-template__new-row {
+    min-height: 2rem;
+  }
   .table-add-new-item {
+    background-color: var(--itf-table-header-bg);
     border-right:var(--itf-table-border-base-width) solid var(--itf-table-border-base-color);
     border-left:var(--itf-table-border-base-width) solid var(--itf-table-border-base-color);
     border-bottom: var(--itf-table-border-base-width) solid var(--itf-table-border-base-color);
@@ -273,7 +281,7 @@
     border-bottom-right-radius: var(--itf-table-table-border-radius);
 
     & > span {
-      left: var(--shadow-area-width);
+      left: calc(var(--shadow-area-width) + 4px);
       position: sticky;
       padding-left: var(--shadow-area-width);
       //border-left: var(--itf-table-border-base-width) solid var(--itf-table-border-base-color);
@@ -359,6 +367,7 @@ class itfTableGroup extends Vue {
   @Prop() title;
   @Prop() idProperty;
   @Prop() subrowsProperty;
+  @Prop() asyncSubrowsProperty;
   @Prop() dividerProperty;
   @Prop() currency;
   @Prop() currencies;
@@ -378,6 +387,7 @@ class itfTableGroup extends Vue {
   @Prop(Boolean) expandedAll;
   @Prop(Boolean) striped;
   @Prop(Boolean) stickyHeader;
+  @Prop(Boolean) sortAsString;
   @Prop() indicatorWidth;
   @Prop() shadowWidth;
   @Prop() cssProperty;

package/src/components/table/TableHeader.vue

@@ -4,8 +4,8 @@
     <div ref="container" class="table-row-template">
       <div accept-group="items" class="table-view-body-space" v-dropzone="{ payload: 0 }"></div>
       <div class="shadow-area"></div>
-      <div class="table-view-header-value reserved sticky">
-        <itf-checkbox v-if="indicatorType === 'checkbox' && visibleHeader && !noSelectAll" ungrouped value="all" v-model="selectAll" ref="selectAll" />
+      <div v-if="indicatorType !== 'none'" class="table-view-header-value reserved sticky">
+        <itf-checkbox v-if="indicatorType !== 'none' && visibleHeader && !noSelectAll" ungrouped value="all" v-model="selectAll" ref="selectAll" />
       </div>
 
       <template v-for="(column, n) in visibleAttributes">
@@ -29,14 +29,16 @@
           <div v-if="visibleHeader" group="tablecolumns"
                class="table-header"
                @drop="reorderColumns"
-               v-draggable="{ handle: true, payload: { index: n, item: column }, mirror: {yAxis:false} }">
+               v-draggable="{ dragHandleClass: null, handle: true, payload: { index: n, item: column }, mirror: {yAxis:false} }">
             <itf-dropdown text append-to-body shadow ref="dropdown" class="w-100" :disabled="noColumnMenu">
               <template #button>
                 <div class="itf-table2__header-title d-flex w-100 align-items-center" :title="getTitle(column.title)">
                   <itf-icon class="itf-table2__header-icon" new v-if="column.icon" :name="column.icon"></itf-icon>
                   <div class="flex-grow-1 w-100 itf-table2__title-container d-flex align-items-center" :class="{'justify-content-end': column.align === 'end'}">
-                    <div class="itf-table2__title text-truncate">{{getTitle(column.title)}}</div>
-                    <div v-if="column.prefix" class="itf-table2__subtitle text-truncate" v-text="column.prefix" />
+                    <div class="itf-table2__title text-truncate">
+                      {{getTitle(column.title)}}
+                      <div v-if="column.prefix" class="itf-table2__subtitle text-truncate" :class="{'text-end': column.align === 'end'}" v-text="column.prefix" />
+                    </div>
                   </div>
                 </div>
                 <itf-icon v-if="sortColumnParams[column.property]" :name="sortColumnParams[column.property] === 'asc' ? 'sort-asc' : 'sort-desc'" new :size="20" class="ms-1" />
@@ -194,6 +196,7 @@ class itfTableHeader extends Vue {
   @Prop(Boolean) noColumnMenu;
   @Prop(Boolean) noSelectAll;
   @Prop(Boolean) editable;
+  @Prop(Boolean) sortAsString;
   @Prop() idProperty;
   @Prop() indicatorType;
 
@@ -411,8 +414,10 @@ class itfTableHeader extends Vue {
   }
 
   sortBy(column, order) {
-    let sort = order === 'desc' ? `-${column.property}` : column.property;
-    console.info(sort);
+    let sort = { [column.property]: order };
+    if (this.sortAsString) {
+      sort = order === 'desc' ? `-${column.property}` : column.property;
+    }
     this.$emit('update:sorting', sort);
   }
 }

package/src/components/table/TableRowToggle.vue

@@ -2,7 +2,10 @@
   <div>
     <div @click.prevent.stop="toggle" class="d-flex align-items-center flex-nowrap" :class="{'active-toggle': visible}">
       <div class="item-toggle text-muted">
-        <template v-if="visible && expanded">
+        <template v-if="visible && loading">
+          <div class="itf-spinner"></div>
+        </template>
+        <template v-else-if="visible && expanded">
           <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
                width="16" height="16" viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
 <path d="M184.7,413.1l2.1-1.8l156.5-136c5.3-4.6,8.6-11.5,8.6-19.2c0-7.7-3.4-14.6-8.6-19.2L187.1,101l-2.6-2.3
@@ -23,6 +26,10 @@
   </div>
 </template>
 <style lang="scss" scoped>
+.itf-spinner {
+  width: 1rem;
+  height: 1rem;
+}
 .active-toggle {
   cursor: pointer;
 }
@@ -43,6 +50,7 @@ export default @Component({
 class itfTableRowToggle extends Vue {
   @Prop(Boolean) expanded;
   @Prop(Boolean) visible;
+  @Prop(Boolean) loading;
 
   toggle() {
     this.$emit('toggle');