+
-
-
-
-
+
+
无图
+
+
+
-
+
-
-
-
+
-
+
{{ op.label }}
+
-
+
{{ row[item.name] }}
-
-
- {{ getNameByValue( row[item.name], item.options.items) }}
-
-
+
+
+
- {{row[item.name]}}
+ {{ item.columntype=='select' && item.options && item.options.items ? getNameByValue( row[item.name], item.options.items ) : row[item.name] }}
@@ -60,11 +58,20 @@
},
methods: {
- handleClick(row, options){
- if (options && options.updataname) {
- this.$emit('xtableupdate', row, {name:options.updataname, remoteurl:'system/table/getUpdate?name='+options.updataname});
+ handleClick(row, item){
+ if (item.options && (item.options.updataname || item.options.updateremoteurl)) {
+ this.$emit('xtableupdate', row, {
+ name:item.options.updataname || item.name,
+ remoteurl: item.options.updateremoteurl || 'system/table/getUpdate?name='+item.options.updataname
+ });
}
},
+ getType(value) {
+ if (Array.isArray(value)) {
+ return value.length;
+ }
+ return value;
+ },
getNameByValue (value, degrees) {
const degree = degrees.find(degree => degree.value === value);
return degree ? (degree.name?degree.name:degree.label) : value;
diff --git a/src/components/xTable/index.vue b/src/components/xTable/index.vue
index 6aaee66..59919fb 100644
--- a/src/components/xTable/index.vue
+++ b/src/components/xTable/index.vue
@@ -182,7 +182,7 @@
},
methods: {
xtableupdate(row, options=[]){
- this.tableUpdateKey = options.name;
+ this.tableUpdateKey = options.name || this.name;
this.$nextTick(() => {
this.$refs.xtableupdate.open().setData(row).setConfig(options);
})
diff --git a/src/components/scVideo/index.vue b/src/components/xVideo/index.vue
similarity index 69%
rename from src/components/scVideo/index.vue
rename to src/components/xVideo/index.vue
index 0707776..fa21f4e 100644
--- a/src/components/scVideo/index.vue
+++ b/src/components/xVideo/index.vue
@@ -3,7 +3,7 @@
-->
-
+
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 84ee333..b759c6c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -51,7 +51,7 @@