diff --git a/src/components/xTable/columnItem.vue b/src/components/xTable/columnItem.vue
index 44ff10d..a94db4e 100644
--- a/src/components/xTable/columnItem.vue
+++ b/src/components/xTable/columnItem.vue
@@ -31,7 +31,7 @@
:size="op.size || 'small'"
:link="op.link"
:icon="op.icon"
- :circle="op.circle || false"
+ :circle="op.circle || false"
v-if="value === row[item.name]">
{{ op.label }}
@@ -39,17 +39,17 @@
- {{ row[item.name] }}
-
+
{{ item.columntype=='select' && item.options && item.options.items ? getNameByValue( row[item.name], item.options.items ) : row[item.name] }}
@@ -73,7 +73,7 @@
// 打开编辑层
else if (item.update && (item.update.url || item.update.name)) {
this.$emit('xtableupdate', row, {
- name:item.update.name || item.name,
+ name:item.update.name || item.name,
remoteurl: item.update.url || 'table/getUpdate?name='+item.update.name
}, item.update.type || 'dialog', 'update');
return ;
@@ -81,7 +81,7 @@
// 打开表格
else if (item.table && (item.table.url || item.table.name)) {
this.$emit('xtableupdate', row, {
- name:item.table.name || item.name,
+ name:item.table.name || item.name,
remoteurl: item.table.url || 'table/get?name='+item.table.name
}, item.table.type || 'dialog', 'table');
return ;
diff --git a/src/components/xTable/index.vue b/src/components/xTable/index.vue
index 57fd5df..a2e0501 100644
--- a/src/components/xTable/index.vue
+++ b/src/components/xTable/index.vue
@@ -6,14 +6,14 @@
-
-
+
+
-
-
+
+
@@ -85,7 +85,7 @@
props: {
name: { type: String, default: "" },
tableColumn: { type: Object, default: () => {} },
- api: { type: Object, default: () => {} },
+ api: { type: String, default: () => {} },
apiObj: { type: Object, default: () => {} },
params: { type: Object, default: () => ({}) },
data: { type: Object, default: () => {} },
@@ -177,7 +177,7 @@
this.$refs.xTable.doLayout()
}
},
- deactivated(){
+ deactivated(){
this.isActivat = false;
},
methods: {
@@ -188,9 +188,9 @@
this.$nextTick(() => {
this.$refs.xtableupdate.open().getComponentType(componenttype).setData(row).setConfig(options);
})
- return ;
+ return ;
}
-
+
this.xtabledialog = options.name || this.name;
this.$nextTick(() => {
this.$refs.xtabledialog.open().setData(row).getComponentType(componenttype).setConfig(options);
@@ -215,7 +215,7 @@
try {
var xawait = this.api ? this.$http.get(this.api, reqData) : this.apiObj(reqData);
- xawait.then((res) => {
+ xawait.then((res) => {
try {
var response = config.parseData(res);
}catch(error){
diff --git a/src/layout/index.vue b/src/layout/index.vue
index a0d3327..954d961 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -280,7 +280,7 @@
this.$router.push({path: route.path})
return ;
}
-
+
if (route.children.length > 0) {
this.getchildren(route.children[0]);
}
diff --git a/src/views/system/table/index.vue b/src/views/system/table/index.vue
index 208f732..dff20b3 100644
--- a/src/views/system/table/index.vue
+++ b/src/views/system/table/index.vue
@@ -31,16 +31,16 @@
-
@@ -57,7 +57,7 @@
-
+
@@ -68,7 +68,7 @@
import xFilterBar from '@/components/xFilterBar';
import xEcharts from '@/components/xEcharts'
export default {
- name: 'propertyAuth',
+ name: 'systemTable',
components: {
xStat,
xEcharts,