This commit is contained in:
@@ -106,6 +106,8 @@
|
|||||||
<!-- ******** BUILDER FOR EACH TYPE Tag, decimal,currency, bool, integer, string, datetime ******** -->
|
<!-- ******** BUILDER FOR EACH TYPE Tag, decimal,currency, bool, integer, string, datetime ******** -->
|
||||||
<!-- NOTE: currently not implemented: TimeSpan=15, seems unsupportable for a filter -->
|
<!-- NOTE: currently not implemented: TimeSpan=15, seems unsupportable for a filter -->
|
||||||
<!-- DATETIME BUILDER -->
|
<!-- DATETIME BUILDER -->
|
||||||
|
<!-- Note: date time is a bit unusual in that it presents the date tokens first as it would be the most common choice whereas the other types would do something
|
||||||
|
like that later -->
|
||||||
<div v-if="item.uiFieldDataType === 1">
|
<div v-if="item.uiFieldDataType === 1">
|
||||||
<v-select
|
<v-select
|
||||||
v-model="item.tempFilterToken"
|
v-model="item.tempFilterToken"
|
||||||
@@ -608,22 +610,34 @@ export default {
|
|||||||
|
|
||||||
//DATE relative token?
|
//DATE relative token?
|
||||||
if (item.uiFieldDataType === 1) {
|
if (item.uiFieldDataType === 1) {
|
||||||
//some kind of relative date token?
|
if (item.tempFilterToken) {
|
||||||
if (
|
//no or has value?
|
||||||
item.tempFilterToken &&
|
|
||||||
item.tempFilterToken != "*select*" &&
|
//this redundancy is because there are two ways to select the no value and has value; both present in the relative pick list
|
||||||
item.tempFilterToken != "*NOVALUE*" &&
|
//and also in the select specific value picklist as the date filter picker for convenience so this is a workaround
|
||||||
item.tempFilterToken != "*HASVALUE*"
|
//to simulate if the user had done the full *select* first then picked novalue or has value
|
||||||
) {
|
|
||||||
//special relative token
|
if (item.tempFilterToken == "*NOVALUE*") {
|
||||||
filterItem.op = "="; //equality
|
filterItem.op = "=";
|
||||||
filterItem.token = true;
|
filterItem.value = "*NULL*";
|
||||||
filterItem.value = item.tempFilterToken;
|
filterItemSet = true;
|
||||||
filterItemSet = true;
|
} else if (item.tempFilterToken == "*HASVALUE*") {
|
||||||
|
filterItem.op = "!=";
|
||||||
|
filterItem.value = "*NULL*";
|
||||||
|
filterItemSet = true;
|
||||||
|
} else {
|
||||||
|
//some kind of relative date token?
|
||||||
|
if (item.tempFilterToken != "*select*") {
|
||||||
|
//special relative token
|
||||||
|
filterItem.op = "="; //equality
|
||||||
|
filterItem.token = true;
|
||||||
|
filterItem.value = item.tempFilterToken;
|
||||||
|
filterItemSet = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
debugger;
|
|
||||||
//BLANKS / NONBLANKS TOKENS?
|
//BLANKS / NONBLANKS TOKENS?
|
||||||
if (false == filterItemSet && item.tempFilterOperator == "*NOVALUE*") {
|
if (false == filterItemSet && item.tempFilterOperator == "*NOVALUE*") {
|
||||||
filterItem.op = "=";
|
filterItem.op = "=";
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
|
const MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
//https://medium.com/@mrodal/how-to-make-lazy-loading-actually-work-in-vue-cli-3-7f3f88cfb102
|
//https://medium.com/@mrodal/how-to-make-lazy-loading-actually-work-in-vue-cli-3-7f3f88cfb102
|
||||||
chainWebpack: config => {
|
chainWebpack: config => {
|
||||||
@@ -6,6 +7,7 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
configureWebpack: {
|
configureWebpack: {
|
||||||
|
devtool: "source-map", //THIS ENABLES DEBUGGING AT BROWSER!!
|
||||||
plugins: [
|
plugins: [
|
||||||
new MonacoWebpackPlugin({
|
new MonacoWebpackPlugin({
|
||||||
// available options are documented at https://github.com/Microsoft/monaco-editor-webpack-plugin#options
|
// available options are documented at https://github.com/Microsoft/monaco-editor-webpack-plugin#options
|
||||||
@@ -47,5 +49,5 @@ module.exports = {
|
|||||||
msTileImage: null
|
msTileImage: null
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
productionSourceMap: true
|
productionSourceMap: false
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user