This commit is contained in:
@@ -298,11 +298,11 @@ export default {
|
|||||||
iconForType: function(ayaType) {
|
iconForType: function(ayaType) {
|
||||||
switch (ayaType) {
|
switch (ayaType) {
|
||||||
case window.$gz.type.NoType:
|
case window.$gz.type.NoType:
|
||||||
return "fa-genderless";
|
return "$ayiGenderless";
|
||||||
case window.$gz.type.Global:
|
case window.$gz.type.Global:
|
||||||
return "fa-globe";
|
return "$ayiGlobe";
|
||||||
case window.$gz.type.User:
|
case window.$gz.type.User:
|
||||||
return "fa-user";
|
return "$ayiUser";
|
||||||
case window.$gz.type.Widget:
|
case window.$gz.type.Widget:
|
||||||
return "$ayiVial";
|
return "$ayiVial";
|
||||||
case window.$gz.type.ServerState:
|
case window.$gz.type.ServerState:
|
||||||
@@ -310,15 +310,15 @@ export default {
|
|||||||
case window.$gz.type.License:
|
case window.$gz.type.License:
|
||||||
return "$ayiTicket";
|
return "$ayiTicket";
|
||||||
case window.$gz.type.LogFile:
|
case window.$gz.type.LogFile:
|
||||||
return "fa-glasses";
|
return "$ayiGlasses";
|
||||||
case window.$gz.type.PickListTemplate:
|
case window.$gz.type.PickListTemplate:
|
||||||
return "fa-pencil-ruler";
|
return "$ayiPencilRuler";
|
||||||
case window.$gz.type.ServerJob:
|
case window.$gz.type.ServerJob:
|
||||||
return "$ayiRobot";
|
return "$ayiRobot";
|
||||||
case window.$gz.type.AyaNova7Import:
|
case window.$gz.type.AyaNova7Import:
|
||||||
return "$ayiFile-import";
|
return "$ayiFileImport";
|
||||||
case window.$gz.type.TrialSeeder:
|
case window.$gz.type.TrialSeeder:
|
||||||
return "fa-seedling";
|
return "$ayiSeedling";
|
||||||
case window.$gz.type.Metrics:
|
case window.$gz.type.Metrics:
|
||||||
return "$ayiFileMedicalAlt";
|
return "$ayiFileMedicalAlt";
|
||||||
case window.$gz.type.Translation:
|
case window.$gz.type.Translation:
|
||||||
@@ -326,9 +326,9 @@ export default {
|
|||||||
case window.$gz.type.UserOptions:
|
case window.$gz.type.UserOptions:
|
||||||
return "$ayiUserCog";
|
return "$ayiUserCog";
|
||||||
case window.$gz.type.FileAttachment:
|
case window.$gz.type.FileAttachment:
|
||||||
return "fa-paperclip";
|
return "$ayiPaperclip";
|
||||||
case window.$gz.type.DataListView:
|
case window.$gz.type.DataListView:
|
||||||
return "fa-filter";
|
return "$ayiFilter";
|
||||||
case window.$gz.type.FormCustom:
|
case window.$gz.type.FormCustom:
|
||||||
return "$ayiCustomize";
|
return "$ayiCustomize";
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -47,7 +47,7 @@
|
|||||||
<v-tabs v-model="tab" color="primary">
|
<v-tabs v-model="tab" color="primary">
|
||||||
<v-tabs-slider></v-tabs-slider>
|
<v-tabs-slider></v-tabs-slider>
|
||||||
<v-tab key="list"><v-icon>$ayiFolder</v-icon></v-tab>
|
<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-tabs-items v-model="tab">
|
||||||
<v-tab-item key="list">
|
<v-tab-item key="list">
|
||||||
<div
|
<div
|
||||||
@@ -105,7 +105,7 @@
|
|||||||
<v-file-input
|
<v-file-input
|
||||||
v-model="uploadFiles"
|
v-model="uploadFiles"
|
||||||
:label="$ay.t('AttachFile')"
|
:label="$ay.t('AttachFile')"
|
||||||
prepend-icon="fa-paperclip"
|
prepend-icon="$ayiPaperclip"
|
||||||
multiple
|
multiple
|
||||||
chips
|
chips
|
||||||
></v-file-input>
|
></v-file-input>
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
</v-btn>
|
</v-btn>
|
||||||
|
|
||||||
<v-btn class="ml-12" @click="editListView">
|
<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>
|
</v-btn>
|
||||||
</div>
|
</div>
|
||||||
</v-card-title>
|
</v-card-title>
|
||||||
|
|||||||
@@ -47,12 +47,17 @@ import {
|
|||||||
faFileCsv,
|
faFileCsv,
|
||||||
faFileExcel,
|
faFileExcel,
|
||||||
faFileImage,
|
faFileImage,
|
||||||
|
faFileImport,
|
||||||
faFileMedicalAlt,
|
faFileMedicalAlt,
|
||||||
faFilePdf,
|
faFilePdf,
|
||||||
faFilePowerpoint,
|
faFilePowerpoint,
|
||||||
faFileVideo,
|
faFileVideo,
|
||||||
faFileWord,
|
faFileWord,
|
||||||
|
faFilter,
|
||||||
faFolder,
|
faFolder,
|
||||||
|
faGenderless,
|
||||||
|
faGlasses,
|
||||||
|
faGlobe,
|
||||||
faHistory,
|
faHistory,
|
||||||
faHome,
|
faHome,
|
||||||
faInbox,
|
faInbox,
|
||||||
@@ -60,13 +65,16 @@ import {
|
|||||||
faKey,
|
faKey,
|
||||||
faLanguage,
|
faLanguage,
|
||||||
faPallet,
|
faPallet,
|
||||||
|
faPaperclip,
|
||||||
faPaperPlane,
|
faPaperPlane,
|
||||||
faPencilAlt,
|
faPencilAlt,
|
||||||
|
faPencilRuler,
|
||||||
faPlug,
|
faPlug,
|
||||||
faQuestionCircle,
|
faQuestionCircle,
|
||||||
faRobot,
|
faRobot,
|
||||||
faRocket,
|
faRocket,
|
||||||
faSearch,
|
faSearch,
|
||||||
|
faSeedling,
|
||||||
faServer,
|
faServer,
|
||||||
faShippingFast,
|
faShippingFast,
|
||||||
faSignInAlt,
|
faSignInAlt,
|
||||||
@@ -125,12 +133,17 @@ library.add(
|
|||||||
faFileCsv,
|
faFileCsv,
|
||||||
faFileExcel,
|
faFileExcel,
|
||||||
faFileImage,
|
faFileImage,
|
||||||
|
faFileImport,
|
||||||
faFileMedicalAlt,
|
faFileMedicalAlt,
|
||||||
faFilePdf,
|
faFilePdf,
|
||||||
faFilePowerpoint,
|
faFilePowerpoint,
|
||||||
faFileVideo,
|
faFileVideo,
|
||||||
faFileWord,
|
faFileWord,
|
||||||
|
faFilter,
|
||||||
faFolder,
|
faFolder,
|
||||||
|
faGenderless,
|
||||||
|
faGlasses,
|
||||||
|
faGlobe,
|
||||||
faHistory,
|
faHistory,
|
||||||
faHome,
|
faHome,
|
||||||
faInbox,
|
faInbox,
|
||||||
@@ -138,13 +151,16 @@ library.add(
|
|||||||
faKey,
|
faKey,
|
||||||
faLanguage,
|
faLanguage,
|
||||||
faPallet,
|
faPallet,
|
||||||
|
faPaperclip,
|
||||||
faPaperPlane,
|
faPaperPlane,
|
||||||
faPencilAlt,
|
faPencilAlt,
|
||||||
|
faPencilRuler,
|
||||||
faPlug,
|
faPlug,
|
||||||
faQuestionCircle,
|
faQuestionCircle,
|
||||||
faRobot,
|
faRobot,
|
||||||
faRocket,
|
faRocket,
|
||||||
faSearch,
|
faSearch,
|
||||||
|
faSeedling,
|
||||||
faServer,
|
faServer,
|
||||||
faShippingFast,
|
faShippingFast,
|
||||||
faSignInAlt,
|
faSignInAlt,
|
||||||
@@ -364,6 +380,12 @@ const CUSTOM_ICONS = {
|
|||||||
icon: ["fas", "file-image"]
|
icon: ["fas", "file-image"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
ayiFileImport: {
|
||||||
|
component: FontAwesomeIcon,
|
||||||
|
props: {
|
||||||
|
icon: ["fas", "file-import"]
|
||||||
|
}
|
||||||
|
},
|
||||||
ayiFileMedicalAlt: {
|
ayiFileMedicalAlt: {
|
||||||
component: FontAwesomeIcon,
|
component: FontAwesomeIcon,
|
||||||
props: {
|
props: {
|
||||||
@@ -394,12 +416,36 @@ const CUSTOM_ICONS = {
|
|||||||
icon: ["fas", "file-word"]
|
icon: ["fas", "file-word"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
ayiFilter: {
|
||||||
|
component: FontAwesomeIcon,
|
||||||
|
props: {
|
||||||
|
icon: ["fas", "filter"]
|
||||||
|
}
|
||||||
|
},
|
||||||
ayiFolder: {
|
ayiFolder: {
|
||||||
component: FontAwesomeIcon,
|
component: FontAwesomeIcon,
|
||||||
props: {
|
props: {
|
||||||
icon: ["fas", "folder"]
|
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: {
|
ayiHistory: {
|
||||||
component: FontAwesomeIcon,
|
component: FontAwesomeIcon,
|
||||||
props: {
|
props: {
|
||||||
@@ -442,6 +488,12 @@ const CUSTOM_ICONS = {
|
|||||||
icon: ["fas", "pallet"]
|
icon: ["fas", "pallet"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
ayiPaperclip: {
|
||||||
|
component: FontAwesomeIcon,
|
||||||
|
props: {
|
||||||
|
icon: ["fas", "paperclip"]
|
||||||
|
}
|
||||||
|
},
|
||||||
ayiPaperPlane: {
|
ayiPaperPlane: {
|
||||||
component: FontAwesomeIcon,
|
component: FontAwesomeIcon,
|
||||||
props: {
|
props: {
|
||||||
@@ -454,6 +506,12 @@ const CUSTOM_ICONS = {
|
|||||||
icon: ["fas", "pencil-alt"]
|
icon: ["fas", "pencil-alt"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
ayiPencilRuler: {
|
||||||
|
component: FontAwesomeIcon,
|
||||||
|
props: {
|
||||||
|
icon: ["fas", "pencil-ruler"]
|
||||||
|
}
|
||||||
|
},
|
||||||
ayiPlug: {
|
ayiPlug: {
|
||||||
component: FontAwesomeIcon,
|
component: FontAwesomeIcon,
|
||||||
props: {
|
props: {
|
||||||
@@ -484,6 +542,12 @@ const CUSTOM_ICONS = {
|
|||||||
icon: ["fas", "search"]
|
icon: ["fas", "search"]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
ayiSeedling: {
|
||||||
|
component: FontAwesomeIcon,
|
||||||
|
props: {
|
||||||
|
icon: ["fas", "seedling"]
|
||||||
|
}
|
||||||
|
},
|
||||||
ayiServer: {
|
ayiServer: {
|
||||||
component: FontAwesomeIcon,
|
component: FontAwesomeIcon,
|
||||||
props: {
|
props: {
|
||||||
|
|||||||
@@ -132,7 +132,7 @@
|
|||||||
id="username"
|
id="username"
|
||||||
v-model="login"
|
v-model="login"
|
||||||
:readonly="formState.readOnly"
|
:readonly="formState.readOnly"
|
||||||
prepend-icon="fa-user"
|
prepend-icon="$ayiUser"
|
||||||
autocomplete="off"
|
autocomplete="off"
|
||||||
autocorrect="off"
|
autocorrect="off"
|
||||||
autocapitalize="off"
|
autocapitalize="off"
|
||||||
|
|||||||
@@ -203,7 +203,7 @@ function generateMenu(vm) {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: "Log",
|
title: "Log",
|
||||||
icon: "fa-glasses",
|
icon: "$ayiGlasses",
|
||||||
key: "app:nav:log",
|
key: "app:nav:log",
|
||||||
data: "ay-log"
|
data: "ay-log"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -114,7 +114,7 @@
|
|||||||
item-text="name"
|
item-text="name"
|
||||||
item-value="id"
|
item-value="id"
|
||||||
:label="$ay.t('Filter')"
|
:label="$ay.t('Filter')"
|
||||||
prepend-icon="fa-filter"
|
prepend-icon="$ayiFilter"
|
||||||
></v-select>
|
></v-select>
|
||||||
<div v-if="item.tempFilterToken == '*select*'">
|
<div v-if="item.tempFilterToken == '*select*'">
|
||||||
<v-select
|
<v-select
|
||||||
@@ -154,7 +154,7 @@
|
|||||||
item-text="name"
|
item-text="name"
|
||||||
item-value="id"
|
item-value="id"
|
||||||
:label="$ay.t('Filter')"
|
:label="$ay.t('Filter')"
|
||||||
prepend-icon="fa-filter"
|
prepend-icon="$ayiFilter"
|
||||||
></v-select>
|
></v-select>
|
||||||
<v-text-field
|
<v-text-field
|
||||||
v-if="
|
v-if="
|
||||||
@@ -188,7 +188,7 @@
|
|||||||
item-text="name"
|
item-text="name"
|
||||||
item-value="id"
|
item-value="id"
|
||||||
:label="$ay.t('Filter')"
|
:label="$ay.t('Filter')"
|
||||||
prepend-icon="fa-filter"
|
prepend-icon="$ayiFilter"
|
||||||
></v-select>
|
></v-select>
|
||||||
<v-text-field
|
<v-text-field
|
||||||
v-if="
|
v-if="
|
||||||
@@ -216,7 +216,7 @@
|
|||||||
item-text="name"
|
item-text="name"
|
||||||
item-value="id"
|
item-value="id"
|
||||||
:label="$ay.t('Filter')"
|
:label="$ay.t('Filter')"
|
||||||
prepend-icon="fa-filter"
|
prepend-icon="$ayiFilter"
|
||||||
></v-select>
|
></v-select>
|
||||||
<v-radio-group
|
<v-radio-group
|
||||||
v-model="item.tempFilterValue"
|
v-model="item.tempFilterValue"
|
||||||
@@ -254,7 +254,7 @@
|
|||||||
item-text="name"
|
item-text="name"
|
||||||
item-value="id"
|
item-value="id"
|
||||||
:label="$ay.t('Filter')"
|
:label="$ay.t('Filter')"
|
||||||
prepend-icon="fa-filter"
|
prepend-icon="$ayiFilter"
|
||||||
></v-select>
|
></v-select>
|
||||||
<gz-decimal
|
<gz-decimal
|
||||||
v-if="
|
v-if="
|
||||||
@@ -281,7 +281,7 @@
|
|||||||
item-text="name"
|
item-text="name"
|
||||||
item-value="id"
|
item-value="id"
|
||||||
:label="$ay.t('Filter')"
|
:label="$ay.t('Filter')"
|
||||||
prepend-icon="fa-filter"
|
prepend-icon="$ayiFilter"
|
||||||
></v-select>
|
></v-select>
|
||||||
<gz-currency
|
<gz-currency
|
||||||
v-if="
|
v-if="
|
||||||
@@ -308,7 +308,7 @@
|
|||||||
item-text="name"
|
item-text="name"
|
||||||
item-value="id"
|
item-value="id"
|
||||||
:label="$ay.t('Filter')"
|
:label="$ay.t('Filter')"
|
||||||
prepend-icon="fa-filter"
|
prepend-icon="$ayiFilter"
|
||||||
></v-select>
|
></v-select>
|
||||||
|
|
||||||
<gz-tag-picker
|
<gz-tag-picker
|
||||||
@@ -332,7 +332,7 @@
|
|||||||
item-text="name"
|
item-text="name"
|
||||||
item-value="id"
|
item-value="id"
|
||||||
:label="$ay.t('Filter')"
|
:label="$ay.t('Filter')"
|
||||||
prepend-icon="fa-filter"
|
prepend-icon="$ayiFilter"
|
||||||
></v-select>
|
></v-select>
|
||||||
|
|
||||||
<v-select
|
<v-select
|
||||||
@@ -892,7 +892,7 @@ function clickHandler(menuItem) {
|
|||||||
function generateMenu(vm) {
|
function generateMenu(vm) {
|
||||||
let menuOptions = {
|
let menuOptions = {
|
||||||
isMain: false,
|
isMain: false,
|
||||||
icon: "fa-filter",
|
icon: "$ayiFilter",
|
||||||
title: "DataListView",
|
title: "DataListView",
|
||||||
helpUrl: "form-ay-data-list-view",
|
helpUrl: "form-ay-data-list-view",
|
||||||
formData: {
|
formData: {
|
||||||
|
|||||||
@@ -441,7 +441,7 @@ function populateEventTypeList(vm) {
|
|||||||
},
|
},
|
||||||
10: { name: vm.$ay.t("EventSeedDatabase"), icon: "fa-plus" },
|
10: { name: vm.$ay.t("EventSeedDatabase"), icon: "fa-plus" },
|
||||||
11: { name: vm.$ay.t("EventAttachmentModified"), icon: "fa-save" },
|
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("EventResetSerial"), icon: "fa-egg" },
|
||||||
13: {
|
13: {
|
||||||
name: vm.$ay.t("EventUtilityFileDownload"),
|
name: vm.$ay.t("EventUtilityFileDownload"),
|
||||||
|
|||||||
@@ -136,7 +136,7 @@
|
|||||||
id="username"
|
id="username"
|
||||||
v-model="login"
|
v-model="login"
|
||||||
:readonly="formState.readOnly"
|
:readonly="formState.readOnly"
|
||||||
prepend-icon="fa-user"
|
prepend-icon="$ayiUser"
|
||||||
autocomplete="off"
|
autocomplete="off"
|
||||||
autocorrect="off"
|
autocorrect="off"
|
||||||
autocapitalize="off"
|
autocapitalize="off"
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
id="username"
|
id="username"
|
||||||
v-model="obj.loginName"
|
v-model="obj.loginName"
|
||||||
:readonly="formState.readOnly"
|
:readonly="formState.readOnly"
|
||||||
prepend-icon="fa-user"
|
prepend-icon="$ayiUser"
|
||||||
autocomplete="off"
|
autocomplete="off"
|
||||||
autocorrect="off"
|
autocorrect="off"
|
||||||
autocapitalize="off"
|
autocapitalize="off"
|
||||||
|
|||||||
Reference in New Issue
Block a user