vxe-table 3.6.0-beta.0 → 3.6.0-beta.3

package/packages/edit/src/mixin.js

@@ -139,13 +139,13 @@ export default {
                 afIndex = row
               }
             } else {
-              afIndex = afterFullData.indexOf(row)
+              afIndex = this.findRowIndexOf(afterFullData, row)
             }
             if (afIndex === -1) {
               throw new Error(errLog('vxe.error.unableInsert'))
             }
             afterFullData.splice(afIndex, 0, ...newRecords)
-            tableFullData.splice(tableFullData.indexOf(row), 0, ...newRecords)
+            tableFullData.splice(this.findRowIndexOf(tableFullData, row), 0, ...newRecords)
             // 刷新单元格合并
             mergeList.forEach(mergeItem => {
               const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem
@@ -205,7 +205,7 @@ export default {
       // 如果绑定了多选属性，则更新状态
       if (!checkField) {
         rows.forEach(row => {
-          const sIndex = selection.indexOf(row)
+          const sIndex = this.findRowIndexOf(selection, row)
           if (sIndex > -1) {
             selection.splice(sIndex, 1)
           }
@@ -227,19 +227,19 @@ export default {
               const rItems = matchObj.items.splice(matchObj.index, 1)
               rest.push(rItems[0])
             }
-            const afIndex = afterFullData.indexOf(row)
+            const afIndex = this.findRowIndexOf(afterFullData, row)
             if (afIndex > -1) {
               afterFullData.splice(afIndex, 1)
             }
           })
         } else {
           rows.forEach(row => {
-            const tfIndex = tableFullData.indexOf(row)
+            const tfIndex = this.findRowIndexOf(tableFullData, row)
             if (tfIndex > -1) {
               const rItems = tableFullData.splice(tfIndex, 1)
               rest.push(rItems[0])
             }
-            const afIndex = afterFullData.indexOf(row)
+            const afIndex = this.findRowIndexOf(afterFullData, row)
             if (afIndex > -1) {
               // 刷新单元格合并
               mergeList.forEach(mergeItem => {
@@ -256,12 +256,12 @@ export default {
         }
       }
       // 如果当前行被激活编辑，则清除激活状态
-      if (actived.row && rows.indexOf(actived.row) > -1) {
+      if (actived.row && this.findRowIndexOf(rows, actived.row) > -1) {
         this.clearActived()
       }
       // 从新增中移除已删除的数据
       rows.forEach(row => {
-        const iIndex = insertList.indexOf(row)
+        const iIndex = this.findRowIndexOf(insertList, row)
         if (iIndex > -1) {
           insertList.splice(iIndex, 1)
         }
@@ -516,7 +516,7 @@ export default {
       const { $el, editStore, afterFullData } = this
       const { actived } = editStore
       const { args, row } = actived
-      if (args && afterFullData.indexOf(row) > -1 && $el.querySelectorAll('.vxe-body--column.col--actived').length) {
+      if (args && this.findRowIndexOf(afterFullData, row) > -1 && $el.querySelectorAll('.vxe-body--column.col--actived').length) {
         return Object.assign({}, args)
       }
       return null
@@ -618,7 +618,7 @@ export default {
       const { tableData, editOpts, visibleColumn } = this
       const column = XEUtils.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn
       if (row && column && editOpts.trigger !== 'manual') {
-        const rowIndex = tableData.indexOf(row)
+        const rowIndex = this.findRowIndexOf(tableData, row)
         if (rowIndex > -1) {
           const cell = this.getCell(row, column)
           const params = { row, rowIndex, column, columnIndex: visibleColumn.indexOf(column), cell }

package/packages/export/src/export-panel.js

@@ -47,19 +47,21 @@ export default {
     }
   },
   render (h) {
-    const { _e, checkedAll, isAll, isIndeterminate, showSheet, supportMerge, supportStyle, defaultOptions, storeData } = this
+    const { _e, checkedAll, isAll: isAllChecked, isIndeterminate: isAllIndeterminate, showSheet, supportMerge, supportStyle, defaultOptions, storeData } = this
     const { hasTree, hasMerge, isPrint, hasColgroup } = storeData
     const { isHeader } = defaultOptions
     const cols = []
     XEUtils.eachTree(storeData.columns, column => {
       const colTitle = UtilTools.formatText(column.getTitle(), 1)
       const isColGroup = column.children && column.children.length
+      const isChecked = column.checked
+      const indeterminate = column.halfChecked
       cols.push(
         h('li', {
           class: ['vxe-export--panel-column-option', `level--${column.level}`, {
             'is--group': isColGroup,
-            'is--checked': column.checked,
-            'is--indeterminate': column.halfChecked,
+            'is--checked': isChecked,
+            'is--indeterminate': indeterminate,
             'is--disabled': column.disabled
           }],
           attrs: {
@@ -74,13 +76,7 @@ export default {
           }
         }, [
           h('span', {
-            class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-          }),
-          h('span', {
-            class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-          }),
-          h('span', {
-            class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+            class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
           }),
           h('span', {
             class: 'vxe-checkbox--label'
@@ -213,8 +209,8 @@ export default {
                     }, [
                       h('li', {
                         class: ['vxe-export--panel-column-option', {
-                          'is--checked': isAll,
-                          'is--indeterminate': isIndeterminate
+                          'is--checked': isAllChecked,
+                          'is--indeterminate': isAllIndeterminate
                         }],
                         attrs: {
                           title: GlobalConfig.i18n('vxe.table.allTitle')
@@ -224,13 +220,7 @@ export default {
                         }
                       }, [
                         h('span', {
-                          class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-                        }),
-                        h('span', {
-                          class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-                        }),
-                        h('span', {
-                          class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+                          class: ['vxe-checkbox--icon', isAllIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
                         }),
                         h('span', {
                           class: 'vxe-checkbox--label'

package/packages/filter/src/panel.js

@@ -53,14 +53,16 @@ export default {
           }, compConf.renderFilter.call($xetable, h, filterRender, Object.assign({ $panel: this, context: this }, args)))
         ]
       }
+      const isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(item => item._checked)
+      const isAllIndeterminate = multiple && filterStore.isIndeterminate
       return [
         h('ul', {
           class: 'vxe-table--filter-header'
         }, [
           h('li', {
             class: ['vxe-table--filter-option', {
-              'is--checked': multiple ? filterStore.isAllSelected : !filterStore.options.some(item => item._checked),
-              'is--indeterminate': multiple && filterStore.isIndeterminate
+              'is--checked': isAllChecked,
+              'is--indeterminate': isAllIndeterminate
             }],
             attrs: {
               title: GlobalConfig.i18n(multiple ? 'vxe.table.allTitle' : 'vxe.table.allFilter')
@@ -72,13 +74,7 @@ export default {
             }
           }, (multiple ? [
             h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+              class: ['vxe-checkbox--icon', isAllIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
             })
           ] : []).concat([
             h('span', {
@@ -92,9 +88,11 @@ export default {
             maxHeight: `${maxHeight}px`
           } : {}
         }, filterStore.options.map(item => {
+          const isChecked = item._checked
+          const isIndeterminate = false
           return h('li', {
             class: ['vxe-table--filter-option', {
-              'is--checked': item._checked
+              'is--checked': isChecked
             }],
             attrs: {
               title: item.label
@@ -106,13 +104,7 @@ export default {
             }
           }, (multiple ? [
             h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+              class: ['vxe-checkbox--icon', isIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
             })
           ] : []).concat([
             h('span', {

package/packages/form/src/form.js

@@ -265,7 +265,7 @@ export default {
             if (compConf && compConf.itemResetMethod) {
               compConf.itemResetMethod({ data, field, property: field, item, $form: this })
             } else if (field) {
-              XEUtils.set(data, field, resetValue === null ? getResetValue(XEUtils.get(data, field), undefined) : resetValue)
+              XEUtils.set(data, field, resetValue === null ? getResetValue(XEUtils.get(data, field), undefined) : XEUtils.clone(resetValue, true))
             }
           }
         })

package/packages/input/src/input.js

@@ -299,7 +299,7 @@ function renderDatePanel (h, _vm) {
           }
         }, [
           h('i', {
-            class: 'vxe-icon--caret-left'
+            class: 'vxe-icon-caret-left'
           })
         ]),
         h('span', {
@@ -309,7 +309,7 @@ function renderDatePanel (h, _vm) {
           }
         }, [
           h('i', {
-            class: 'vxe-icon--dot'
+            class: 'vxe-icon-dot'
           })
         ]),
         h('span', {
@@ -321,7 +321,7 @@ function renderDatePanel (h, _vm) {
           }
         }, [
           h('i', {
-            class: 'vxe-icon--caret-right'
+            class: 'vxe-icon-caret-right'
           })
         ]),
         multiple && supportMultiples ? h('span', {

package/packages/radio/src/radio.js

@@ -34,10 +34,13 @@ export default {
     isStrict () {
       const { $xeradiogroup } = this
       return $xeradiogroup ? $xeradiogroup.strict : this.strict
+    },
+    isChecked () {
+      return this.$xeradiogroup ? this.$xeradiogroup.value === this.label : this.value === this.label
     }
   },
   render (h) {
-    const { $scopedSlots, $xeradiogroup, isDisabled, title, vSize, value, label, name, content } = this
+    const { $scopedSlots, $xeradiogroup, isDisabled, isChecked, title, vSize, name, content } = this
     const attrs = {}
     if (title) {
       attrs.title = title
@@ -45,6 +48,7 @@ export default {
     return h('label', {
       class: ['vxe-radio', {
         [`size--${vSize}`]: vSize,
+        'is--checked': isChecked,
         'is--disabled': isDisabled
       }],
       attrs
@@ -57,7 +61,7 @@ export default {
           disabled: isDisabled
         },
         domProps: {
-          checked: $xeradiogroup ? $xeradiogroup.value === label : value === label
+          checked: isChecked
         },
         on: {
           change: this.changeEvent,
@@ -65,7 +69,7 @@ export default {
         }
       }),
       h('span', {
-        class: 'vxe-radio--icon'
+        class: ['vxe-radio--icon', isChecked ? 'vxe-icon-radio-checked' : 'vxe-icon-radio-unchecked']
       }),
       h('span', {
         class: 'vxe-radio--label'

package/packages/table/src/cell.js

@@ -321,10 +321,7 @@ export const Cell = {
     if (isVisible) {
       radioVNs.push(
         h('span', {
-          class: 'vxe-radio--icon vxe-radio--checked-icon'
-        }),
-        h('span', {
-          class: 'vxe-radio--icon vxe-radio--unchecked-icon'
+          class: ['vxe-radio--icon', isChecked ? GlobalConfig.icon.TABLE_RADIO_CHECKED : GlobalConfig.icon.TABLE_RADIO_UNCHECKED]
         })
       )
     }
@@ -394,13 +391,7 @@ export const Cell = {
         on
       }, [
         h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+          class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllCheckboxSelected ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
         })
       ].concat(titleSlot || headerTitle ? [
         h('span', {
@@ -445,13 +436,7 @@ export const Cell = {
     if (isVisible) {
       checkVNs.push(
         h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+          class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
         })
       )
     }
@@ -512,13 +497,7 @@ export const Cell = {
     if (isVisible) {
       checkVNs.push(
         h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+          class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
         })
       )
     }

package/packages/toolbar/src/toolbar.js

@@ -150,12 +150,14 @@ function renderCustoms (h, _vm) {
     const isColGroup = column.children && column.children.length
     const isDisabled = checkMethod ? !checkMethod({ column }) : false
     if (isColGroup || colKey) {
+      const isChecked = column.visible
+      const isIndeterminate = column.halfVisible
       cols.push(
         h('li', {
           class: ['vxe-custom--option', `level--${column.level}`, {
             'is--group': isColGroup,
-            'is--checked': column.visible,
-            'is--indeterminate': column.halfVisible,
+            'is--checked': isChecked,
+            'is--indeterminate': isIndeterminate,
             'is--disabled': isDisabled
           }],
           attrs: {
@@ -170,13 +172,7 @@ function renderCustoms (h, _vm) {
           }
         }, [
           h('span', {
-            class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-          }),
-          h('span', {
-            class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-          }),
-          h('span', {
-            class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+            class: ['vxe-checkbox--icon', isIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
           }),
           h('span', {
             class: 'vxe-checkbox--label'
@@ -185,6 +181,8 @@ function renderCustoms (h, _vm) {
       )
     }
   })
+  const isAllChecked = customStore.isAll
+  const isAllIndeterminate = customStore.isIndeterminate
   return h('div', {
     class: ['vxe-custom--wrapper', {
       'is--active': customStore.visible
@@ -209,8 +207,8 @@ function renderCustoms (h, _vm) {
       }, [
         h('li', {
           class: ['vxe-custom--option', {
-            'is--checked': customStore.isAll,
-            'is--indeterminate': customStore.isIndeterminate
+            'is--checked': isAllChecked,
+            'is--indeterminate': isAllIndeterminate
           }],
           attrs: {
             title: GlobalConfig.i18n('vxe.table.allTitle')
@@ -220,13 +218,7 @@ function renderCustoms (h, _vm) {
           }
         }, [
           h('span', {
-            class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-          }),
-          h('span', {
-            class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-          }),
-          h('span', {
-            class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+            class: ['vxe-checkbox--icon', isAllIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
           }),
           h('span', {
             class: 'vxe-checkbox--label'
@@ -409,7 +401,7 @@ export default {
         zoom && $xegrid ? h('vxe-button', {
           props: {
             circle: true,
-            icon: $xegrid.isMaximized() ? (zoomOpts.iconOut || GlobalConfig.icon.TOOLBAR_TOOLS_ZOOM_OUT) : (zoomOpts.iconIn || GlobalConfig.icon.TOOLBAR_TOOLS_ZOOM_IN)
+            icon: $xegrid.isMaximized() ? (zoomOpts.iconOut || GlobalConfig.icon.TOOLBAR_TOOLS_MINIMIZE) : (zoomOpts.iconIn || GlobalConfig.icon.TOOLBAR_TOOLS_FULLSCREEN)
           },
           attrs: {
             title: GlobalConfig.i18n(`vxe.toolbar.zoom${$xegrid.isMaximized() ? 'Out' : 'In'}`)

package/packages/v-x-e-table/src/conf.js

@@ -1,4 +1,4 @@
-const iconPrefix = 'vxe-icon--'
+const iconPrefix = 'vxe-icon-'
 
 export default {
   size: null, // 全局尺寸
@@ -6,7 +6,7 @@ export default {
   version: 0, // 版本号，对于某些带数据缓存的功能有用到，上升版本号可以用于重置数据
   // resizeInterval: 500,
   emptyCell: '　',
-  loadingText: null, // 自定义loading提示内容，如果为null则不显示文本
+  // loadingText: null, // 自定义loading提示内容，如果为null则不显示文本
   table: {
     fit: true,
     showHeader: true,
@@ -125,73 +125,78 @@ export default {
   },
   icon: {
     // loading
-    // LOADING: iconPrefix + 'refresh roll vxe-loading--default-icon',
+    LOADING: iconPrefix + 'spinner roll vxe-loading--default-icon',
 
     // table
-    TABLE_SORT_ASC: iconPrefix + 'caret-top',
-    TABLE_SORT_DESC: iconPrefix + 'caret-bottom',
+    TABLE_SORT_ASC: iconPrefix + 'caret-up',
+    TABLE_SORT_DESC: iconPrefix + 'caret-down',
     TABLE_FILTER_NONE: iconPrefix + 'funnel',
     TABLE_FILTER_MATCH: iconPrefix + 'funnel',
-    TABLE_EDIT: iconPrefix + 'edit-outline',
-    TABLE_HELP: iconPrefix + 'question',
-    TABLE_TREE_LOADED: iconPrefix + 'refresh roll',
+    TABLE_EDIT: iconPrefix + 'edit',
+    TABLE_HELP: iconPrefix + 'question-circle-fill',
+    TABLE_TREE_LOADED: iconPrefix + 'spinner roll',
     TABLE_TREE_OPEN: iconPrefix + 'caret-right rotate90',
     TABLE_TREE_CLOSE: iconPrefix + 'caret-right',
-    TABLE_EXPAND_LOADED: iconPrefix + 'refresh roll',
+    TABLE_EXPAND_LOADED: iconPrefix + 'spinner roll',
     TABLE_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
     TABLE_EXPAND_CLOSE: iconPrefix + 'arrow-right',
+    TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked',
+    TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
+    TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate',
+    TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked',
+    TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
 
     // button
-    BUTTON_DROPDOWN: iconPrefix + 'arrow-bottom',
-    BUTTON_LOADING: iconPrefix + 'refresh roll',
+    BUTTON_DROPDOWN: iconPrefix + 'arrow-down',
+    BUTTON_LOADING: iconPrefix + 'spinner roll',
 
     // select
-    SELECT_LOADED: iconPrefix + 'refresh roll',
-    SELECT_OPEN: iconPrefix + 'caret-bottom rotate180',
-    SELECT_CLOSE: iconPrefix + 'caret-bottom',
+    SELECT_LOADED: iconPrefix + 'spinner roll',
+    SELECT_OPEN: iconPrefix + 'caret-down rotate180',
+    SELECT_CLOSE: iconPrefix + 'caret-down',
 
     // pager
-    PAGER_JUMP_PREV: iconPrefix + 'd-arrow-left',
-    PAGER_JUMP_NEXT: iconPrefix + 'd-arrow-right',
+    PAGER_JUMP_PREV: iconPrefix + 'arrow-double-left',
+    PAGER_JUMP_NEXT: iconPrefix + 'arrow-double-right',
     PAGER_PREV_PAGE: iconPrefix + 'arrow-left',
     PAGER_NEXT_PAGE: iconPrefix + 'arrow-right',
-    PAGER_JUMP_MORE: iconPrefix + 'more',
+    PAGER_JUMP_MORE: iconPrefix + 'ellipsis-h',
 
     // input
-    INPUT_CLEAR: iconPrefix + 'close',
-    INPUT_PWD: iconPrefix + 'eye-slash',
-    INPUT_SHOW_PWD: iconPrefix + 'eye',
-    INPUT_PREV_NUM: iconPrefix + 'caret-top',
-    INPUT_NEXT_NUM: iconPrefix + 'caret-bottom',
+    INPUT_CLEAR: iconPrefix + 'error-circle-fill',
+    INPUT_PWD: iconPrefix + 'eye-fill',
+    INPUT_SHOW_PWD: iconPrefix + 'eye-fill-close',
+    INPUT_PREV_NUM: iconPrefix + 'caret-up',
+    INPUT_NEXT_NUM: iconPrefix + 'caret-down',
     INPUT_DATE: iconPrefix + 'calendar',
     INPUT_SEARCH: iconPrefix + 'search',
 
     // modal
     MODAL_ZOOM_IN: iconPrefix + 'square',
-    MODAL_ZOOM_OUT: iconPrefix + 'zoomout',
+    MODAL_ZOOM_OUT: iconPrefix + 'maximize',
     MODAL_CLOSE: iconPrefix + 'close',
-    MODAL_INFO: iconPrefix + 'info',
-    MODAL_SUCCESS: iconPrefix + 'success',
-    MODAL_WARNING: iconPrefix + 'warning',
-    MODAL_ERROR: iconPrefix + 'error',
-    MODAL_QUESTION: iconPrefix + 'question',
-    MODAL_LOADING: iconPrefix + 'refresh roll',
+    MODAL_INFO: iconPrefix + 'info-circle-fill',
+    MODAL_SUCCESS: iconPrefix + 'success-circle-fill',
+    MODAL_WARNING: iconPrefix + 'warnion-circle-fill',
+    MODAL_ERROR: iconPrefix + 'error-circle-fill',
+    MODAL_QUESTION: iconPrefix + 'question-circle-fill',
+    MODAL_LOADING: iconPrefix + 'spinner roll',
 
     // toolbar
-    TOOLBAR_TOOLS_REFRESH: iconPrefix + 'refresh',
-    TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'refresh roll',
+    TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
+    TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'repeat roll',
     TOOLBAR_TOOLS_IMPORT: iconPrefix + 'upload',
     TOOLBAR_TOOLS_EXPORT: iconPrefix + 'download',
     TOOLBAR_TOOLS_PRINT: iconPrefix + 'print',
-    TOOLBAR_TOOLS_ZOOM_IN: iconPrefix + 'zoomin',
-    TOOLBAR_TOOLS_ZOOM_OUT: iconPrefix + 'zoomout',
-    TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'menu',
+    TOOLBAR_TOOLS_FULLSCREEN: iconPrefix + 'fullscreen',
+    TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
+    TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
 
     // form
-    FORM_PREFIX: iconPrefix + 'question',
-    FORM_SUFFIX: iconPrefix + 'question',
-    FORM_FOLDING: iconPrefix + 'arrow-top rotate180',
-    FORM_UNFOLDING: iconPrefix + 'arrow-top'
+    FORM_PREFIX: iconPrefix + 'question-circle-fill',
+    FORM_SUFFIX: iconPrefix + 'question-circle-fill',
+    FORM_FOLDING: iconPrefix + 'arrow-up rotate180',
+    FORM_UNFOLDING: iconPrefix + 'arrow-up'
   },
   grid: {
     // size: null,