Skip to content

P
Platform
Unverified Commit 2904a4bf authored by Micheal Mand's avatar Micheal Mand
Browse files
Options

Fix Page status column width 

Signed-off-by: 's avatarMicheal Mand <micheal@kmdwebdesigns.com>
parent 39733759
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 61 deletions
Modules/Page/Assets/js/components/PageTableServerSide.vue
View file @ 2904a4bf
......@@ -52,12 +52,12 @@
type="selection"
width="55">
</el-table-column>
<el-table-column :label="trans('page.status')" width="75">
<el-table-column :label="trans('page.status')" width="100">
<template scope="scope">
<i class="el-icon-fa-circle" :class="(scope.row.translations.status === true) ? 'text-success':'text-danger'"></i>
</template>
</el-table-column>
<el-table-column prop="id" label="Id" width="100" sortable="custom">
<el-table-column prop="id" label="Id" width="75" sortable="custom">
</el-table-column>
<el-table-column prop="translations.title" :label="trans('page.title')">
<template scope="scope">
......
public/js/app.js
View file @ 2904a4bf
......@@ -42812,7 +42812,7 @@ window.axios.interceptors.response.use(null, function (error) {
"use strict";
Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/*!
* vue-i18n v7.3.0
* vue-i18n v7.3.1
* (c) 2017 kazuya kawaguchi
* Released under the MIT License.
*/
......@@ -43202,15 +43202,39 @@ var component = {
/* */
function bind (el, binding, vnode) {
if (!assert(el, vnode)) { return }
t$1(el, binding, vnode);
}
function update (el, binding, vnode, oldVNode) {
if (looseEqual(binding.value, binding.oldValue)) { return }
if (!assert(el, vnode)) { return }
if (localeEqual(el, vnode) && looseEqual(binding.value, binding.oldValue)) { return }
t$1(el, binding, vnode);
}
function assert (el, vnode) {
var vm = vnode.context;
if (!vm) {
warn('not exist Vue instance in VNode context');
return false
}
if (!vm.$i18n) {
warn('not exist VueI18n instance in Vue instance');
return false
}
return true
}
function localeEqual (el, vnode) {
var vm = vnode.context;
return el._locale === vm.$i18n.locale
}
function t$1 (el, binding, vnode) {
var value = binding.value;
......@@ -43223,23 +43247,14 @@ function t$1 (el, binding, vnode) {
return
}
var vm = vnode.context;
if (!vm) {
warn('not exist Vue instance in VNode context');
return
}
if (!vm.$i18n) {
warn('not exist VueI18n instance in Vue instance');
return
}
if (!path) {
warn('required `path` in v-t directive');
return
}
var vm = vnode.context;
el._vt = el.textContent = (ref$1 = vm.$i18n).t.apply(ref$1, [ path ].concat( makeParams(locale, args) ));
el._locale = vm.$i18n.locale;
var ref$1;
}
......@@ -44295,7 +44310,7 @@ VueI18n.availabilities = {
numberFormat: canUseNumberFormat
};
VueI18n.install = install;
VueI18n.version = '7.3.0';
VueI18n.version = '7.3.1';
/* istanbul ignore if */
if (typeof window !== 'undefined' && window.Vue) {
......@@ -47177,7 +47192,7 @@ module.exports =
};
module.exports = {
version: '1.4.5',
version: '1.4.6',
locale: _locale2.default.use,
i18n: _locale2.default.i18n,
install: install,
......@@ -48654,7 +48669,6 @@ module.exports =
options: {
default: function _default() {
return {
forceAbsolute: true,
gpuAcceleration: false
};
}
......@@ -53183,7 +53197,6 @@ module.exports =
popperOptions: {
default: function _default() {
return {
forceAbsolute: true,
gpuAcceleration: false
};
}
......@@ -60771,7 +60784,7 @@ module.exports =
var calcDefaultValue = function calcDefaultValue(defaultValue) {
if (Array.isArray(defaultValue)) {
return new Date(defaultValue[0]);
return defaultValue[0] ? new Date(defaultValue[0]) : new Date();
} else {
return new Date(defaultValue);
}
......@@ -62552,8 +62565,7 @@ module.exports =
data: function data() {
return {
timeoutPending: null,
handlerAdded: false
timeoutPending: null
};
},
beforeCreate: function beforeCreate() {
......@@ -62619,19 +62631,10 @@ module.exports =
var nativeOn = vnode.data.nativeOn = vnode.data.nativeOn || {};
data.staticClass = this.concatClass(data.staticClass, 'el-tooltip');
if (this.handlerAdded) return vnode;
on.mouseenter = this.addEventHandle(on.mouseenter, function () {
_this2.setExpectedState(true);_this2.handleShowPopper();
});
on.mouseleave = this.addEventHandle(on.mouseleave, function () {
_this2.setExpectedState(false);_this2.debounceClose();
});
nativeOn.mouseenter = this.addEventHandle(nativeOn.mouseenter, function () {
_this2.setExpectedState(true);_this2.handleShowPopper();
});
nativeOn.mouseleave = this.addEventHandle(nativeOn.mouseleave, function () {
_this2.setExpectedState(false);_this2.debounceClose();
});
on.mouseenter = this.addEventHandle(on.mouseenter, this.show);
on.mouseleave = this.addEventHandle(on.mouseleave, this.hide);
nativeOn.mouseenter = this.addEventHandle(nativeOn.mouseenter, this.show);
nativeOn.mouseleave = this.addEventHandle(nativeOn.mouseleave, this.hide);
return vnode;
},
......@@ -62641,9 +62644,22 @@ module.exports =
methods: {
show: function show() {
this.setExpectedState(true);
this.handleShowPopper();
},
hide: function hide() {
this.setExpectedState(false);
this.debounceClose();
},
addEventHandle: function addEventHandle(old, fn) {
this.handlerAdded = true;
return old ? Array.isArray(old) ? old.concat(fn) : [old, fn] : fn;
if (!old) {
return fn;
} else if (Array.isArray(old)) {
return old.indexOf(fn) > -1 ? old : old.concat(fn);
} else {
return old === fn ? old : [old, fn];
}
},
concatClass: function concatClass(a, b) {
if (a && a.indexOf(b) > -1) return a;
......@@ -65450,7 +65466,8 @@ module.exports =
} else if (typeof config === 'string') {
return data[config];
} else if (typeof config === 'undefined') {
return '';
var dataProp = data[prop];
return dataProp === undefined ? '' : dataProp;
}
};
......@@ -67219,6 +67236,7 @@ module.exports =
this.startX = event.clientX;
}
this.startPosition = parseFloat(this.currentPosition);
this.newPosition = this.startPosition;
},
onDragging: function onDragging(event) {
if (this.dragging) {
......@@ -72534,9 +72552,13 @@ module.exports =
arr.forEach(function (item) {
var itemCopy = {};
configurableProps.forEach(function (prop) {
var propName = props[prop] || prop;
var value = item[propName];
if (value !== undefined) itemCopy[propName] = value;
var name = props[prop];
var value = item[name];
if (value === undefined) {
name = prop;
value = item[name];
}
if (value !== undefined) itemCopy[name] = value;
});
if (Array.isArray(item[childrenProp])) {
itemCopy[childrenProp] = copyArray(item[childrenProp], props);
......@@ -76225,7 +76247,6 @@ module.exports =
popperOptions: {
default: function _default() {
return {
forceAbsolute: true,
gpuAcceleration: false
};
}
......@@ -79894,8 +79915,7 @@ module.exports =
data: function data() {
return {
timeoutPending: null,
handlerAdded: false
timeoutPending: null
};
},
beforeCreate: function beforeCreate() {
......@@ -79961,19 +79981,10 @@ module.exports =
var nativeOn = vnode.data.nativeOn = vnode.data.nativeOn || {};
data.staticClass = this.concatClass(data.staticClass, 'el-tooltip');
if (this.handlerAdded) return vnode;
on.mouseenter = this.addEventHandle(on.mouseenter, function () {
_this2.setExpectedState(true);_this2.handleShowPopper();
});
on.mouseleave = this.addEventHandle(on.mouseleave, function () {
_this2.setExpectedState(false);_this2.debounceClose();
});
nativeOn.mouseenter = this.addEventHandle(nativeOn.mouseenter, function () {
_this2.setExpectedState(true);_this2.handleShowPopper();
});
nativeOn.mouseleave = this.addEventHandle(nativeOn.mouseleave, function () {
_this2.setExpectedState(false);_this2.debounceClose();
});
on.mouseenter = this.addEventHandle(on.mouseenter, this.show);
on.mouseleave = this.addEventHandle(on.mouseleave, this.hide);
nativeOn.mouseenter = this.addEventHandle(nativeOn.mouseenter, this.show);
nativeOn.mouseleave = this.addEventHandle(nativeOn.mouseleave, this.hide);
return vnode;
},
......@@ -79983,9 +79994,22 @@ module.exports =
methods: {
show: function show() {
this.setExpectedState(true);
this.handleShowPopper();
},
hide: function hide() {
this.setExpectedState(false);
this.debounceClose();
},
addEventHandle: function addEventHandle(old, fn) {
this.handlerAdded = true;
return old ? Array.isArray(old) ? old.concat(fn) : [old, fn] : fn;
if (!old) {
return fn;
} else if (Array.isArray(old)) {
return old.indexOf(fn) > -1 ? old : old.concat(fn);
} else {
return old === fn ? old : [old, fn];
}
},
concatClass: function concatClass(a, b) {
if (a && a.indexOf(b) > -1) return a;
......@@ -92149,7 +92173,7 @@ var render = function() {
}),
_vm._v(" "),
_c("el-table-column", {
attrs: { label: _vm.trans("page.status"), width: "75" },
attrs: { label: _vm.trans("page.status"), width: "100" },
scopedSlots: _vm._u([
{
key: "default",
......@@ -92172,7 +92196,7 @@ var render = function() {
attrs: {
prop: "id",
label: "Id",
width: "100",
width: "75",
sortable: "custom"
}
}),
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023