@fastkit/vui 0.7.19 → 0.7.23

package/dist/tool/index.js

@@ -35,20 +35,21 @@ import './setup.scss';
 import type { App } from 'vue';
 import type { Router } from 'vue-router';
 import { VPageLink } from '@fastkit/vue-page';
-import { installVuiPlugin as _installVuiPlugin, VuiPluginOptions } from '@fastkit/vui';
+import { installVuiPlugin as _installVuiPlugin, RawVuiPluginOptions, mergeVuiPluginOptions } from '@fastkit/vui';
 import { colorScheme } from '<%~ it.colorScheme %>';
 import '<%~ it.mediaMatch %>';
 import './icon-font';
 import '${STYLE_AFTER_EFFECTS_PATH}';
 
-export function installVui(settings: { app: App, router: Router }) {
-  _installVuiPlugin(settings.app, {
+export function installVui(settings: { app: App, router: Router }, options?: RawVuiPluginOptions) {
+  const merged = mergeVuiPluginOptions({
     RouterLink: VPageLink,
     colorScheme,
     uiSettings: <%~ it.uiSettings %>,
     icons: <%~ it.icons %>,
     ...settings,
-  });
+  }, options);
+  _installVuiPlugin(settings.app, merged);
 }
 
 export default installVui;
@@ -123,6 +124,7 @@ function viteVuiPlugin(options = {}) {
         editorUndo: 'mdi-undo-variant',
         editorRedo: 'mdi-redo-variant',
         hinttip: 'mdi-help-circle-outline',
+        clear: 'mdi-close',
         // navigationExpand: (gen, active) => {
         //   return gen({
         //     name: 'mdi-menu-down' as any,

package/dist/tool/vite-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vui/src/tool/vite-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAK9B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AA+F/C,MAAM,WAAW,oBACf,SAAQ,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC;IAChE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC9B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9C,WAAW,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACzE,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAGD,MAAM,WAAW,2BACf,SAAQ,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,OAAO,CAAC;IACvD,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,2BAA2B,CAAC;IACtC,OAAO,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,aAAa,CAC3B,OAAO,GAAE,oBAAyB,GACjC,mBAAmB,CAwJrB"}
+{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../../../../../../../packages/vui/src/tool/vite-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAK9B,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAgG/C,MAAM,WAAW,oBACf,SAAQ,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,OAAO,CAAC,CAAC;IAChE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC9B,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9C,WAAW,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IACzE,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAGD,MAAM,WAAW,2BACf,SAAQ,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,OAAO,CAAC;IACvD,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,2BAA2B,CAAC;IACtC,OAAO,EAAE,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,EAAE,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,aAAa,CAC3B,OAAO,GAAE,oBAAyB,GACjC,mBAAmB,CAyJrB"}

package/dist/vui.cjs.js

@@ -2149,7 +2149,16 @@ const VSelect = vue.defineComponent({
           }, [vue.createVNode("div", {
             "class": "v-select__selections__inner"
           }, [this.renderSelections(selectedItems)])])],
-          endAdornment: () => vue.createVNode(VIcon, {
+          endAdornment: () => this.clearable && this.nodeControl.value != null && vue.createVNode(VButton, {
+            "key": "clear",
+            "icon": this.$vui.icon('clear'),
+            "rounded": true,
+            "onClick": ev => {
+              ev.stopPropagation();
+              this.nodeControl.clear();
+            }
+          }, null) || vue.createVNode(VIcon, {
+            "key": "icon",
             "name": this.iconName,
             "rotate": this.menuOpened ? 180 : 0
           }, null)
@@ -3423,6 +3432,11 @@ const VDataTable = vue.defineComponent({
       default: () => DATA_TABLE_DEFAULTS.orderQuery
     },
 
+    /**
+     * 検索クエリ名
+     */
+    searchQuery: [String, Array],
+
     /**
      * リミット件数クエリ名
      */
@@ -3468,7 +3482,11 @@ const VDataTable = vue.defineComponent({
     },
     selectable: Boolean,
     fixedHeader: Boolean,
-    maxHeight: [Number, String]
+    maxHeight: [Number, String],
+    // eslint-disable-next-line vue/require-prop-types
+    noDataMessage: {},
+    // eslint-disable-next-line vue/require-prop-types
+    noResultsMessage: {}
   },
   emits: {
     input: selecteds => true
@@ -3497,6 +3515,46 @@ const VDataTable = vue.defineComponent({
       ret.push(...headers.filter(h => !h.hidden));
       return ret;
     });
+    const searchQueryValues = vue.computed(() => {
+      let {
+        searchQuery
+      } = props;
+
+      if (!searchQuery) {
+        return [];
+      }
+
+      if (!Array.isArray(searchQuery)) {
+        searchQuery = [searchQuery];
+      }
+
+      const values = [];
+      searchQuery.forEach(query => {
+        const value = vui.location.getQuery(query);
+
+        if (value == null || value === '') {
+          return;
+        }
+
+        if (typeof value === 'object' && !Object.keys(value).length) {
+          return;
+        }
+
+        values.push(value);
+      });
+      return values;
+    });
+    const emptyMessage = vue.computed(() => {
+      let message;
+
+      if (searchQueryValues.value.length) {
+        message = props.noResultsMessage || vui.setting('noResultsMessage') || 'No search results found.'; // 検索結果が見つかりませんでした。
+      } else {
+        message = props.noDataMessage || vui.setting('noDataMessage') || 'No data was available.'; // データはありませんでした。
+      }
+
+      return typeof message === 'function' ? message() : message;
+    });
     const classesRef = vue.computed(() => [{
       'v-data-table--fixed-header': props.fixedHeader
     }]);
@@ -3963,7 +4021,7 @@ const VDataTable = vue.defineComponent({
         "class": "v-data-table__body container-pull"
       }, [isEmpty ? vue.createVNode("div", {
         "class": "v-data-table__empty--message"
-      }, null) : vue.createVNode(VPaper, {
+      }, [emptyMessage.value]) : vue.createVNode(VPaper, {
         "class": "v-data-table__body__inner",
         "style": bodyInnerStylesRef.value
       }, {
@@ -4127,6 +4185,51 @@ const VToolbarTitle = vue.defineComponent({
 
 const DEFAULT_AUTO_SCROLL_TO_ELEMENT_OFFSET_TOP = -20;
 const DEFAULT_TEXTAREA_ROWS = 3;
+function mergeVuiServiceUISettings(base, overrides) {
+  if (!overrides) {
+    return base;
+  }
+
+  const merged = { ...base
+  };
+  Object.entries(overrides).forEach(([key, value]) => {
+    if (value) {
+      merged[key] = value;
+    }
+  });
+  return merged;
+}
+function mergeVuiServiceIconSettings(base, overrides) {
+  if (!overrides) {
+    return base;
+  }
+
+  const merged = { ...base
+  };
+  Object.entries(overrides).forEach(([key, value]) => {
+    if (value) {
+      merged[key] = value;
+    }
+  });
+  return merged;
+}
+function mergeVuiServiceOptions(base, overrides) {
+  if (!overrides) {
+    return base;
+  }
+
+  const merged = { ...base,
+    uiSettings: mergeVuiServiceUISettings(base.uiSettings, overrides.uiSettings),
+    icons: mergeVuiServiceIconSettings(base.icons, overrides.icons)
+  };
+  const excludes = ['uiSettings', 'icons'];
+  Object.entries(overrides).forEach(([key, value]) => {
+    if (value && !excludes.includes(key)) {
+      merged[key] = value;
+    }
+  });
+  return merged;
+}
 class VuiService {
   get scroller() {
     return vueScroller.getDocumentScroller();
@@ -4263,6 +4366,18 @@ class VuiService {
 
 }
 
+function mergeVuiPluginOptions(base, override) {
+  if (!override) return base;
+  const merged = mergeVuiServiceOptions(base, override);
+
+  if (override.stack) {
+    merged.stack = { ...merged.stack,
+      ...override.stack
+    };
+  }
+
+  return merged;
+}
 class VuiPlugin {
   static installedApps = new Set();
 
@@ -4406,6 +4521,10 @@ exports.defineFormSelectorComponent = defineFormSelectorComponent;
 exports.iconProps = iconProps;
 exports.installVuiPlugin = installVuiPlugin;
 exports.listTileEmits = listTileEmits;
+exports.mergeVuiPluginOptions = mergeVuiPluginOptions;
+exports.mergeVuiServiceIconSettings = mergeVuiServiceIconSettings;
+exports.mergeVuiServiceOptions = mergeVuiServiceOptions;
+exports.mergeVuiServiceUISettings = mergeVuiServiceUISettings;
 exports.paginationProps = paginationProps;
 exports.rawIconProp = rawIconProp;
 exports.renderNavigationItemInput = renderNavigationItemInput;

package/dist/vui.cjs.prod.js

@@ -2149,7 +2149,16 @@ const VSelect = vue.defineComponent({
           }, [vue.createVNode("div", {
             "class": "v-select__selections__inner"
           }, [this.renderSelections(selectedItems)])])],
-          endAdornment: () => vue.createVNode(VIcon, {
+          endAdornment: () => this.clearable && this.nodeControl.value != null && vue.createVNode(VButton, {
+            "key": "clear",
+            "icon": this.$vui.icon('clear'),
+            "rounded": true,
+            "onClick": ev => {
+              ev.stopPropagation();
+              this.nodeControl.clear();
+            }
+          }, null) || vue.createVNode(VIcon, {
+            "key": "icon",
             "name": this.iconName,
             "rotate": this.menuOpened ? 180 : 0
           }, null)
@@ -3423,6 +3432,11 @@ const VDataTable = vue.defineComponent({
       default: () => DATA_TABLE_DEFAULTS.orderQuery
     },
 
+    /**
+     * 検索クエリ名
+     */
+    searchQuery: [String, Array],
+
     /**
      * リミット件数クエリ名
      */
@@ -3468,7 +3482,11 @@ const VDataTable = vue.defineComponent({
     },
     selectable: Boolean,
     fixedHeader: Boolean,
-    maxHeight: [Number, String]
+    maxHeight: [Number, String],
+    // eslint-disable-next-line vue/require-prop-types
+    noDataMessage: {},
+    // eslint-disable-next-line vue/require-prop-types
+    noResultsMessage: {}
   },
   emits: {
     input: selecteds => true
@@ -3497,6 +3515,46 @@ const VDataTable = vue.defineComponent({
       ret.push(...headers.filter(h => !h.hidden));
       return ret;
     });
+    const searchQueryValues = vue.computed(() => {
+      let {
+        searchQuery
+      } = props;
+
+      if (!searchQuery) {
+        return [];
+      }
+
+      if (!Array.isArray(searchQuery)) {
+        searchQuery = [searchQuery];
+      }
+
+      const values = [];
+      searchQuery.forEach(query => {
+        const value = vui.location.getQuery(query);
+
+        if (value == null || value === '') {
+          return;
+        }
+
+        if (typeof value === 'object' && !Object.keys(value).length) {
+          return;
+        }
+
+        values.push(value);
+      });
+      return values;
+    });
+    const emptyMessage = vue.computed(() => {
+      let message;
+
+      if (searchQueryValues.value.length) {
+        message = props.noResultsMessage || vui.setting('noResultsMessage') || 'No search results found.'; // 検索結果が見つかりませんでした。
+      } else {
+        message = props.noDataMessage || vui.setting('noDataMessage') || 'No data was available.'; // データはありませんでした。
+      }
+
+      return typeof message === 'function' ? message() : message;
+    });
     const classesRef = vue.computed(() => [{
       'v-data-table--fixed-header': props.fixedHeader
     }]);
@@ -3963,7 +4021,7 @@ const VDataTable = vue.defineComponent({
         "class": "v-data-table__body container-pull"
       }, [isEmpty ? vue.createVNode("div", {
         "class": "v-data-table__empty--message"
-      }, null) : vue.createVNode(VPaper, {
+      }, [emptyMessage.value]) : vue.createVNode(VPaper, {
         "class": "v-data-table__body__inner",
         "style": bodyInnerStylesRef.value
       }, {
@@ -4127,6 +4185,51 @@ const VToolbarTitle = vue.defineComponent({
 
 const DEFAULT_AUTO_SCROLL_TO_ELEMENT_OFFSET_TOP = -20;
 const DEFAULT_TEXTAREA_ROWS = 3;
+function mergeVuiServiceUISettings(base, overrides) {
+  if (!overrides) {
+    return base;
+  }
+
+  const merged = { ...base
+  };
+  Object.entries(overrides).forEach(([key, value]) => {
+    if (value) {
+      merged[key] = value;
+    }
+  });
+  return merged;
+}
+function mergeVuiServiceIconSettings(base, overrides) {
+  if (!overrides) {
+    return base;
+  }
+
+  const merged = { ...base
+  };
+  Object.entries(overrides).forEach(([key, value]) => {
+    if (value) {
+      merged[key] = value;
+    }
+  });
+  return merged;
+}
+function mergeVuiServiceOptions(base, overrides) {
+  if (!overrides) {
+    return base;
+  }
+
+  const merged = { ...base,
+    uiSettings: mergeVuiServiceUISettings(base.uiSettings, overrides.uiSettings),
+    icons: mergeVuiServiceIconSettings(base.icons, overrides.icons)
+  };
+  const excludes = ['uiSettings', 'icons'];
+  Object.entries(overrides).forEach(([key, value]) => {
+    if (value && !excludes.includes(key)) {
+      merged[key] = value;
+    }
+  });
+  return merged;
+}
 class VuiService {
   get scroller() {
     return vueScroller.getDocumentScroller();
@@ -4263,6 +4366,18 @@ class VuiService {
 
 }
 
+function mergeVuiPluginOptions(base, override) {
+  if (!override) return base;
+  const merged = mergeVuiServiceOptions(base, override);
+
+  if (override.stack) {
+    merged.stack = { ...merged.stack,
+      ...override.stack
+    };
+  }
+
+  return merged;
+}
 class VuiPlugin {
   static installedApps = new Set();
 
@@ -4406,6 +4521,10 @@ exports.defineFormSelectorComponent = defineFormSelectorComponent;
 exports.iconProps = iconProps;
 exports.installVuiPlugin = installVuiPlugin;
 exports.listTileEmits = listTileEmits;
+exports.mergeVuiPluginOptions = mergeVuiPluginOptions;
+exports.mergeVuiServiceIconSettings = mergeVuiServiceIconSettings;
+exports.mergeVuiServiceOptions = mergeVuiServiceOptions;
+exports.mergeVuiServiceUISettings = mergeVuiServiceUISettings;
 exports.paginationProps = paginationProps;
 exports.rawIconProp = rawIconProp;
 exports.renderNavigationItemInput = renderNavigationItemInput;