From fe1b5ddf549312cb7e3ca8e13b6fac7e571fb865 Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 7 Jul 2020 16:44:49 +0800
Subject: [PATCH] update

Former-commit-id: 81a9aa7a0dc085dcc7b24290082d0e04ac2f0bf0
Former-commit-id: 21063fbb2347a2f522cb4a1c11fb93ff662f7028
---
 .../wwwroot/router/shared/display/boolean.html  |  4 +++-
 .../wwwroot/router/shared/display/string.html   |  8 +++++---
 projects/WebMVC/wwwroot/router/shared/edit.html |  2 +-
 .../wwwroot/router/shared/edit/boolean.html     |  6 +++---
 .../router/shared/edit/multiselectlist.html     |  2 +-
 .../wwwroot/router/shared/edit/selectlist.html  | 17 ++++++++---------
 .../wwwroot/router/shared/edit/string.html      |  2 +-
 projects/WebMVC/wwwroot/router/shared/list.html |  2 +-
 8 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/projects/WebMVC/wwwroot/router/shared/display/boolean.html b/projects/WebMVC/wwwroot/router/shared/display/boolean.html
index 7fc2392b..ac8e10a3 100644
--- a/projects/WebMVC/wwwroot/router/shared/display/boolean.html
+++ b/projects/WebMVC/wwwroot/router/shared/display/boolean.html
@@ -1,5 +1,7 @@
 <template>
-    <div><input type="checkbox" disabled style="width:16px;height:16px;margin:6px 0;" v-model="value" /></div>
+    <div>
+        <input type="checkbox" disabled style="width:16px;height:16px;margin:6px 0;" v-model="value" />
+    </div>
 </template>
 <script>
     export default {
diff --git a/projects/WebMVC/wwwroot/router/shared/display/string.html b/projects/WebMVC/wwwroot/router/shared/display/string.html
index 03d81628..4025e3f0 100644
--- a/projects/WebMVC/wwwroot/router/shared/display/string.html
+++ b/projects/WebMVC/wwwroot/router/shared/display/string.html
@@ -1,8 +1,10 @@
 <template>
-    <div style="overflow:hidden;white-space: nowrap;text-overflow:ellipsis;max-width:20em;" :title="value" v-if="mode==='list'">
-        {{value}}
+    <div :data-mode="mode">
+        <div style="overflow:hidden;white-space: nowrap;text-overflow:ellipsis;max-width:20em;" :title="value" v-if="mode==='list'">
+            {{value}}
+        </div>
+        <div v-else>{{value}}</div>
     </div>
-    <div v-else>{{value}}</div>
 </template>
 <script>
     export default {
diff --git a/projects/WebMVC/wwwroot/router/shared/edit.html b/projects/WebMVC/wwwroot/router/shared/edit.html
index acdac733..4d476975 100644
--- a/projects/WebMVC/wwwroot/router/shared/edit.html
+++ b/projects/WebMVC/wwwroot/router/shared/edit.html
@@ -15,7 +15,7 @@
                                         <component :is="getDisplayComponent(key)" :title="value.title" :name="key" :value="data.model[key]" :data="data.data" v-if="data.model" />
                                     </template>
                                     <template v-else>
-                                        <component :is="getEditComponent(key)" :title="value.title" :name="key" :value="data.model[key]" :data="data.data" :valid="valid(value,key,data.model[key])" :property="value" v-if="data.model" />
+                                        <component :is="getEditComponent(key)" :title="value.title" :name="key" :value="data.model[key]" :data="data.data" :valid="valid(value,key,data.model[key])" :mode="edit" v-if="data.model" />
                                     </template>
                                 </div>
                                 <div class="col-sm-4">{{value.description}}</div>
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/boolean.html b/projects/WebMVC/wwwroot/router/shared/edit/boolean.html
index e674d663..84e54f7a 100644
--- a/projects/WebMVC/wwwroot/router/shared/edit/boolean.html
+++ b/projects/WebMVC/wwwroot/router/shared/edit/boolean.html
@@ -1,10 +1,10 @@
 <template>
-    <div class="form-check">
-        <input type="checkbox" class="form-check-input" style="height:16px;width:16px;" :name="name" :value="value" />
+    <div :data-model="mode">
+        <input type="checkbox" :style="'height:16px;width:16px;'+(mode==='query'?'margin:11px 0;':'margin:6px 0;')" :name="name" :value="value" />
     </div>
 </template>
 <script>
     export default {
-        props: ['title', 'name', 'value', 'data']
+        props: ['title', 'name', 'value', 'data', 'mode']
     };
 </script>
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/multiselectlist.html b/projects/WebMVC/wwwroot/router/shared/edit/multiselectlist.html
index 9c25dd7b..e69c0d79 100644
--- a/projects/WebMVC/wwwroot/router/shared/edit/multiselectlist.html
+++ b/projects/WebMVC/wwwroot/router/shared/edit/multiselectlist.html
@@ -10,7 +10,7 @@
 </template>
 <script>
     export default {
-        props: ['name', 'value', 'data'],
+        props: ['name', 'value', 'valid', 'data', 'prefix'],
         mounted: function () {
             this.$nextTick(function () {
                 $(this.$refs.select).treeMultiselect({
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/selectlist.html b/projects/WebMVC/wwwroot/router/shared/edit/selectlist.html
index d3812d9f..8bf257c1 100644
--- a/projects/WebMVC/wwwroot/router/shared/edit/selectlist.html
+++ b/projects/WebMVC/wwwroot/router/shared/edit/selectlist.html
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <select class="form-control" :name="name">
+        <select class="form-control" :name="name" v-valid="valid">
             <option value="">请选择</option>
             <template v-for="item in list">
                 <option v-if="item.value===value" :value="item.value" selected>{{item.text}}</option>
@@ -11,15 +11,14 @@
 </template>
 <script>
     export default {
-        props: ['name', 'value', 'data','prefix'],
-        computed:{
-            list:function(){
-                var key=this.name;
-                if(this.prefix)
-                {
-                   key=this.name.substring(this.prefix.length+1);
+        props: ['name', 'value', 'valid', 'data', 'prefix'],
+        computed: {
+            list: function () {
+                var key = this.name;
+                if (this.prefix) {
+                    key = this.name.substring(this.prefix.length + 1);
                 }
-                return this.data[key+'SelectList'];
+                return this.data[key + 'SelectList'];
             }
         }
     };
diff --git a/projects/WebMVC/wwwroot/router/shared/edit/string.html b/projects/WebMVC/wwwroot/router/shared/edit/string.html
index c701d153..73032278 100644
--- a/projects/WebMVC/wwwroot/router/shared/edit/string.html
+++ b/projects/WebMVC/wwwroot/router/shared/edit/string.html
@@ -5,6 +5,6 @@
 </template>
 <script>
     export default {
-        props: ['name', 'value', 'property', 'valid']
+        props: ['name', 'value', 'valid', 'data', 'prefix'],
     };
 </script>
\ No newline at end of file
diff --git a/projects/WebMVC/wwwroot/router/shared/list.html b/projects/WebMVC/wwwroot/router/shared/list.html
index d28c784f..26cd26ba 100644
--- a/projects/WebMVC/wwwroot/router/shared/list.html
+++ b/projects/WebMVC/wwwroot/router/shared/list.html
@@ -12,7 +12,7 @@
                                     <div class="form-group row">
                                         <label class="col-sm-3 col-form-label" :for="key">{{value.title}}:</label>
                                         <div class="col-sm-9">
-                                            <component :is="getQueryComponent(value)" :title="value.title" :name="'query.'+key" :value="data.model.query[key]" v-bind:data="data.data" v-bind:prefix="'query'" v-if="data.model.query" />
+                                            <component :is="getQueryComponent(value)" :title="value.title" :name="'query.'+key" :value="data.model.query[key]" :data="data.data" :prefix="'query'" :mode="'query'" v-if="data.model.query" />
                                         </div>
                                     </div>
                                 </div>