This commit is contained in:
2020-10-06 14:06:46 +00:00
parent bf740b2b6c
commit 213053f885
10 changed files with 90 additions and 26 deletions

View File

@@ -298,11 +298,11 @@ export default {
iconForType: function(ayaType) {
switch (ayaType) {
case window.$gz.type.NoType:
return "fa-genderless";
return "$ayiGenderless";
case window.$gz.type.Global:
return "fa-globe";
return "$ayiGlobe";
case window.$gz.type.User:
return "fa-user";
return "$ayiUser";
case window.$gz.type.Widget:
return "$ayiVial";
case window.$gz.type.ServerState:
@@ -310,15 +310,15 @@ export default {
case window.$gz.type.License:
return "$ayiTicket";
case window.$gz.type.LogFile:
return "fa-glasses";
return "$ayiGlasses";
case window.$gz.type.PickListTemplate:
return "fa-pencil-ruler";
return "$ayiPencilRuler";
case window.$gz.type.ServerJob:
return "$ayiRobot";
case window.$gz.type.AyaNova7Import:
return "$ayiFile-import";
return "$ayiFileImport";
case window.$gz.type.TrialSeeder:
return "fa-seedling";
return "$ayiSeedling";
case window.$gz.type.Metrics:
return "$ayiFileMedicalAlt";
case window.$gz.type.Translation:
@@ -326,9 +326,9 @@ export default {
case window.$gz.type.UserOptions:
return "$ayiUserCog";
case window.$gz.type.FileAttachment:
return "fa-paperclip";
return "$ayiPaperclip";
case window.$gz.type.DataListView:
return "fa-filter";
return "$ayiFilter";
case window.$gz.type.FormCustom:
return "$ayiCustomize";
default:

View File

@@ -47,7 +47,7 @@
<v-tabs v-model="tab" color="primary">
<v-tabs-slider></v-tabs-slider>
<v-tab key="list"><v-icon>$ayiFolder</v-icon></v-tab>
<v-tab key="attach"><v-icon>fa-paperclip</v-icon></v-tab>
<v-tab key="attach"><v-icon>$ayiPaperclip</v-icon></v-tab>
<v-tabs-items v-model="tab">
<v-tab-item key="list">
<div
@@ -105,7 +105,7 @@
<v-file-input
v-model="uploadFiles"
:label="$ay.t('AttachFile')"
prepend-icon="fa-paperclip"
prepend-icon="$ayiPaperclip"
multiple
chips
></v-file-input>

View File

@@ -20,7 +20,7 @@
</v-btn>
<v-btn class="ml-12" @click="editListView">
<v-icon :data-cy="!!$ay.dev ? 'filter' : false">fa-filter</v-icon>
<v-icon :data-cy="!!$ay.dev ? 'filter' : false">$ayiFilter</v-icon>
</v-btn>
</div>
</v-card-title>

View File

@@ -47,12 +47,17 @@ import {
faFileCsv,
faFileExcel,
faFileImage,
faFileImport,
faFileMedicalAlt,
faFilePdf,
faFilePowerpoint,
faFileVideo,
faFileWord,
faFilter,
faFolder,
faGenderless,
faGlasses,
faGlobe,
faHistory,
faHome,
faInbox,
@@ -60,13 +65,16 @@ import {
faKey,
faLanguage,
faPallet,
faPaperclip,
faPaperPlane,
faPencilAlt,
faPencilRuler,
faPlug,
faQuestionCircle,
faRobot,
faRocket,
faSearch,
faSeedling,
faServer,
faShippingFast,
faSignInAlt,
@@ -125,12 +133,17 @@ library.add(
faFileCsv,
faFileExcel,
faFileImage,
faFileImport,
faFileMedicalAlt,
faFilePdf,
faFilePowerpoint,
faFileVideo,
faFileWord,
faFilter,
faFolder,
faGenderless,
faGlasses,
faGlobe,
faHistory,
faHome,
faInbox,
@@ -138,13 +151,16 @@ library.add(
faKey,
faLanguage,
faPallet,
faPaperclip,
faPaperPlane,
faPencilAlt,
faPencilRuler,
faPlug,
faQuestionCircle,
faRobot,
faRocket,
faSearch,
faSeedling,
faServer,
faShippingFast,
faSignInAlt,
@@ -364,6 +380,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "file-image"]
}
},
ayiFileImport: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "file-import"]
}
},
ayiFileMedicalAlt: {
component: FontAwesomeIcon,
props: {
@@ -394,12 +416,36 @@ const CUSTOM_ICONS = {
icon: ["fas", "file-word"]
}
},
ayiFilter: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "filter"]
}
},
ayiFolder: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "folder"]
}
},
ayiGenderless: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "genderless"]
}
},
ayiGlasses: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "glasses"]
}
},
ayiGlobe: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "globe"]
}
},
ayiHistory: {
component: FontAwesomeIcon,
props: {
@@ -442,6 +488,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "pallet"]
}
},
ayiPaperclip: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "paperclip"]
}
},
ayiPaperPlane: {
component: FontAwesomeIcon,
props: {
@@ -454,6 +506,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "pencil-alt"]
}
},
ayiPencilRuler: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "pencil-ruler"]
}
},
ayiPlug: {
component: FontAwesomeIcon,
props: {
@@ -484,6 +542,12 @@ const CUSTOM_ICONS = {
icon: ["fas", "search"]
}
},
ayiSeedling: {
component: FontAwesomeIcon,
props: {
icon: ["fas", "seedling"]
}
},
ayiServer: {
component: FontAwesomeIcon,
props: {

View File

@@ -132,7 +132,7 @@
id="username"
v-model="login"
:readonly="formState.readOnly"
prepend-icon="fa-user"
prepend-icon="$ayiUser"
autocomplete="off"
autocorrect="off"
autocapitalize="off"

View File

@@ -203,7 +203,7 @@ function generateMenu(vm) {
},
{
title: "Log",
icon: "fa-glasses",
icon: "$ayiGlasses",
key: "app:nav:log",
data: "ay-log"
},

View File

@@ -114,7 +114,7 @@
item-text="name"
item-value="id"
:label="$ay.t('Filter')"
prepend-icon="fa-filter"
prepend-icon="$ayiFilter"
></v-select>
<div v-if="item.tempFilterToken == '*select*'">
<v-select
@@ -154,7 +154,7 @@
item-text="name"
item-value="id"
:label="$ay.t('Filter')"
prepend-icon="fa-filter"
prepend-icon="$ayiFilter"
></v-select>
<v-text-field
v-if="
@@ -188,7 +188,7 @@
item-text="name"
item-value="id"
:label="$ay.t('Filter')"
prepend-icon="fa-filter"
prepend-icon="$ayiFilter"
></v-select>
<v-text-field
v-if="
@@ -216,7 +216,7 @@
item-text="name"
item-value="id"
:label="$ay.t('Filter')"
prepend-icon="fa-filter"
prepend-icon="$ayiFilter"
></v-select>
<v-radio-group
v-model="item.tempFilterValue"
@@ -254,7 +254,7 @@
item-text="name"
item-value="id"
:label="$ay.t('Filter')"
prepend-icon="fa-filter"
prepend-icon="$ayiFilter"
></v-select>
<gz-decimal
v-if="
@@ -281,7 +281,7 @@
item-text="name"
item-value="id"
:label="$ay.t('Filter')"
prepend-icon="fa-filter"
prepend-icon="$ayiFilter"
></v-select>
<gz-currency
v-if="
@@ -308,7 +308,7 @@
item-text="name"
item-value="id"
:label="$ay.t('Filter')"
prepend-icon="fa-filter"
prepend-icon="$ayiFilter"
></v-select>
<gz-tag-picker
@@ -332,7 +332,7 @@
item-text="name"
item-value="id"
:label="$ay.t('Filter')"
prepend-icon="fa-filter"
prepend-icon="$ayiFilter"
></v-select>
<v-select
@@ -892,7 +892,7 @@ function clickHandler(menuItem) {
function generateMenu(vm) {
let menuOptions = {
isMain: false,
icon: "fa-filter",
icon: "$ayiFilter",
title: "DataListView",
helpUrl: "form-ay-data-list-view",
formData: {

View File

@@ -441,7 +441,7 @@ function populateEventTypeList(vm) {
},
10: { name: vm.$ay.t("EventSeedDatabase"), icon: "fa-plus" },
11: { name: vm.$ay.t("EventAttachmentModified"), icon: "fa-save" },
12: { name: "ERASE ALL DATA", icon: "fa-seedling" },
12: { name: "ERASE ALL DATA", icon: "$ayiSeedling" },
13: { name: vm.$ay.t("EventResetSerial"), icon: "fa-egg" },
13: {
name: vm.$ay.t("EventUtilityFileDownload"),

View File

@@ -136,7 +136,7 @@
id="username"
v-model="login"
:readonly="formState.readOnly"
prepend-icon="fa-user"
prepend-icon="$ayiUser"
autocomplete="off"
autocorrect="off"
autocapitalize="off"

View File

@@ -11,7 +11,7 @@
id="username"
v-model="obj.loginName"
:readonly="formState.readOnly"
prepend-icon="fa-user"
prepend-icon="$ayiUser"
autocomplete="off"
autocorrect="off"
autocapitalize="off"