@itfin/components 1.4.28 → 1.4.33

package/src/components/table/TableRows.vue

@@ -25,6 +25,22 @@
               <span v-if="indicatorType === 'order'">{{ (n + 1) }}</span>
               <span v-else-if="indicatorType === 'property'">{{ item[idProperty] }}</span>
               <span v-else-if="indicatorType === 'checkbox'"><itf-checkbox :value="item[idProperty]" /></span>
+              <a href="" @click.prevent.stop="$emit('toggle', item)" v-else-if="indicatorType === 'toggle'">
+                <template v-if="subrowsProperty && item[subrowsProperty] && item[subrowsProperty].length">
+                  <template v-if="item[subrowsProperty] && item[subrowsProperty].length && !isExpanded(item)">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus-square" viewBox="0 0 16 16">
+                      <path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z"/>
+                      <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4"/>
+                    </svg>
+                  </template>
+                  <template v-else>
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-dash-square" viewBox="0 0 16 16">
+                      <path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z"/>
+                      <path d="M4 8a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7A.5.5 0 0 1 4 8"/>
+                    </svg>
+                  </template>
+                </template>
+              </a>
             </div>
           </div>
           <div accept-group="items" class="table-item-inner" @click="$emit('row-click', item)">
@@ -33,37 +49,37 @@
                 v-if="column.visible !== false"
                 :data-column="k"
                 :style="`width: ${column.width}px; max-width: ${column.width}px; left: ${column.left}px;`"
-                :class="{'justify-content-end': column.align === 'end', 'sticky': column.pinned, 'last-sticky-column': k === lastPinnedIndex, 'editable': column.editable && editable}"
+                :class="{'sticky': column.pinned, 'last-sticky-column': k === lastPinnedIndex, 'editable': column.editable && editable}"
                 class="table-view-item-value d-flex h-100">
-                <div class="table-view-item-value-content" :class="{'px-2': !(column.editable && editable)}">
-                  <slot
-                    :name="`column.${column.property}`"
-                    :toggle="() => $emit('toggle', item)"
-                    :hasSubitems="!!(subrowsProperty && item[subrowsProperty] && item[subrowsProperty].length)"
-                    :isExpanded="!!(item[subrowsProperty] && item[subrowsProperty].length && !isExpanded(item))"
-                    :level="level" :editable="column.editable && editable" :item="item" :column="column" :updateFields="(val) => updateValues(item, val, n, column)" :update="(val) => updateValue(item, val, n, column)" :value="getValue(item, column)">
-                    <template v-if="column.editable && editable && (!editableProperty || item[editableProperty])">
-                      <slot :name="`edit.${column.type}`" :level="level" :toggle="() => $emit('toggle', item)" :update="(val) => updateValue(item, val, n, column)" :value="getValue(item, column)" :item="item" :column="column">
-                        <itf-text-field class="w-100 h-100" v-if="column.type === 'text'" :value="getValue(item, column)" @input="updateValue(item, $event, n, column)" />
-                        <itf-text-field class="w-100 h-100" v-if="column.type === 'number'" type="number" :value="getValue(item, column)" @input="updateValue(item, $event, n, column)" />
-                        <itf-hours-field
-                          class="w-100 h-100"
-                          placeholder="00h 00m"
-                          v-else-if="column.type === 'time'"
-                          :hours="getValue(item, column)"
-                          @update:hours="updateValue(item, $event, n, column)"
-                        />
-                        <itf-textarea class="w-100 h-100" :rows="1" autogrow v-else-if="column.type === 'textarea'" :value="getValue(item, column)" @input="updateValue(item, $event, n, column)" />
-                        <itf-money-field class="w-100 h-100" currency-disabled :currency="currency" :currencies="currencies" v-else-if="column.type === 'money'" :value="getValue(item, column)" @input="updateValue(item, $event, n, column)" />
-                        <itf-select class="w-100 h-100" v-else-if="column.type === 'select'" :reduce="(item) => item.value" :value="getValue(item, column)" @input="updateValue(item, $event, n, column)" :options="column.options"></itf-select>
-                      </slot>
-                    </template>
-                    <div v-else class="h-100 align-items-center d-flex w-100">
-                      <slot :name="`format.${column.type}`" :toggle="() => $emit('toggle', item)" :level="level" :value="getValue(item, column)" :update="(value) => updateValue(item, value, n, column)" :item="item" :column="column">
-                        {{getValue(item, column)}}
-                      </slot>
-                    </div>
-                  </slot>
+                <div class="table-view-item-value-content align-items-center" :class="{'justify-content-end': column.align === 'end', 'px-2': !(column.editable && editable)}">
+                <slot
+                  :name="`column.${column.property}`"
+                  :toggle="() => $emit('toggle', item)"
+                  :hasSubitems="hasSubitems(item)"
+                  :isExpanded="!!(hasSubitems(item) && !isExpanded(item))"
+                  :level="level" :editable="column.editable && editable" :item="item" :column="column" :update="(val) => updateValue(item, val, n, column)" :value="getValue(item, column)">
+                  <template v-if="column.editable && editable && (!editableProperty || item[editableProperty])">
+                    <slot :name="`edit.${column.type}`" :level="level" :toggle="() => $emit('toggle', item)" :update="(val) => updateValue(item, val, n, column)" :value="getValue(item, column)" :item="item" :column="column">
+                      <itf-text-field class="w-100 h-100" v-if="column.type === 'text'" :value="getValue(item, column)" @input="updateValue(item, $event, n, column)" />
+                      <itf-text-field class="w-100 h-100" v-if="column.type === 'number'" type="number" :value="getValue(item, column)" @input="updateValue(item, $event, n, column)" />
+                      <itf-hours-field
+                        class="w-100 h-100"
+                        placeholder="00h 00m"
+                        v-else-if="column.type === 'time'"
+                        :hours="getValue(item, column)"
+                        @update:hours="updateValue(item, $event, n, column)"
+                      />
+                      <itf-textarea class="w-100 h-100" :rows="1" autogrow v-else-if="column.type === 'textarea'" :value="getValue(item, column)" @input="updateValue(item, $event, n, column)" />
+                      <itf-money-field class="w-100 h-100" currency-disabled :currency="currency" :currencies="currencies" v-else-if="column.type === 'money'" :value="getValue(item, column)" @input="updateValue(item, $event, n, column)" />
+                      <itf-select class="w-100 h-100" v-else-if="column.type === 'select'" :reduce="(item) => item.value" :value="getValue(item, column)" @input="updateValue(item, $event, n, column)" :options="column.options"></itf-select>
+                    </slot>
+                  </template>
+                  <span v-else class="text-truncate">
+                    <slot :name="`format.${column.type}`" :toggle="() => $emit('toggle', item)" :level="level" :value="getValue(item, column)" :update="(value) => updateValue(item, value, n, column)" :item="item" :column="column">
+                      {{getValue(item, column)}}
+                    </slot>
+                  </span>
+                </slot>
                 </div>
               </div>
             </template>
@@ -86,6 +102,7 @@
           :columns="columns"
           :id-property="idProperty"
           :subrows-property="subrowsProperty"
+          :async-subrows-property="asyncSubrowsProperty"
           :show-add-column="showAddColumn"
           :show-actions="showActions"
           :no-select-all="noSelectAll"
@@ -145,6 +162,7 @@ class itfTableRows extends Vue {
   @Prop() rows;
   @Prop() idProperty;
   @Prop() subrowsProperty;
+  @Prop() asyncSubrowsProperty;
   @Prop() dividerProperty;
   @Prop() active;
   @Prop(Boolean) showAddColumn;
@@ -174,6 +192,12 @@ class itfTableRows extends Vue {
     return this.columns.findIndex((column) => column.lastPinned);
   }
 
+  hasSubitems(item) {
+    const hasFactItems = this.subrowsProperty && item[this.subrowsProperty] && item[this.subrowsProperty].length;
+    const hasPlanItems = this.asyncSubrowsProperty && item[this.asyncSubrowsProperty] && item[this.asyncSubrowsProperty];
+    return !!(hasFactItems || hasPlanItems);
+  }
+
   updateValue(item, value, index, column) {
     const newItem = { ...item };
     if (newItem[column.property] !== value) {
@@ -188,20 +212,8 @@ class itfTableRows extends Vue {
     }
   }
 
-  updateValues(item, values, index, column) {
-    const newItem = { ...item };
-    Object.assign(newItem, values);
-    this.$emit('update', {
-      index,
-      item,
-      inputValue: values,
-      value: newItem,
-      column
-    });
-  }
-
   isActive(id) {
-    if (!this.idProperty) {
+    if (!this.idProperty || !this.active) {
       return false;
     }
     if (Array.isArray(this.active)) {

package/src/components/table/table2.scss

@@ -7,10 +7,10 @@
   --itf-table-alt-bg: #F9FAFB;
   --itf-table-alt-selected-bg: #eff1f3;
   --itf-table-header-bg: #f5f7f8;
-  --itf-table-header-color: #7A818EA5;
+  --itf-table-header-color: #575b63;
   --itf-table-mirror-bg: #F2F4F7;
   --itf-table-border-color: transparent; //var(--itf-table-header-bg);
-  --itf-table-header-border-color: #7A818E33;
+  --itf-table-header-border-color: #8E97A533;
   --itf-table-border-base-color: var(--itf-table-header-bg); // кольори границь таблиці без внутрішніх рядків
   --itf-table-border-base-width: 2px;
   --itf-table-hover-header-bg: #dfe5ef;
@@ -23,6 +23,8 @@
   --itf-table-summary-text: var(--bs-tertiary-color);
   --itf-table-table-border-radius: 1rem;
   --itf-table-header-height: 2.25rem;
+  --itf-table-divider-bg: #F7F8FA;
+  --itf-table-divider-border: rgba(238, 238, 238, 1);
 
   --group-title-height: 40px;
   --table-row-height: none;
@@ -43,6 +45,9 @@ body[data-theme="dark"] {
   --itf-table-selected-bg: #011534;
   --itf-table-active-bg: #022e72;
   --itf-table-summary-text: #82909d80;
+  --itf-table-border-base-color: var(--itf-table-header-bg);
+  --itf-table-divider-bg: #0f0f0f;
+  --itf-table-divider-border: rgb(100, 100, 100, .1);
 }
 .itf-table2 {
   font-size: var(--itf-table-content-font-size, var(--itf-table-font-size));
@@ -60,7 +65,7 @@ body[data-theme="dark"] {
     height: 100%;
   }
   .scroller {
-    margin-bottom: 12px;
+    //margin-bottom: .5rem;
   }
   .scrollable-x {
     overflow-x: scroll;
@@ -97,34 +102,18 @@ body[data-theme="dark"] {
     position: sticky;
     top: 0;
     bottom: 0;
-    right: -.5rem;
+    right: -5px;
     z-index: 8;
+    padding-right: 5px;
+    padding-left: 5px;
     display: flex;
     align-items: center;
-
-    @media (max-width: 768px) {
-      position: relative;
-      opacity: 1;
-    }
   }
   .on-hover {
     opacity: 0;
-    width: 0;
-    padding: 4px .5rem;
-    overflow: hidden;
     pointer-events: none;
-    position: absolute;
-    right: 0;
-    background: linear-gradient(90deg, transparent 0, var(--itf-table2-row-bg) 10px);
-
-    @media (max-width: 768px) {
-      width: max-content;
-      opacity: 1;
-      position: relative;
-    }
   }
   .table-row-template:hover .on-hover {
-    width: max-content;
     opacity: 1;
     pointer-events: all;
   }
@@ -451,11 +440,11 @@ body[data-theme="dark"] {
   }
 
   &__row-divider {
-    background-color: #F7F8FA;
+    background-color: var(--itf-table-divider-bg);
     height: 5px;
     padding: 0;
-    border-top: 1px solid rgba(238, 238, 238, 1);
-    border-bottom: 1px solid rgba(238, 238, 238, 1);
+    border-top: 1px solid var(--itf-table-divider-border);
+    border-bottom: 1px solid var(--itf-table-divider-border);
   }
   //&:hover, &.permanent-editable-border {
   //  .table-view-item-value.editable {
@@ -468,6 +457,7 @@ body[data-theme="dark"] {
     position: relative;
     z-index: 2;
     width: 100%;
+    display: flex;
     height: 100%;
     background: var(--itf-table2-row-bg)
   }

package/src/components/view/View.vue

@@ -10,7 +10,8 @@
       :endpoint="filtersEndpoint"
       :panel="panel"
       v-model="filter"
-      @input="onFilterSet"
+      @loaded="onFilterSet($event, true)"
+      @change="onFilterSet($event, false)"
       @set-table-schema="setTableSchema"
     >
       <template #after-filter-btn>
@@ -213,7 +214,7 @@ class itfView extends Vue {
 
   getDownloadLinks() {
     const state = this.$refs.table ? this.$refs.table.getTableState() : null;
-    const filter = this.filter;
+    const filter = { ...this.filter };
     const sorting = this.sorting;
     const filterableColumnsNames = (state?.columns ?? []).filter(column => column.visible).map(column => column.property);
 
@@ -297,7 +298,7 @@ class itfView extends Vue {
     this.$emit('load', this.filter);
     this.loadingData = true;
     await this.$try(async () => {
-      let filter = this.filter;
+      let filter = { ...this.filter };
       if (this.oldFormat) {
         filter = Object.keys(filter).reduce((acc, key) => {
           acc[`filter[${key}]`] = filter[key];
@@ -370,7 +371,9 @@ class itfView extends Vue {
       sources.forEach(source => {
         if (source && typeof source === 'object') {
           Object.entries(source).forEach(([key, value]) => {
-            if (value !== undefined) {
+            if (key === 'page' && value === null) {
+              delete target[key];
+            } else if (value !== undefined) {
               target[key] = value;
             }
           });
@@ -380,10 +383,14 @@ class itfView extends Vue {
     }
   }
 
-  onFilterSet(filter) {
-    this.page = 1;
-    this.selectedIds = [];
-    this.setPanelPayload({ ...filter, page: 1 });
+  onFilterSet(filter, keepPage = false) {
+    if (keepPage) {
+      // при завантаженні сторінки не потрібно скидувати сторінку
+      this.setPanelPayload({ ...filter });
+    } else {
+      this.page = 1;
+      this.setPanelPayload({ ...filter, page: null });
+    }
     this.loadData();
   }