Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/system/webkit-form.vue

@@ -9,7 +9,7 @@
         <div class="row wrap">
           <q-input filled stack-label maxlength="50" :dense="false" v-model="objOption.NavTitle" ref="NavTitle"
             class="col-12 q-pb-lg" label="导航主标题" :rules="[val => !!val || '请填写导航主标题']" />
-          <q-input v-model="objOption.SubTitle" class="col-12 q-pb-lg" filled type="textarea" placeholder="导航子标题" maxlength="300" />
+          <q-input v-model="objOption.SubTitle" class="col-12 q-pb-lg" filled type="textarea" placeholder="导航子标题"/>
           <q-input stack-label maxlength="200" :dense="false" v-model="objOption.LinkUrl" class="col-6 q-pr-lg q-pb-lg"
             label="链接地址" />
           <q-select class="col-6 q-pb-lg" option-value="Id" option-label="Name" v-model="objOption.NavType"