From 9229a0136d48afb51028476b3174ca77d804c125 Mon Sep 17 00:00:00 2001
From: wangyan <wangyan@surfbird.cn>
Date: Tue, 26 Apr 2022 14:39:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=8F=E7=9B=AE=E5=92=8C?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/nd/GatewayColumnList.vue    |  9 +++-
 .../modules/nd/modules/GatewayArticleForm.vue | 50 +++++++++++--------
 .../modules/nd/modules/GatewayColumnForm.vue  | 23 +++++++--
 3 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/src/views/modules/nd/GatewayColumnList.vue b/src/views/modules/nd/GatewayColumnList.vue
index 11bc755..2db4ed4 100644
--- a/src/views/modules/nd/GatewayColumnList.vue
+++ b/src/views/modules/nd/GatewayColumnList.vue
@@ -191,10 +191,15 @@
             align:"center",
             dataIndex: 'name'
           },
+          // {
+          //   title:'name',
+          //   align:"center",
+          //   dataIndex: 'nameen'
+          // },
           {
-            title:'name',
+            title:'排序',
             align:"center",
-            dataIndex: 'nameen'
+            dataIndex: 'sort'
           },
           {
             title:'类型',
diff --git a/src/views/modules/nd/modules/GatewayArticleForm.vue b/src/views/modules/nd/modules/GatewayArticleForm.vue
index 95ac966..e0b8c80 100644
--- a/src/views/modules/nd/modules/GatewayArticleForm.vue
+++ b/src/views/modules/nd/modules/GatewayArticleForm.vue
@@ -28,79 +28,85 @@
               <a-input v-decorator="['sysOrgCode']" placeholder="请输入所属部门"  ></a-input>
             </a-form-item>
           </a-col> -->
-          <a-col :span="12">
+          <a-col :span="24">
             <a-form-item label="文章类型" :labelCol="labelCol" :wrapperCol="wrapperCol" help="选择首页轮播后将会在首页显示">
               <!-- <a-input v-decorator="['type']" placeholder="请输入文章类型"  ></a-input> -->
               <j-dict-select-tag type="list" v-decorator="['type', validatorRules.type]" :trigger-change="true" dictCode="gateway_article_type" placeholder="请选择文章类型" />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="24">
             <a-form-item label="栏目" :labelCol="labelCol" :wrapperCol="wrapperCol" help="请选择对应的二级栏目">
               <!-- <a-input v-decorator="['columnId', validatorRules.columnId]" placeholder="请输入栏目"  ></a-input> -->
               <j-dict-select-tag ref="dictRef" type="list" v-decorator="['columnId', validatorRules.parent]" :trigger-change="true" :dictCode="columnIdDictCode" placeholder="请选栏目" />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="24">
             <a-form-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['title', validatorRules.title]" placeholder="请输入标题"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="title" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['titleen', validatorRules.titleen]" placeholder="请输入title"  ></a-input>
             </a-form-item>
-          </a-col>
-          <a-col :span="12">
+          </a-col> -->
+          <a-col :span="24">
             <a-form-item label="封面图" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-image-upload isMultiple  v-decorator="['cover']" ></j-image-upload>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="coveren" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-image-upload isMultiple  v-decorator="['coveren']" ></j-image-upload>
             </a-form-item>
-          </a-col>
-          <a-col :span="12">
+          </a-col> -->
+          <a-col :span="24">
             <a-form-item label="作者" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['author', validatorRules.author]" placeholder="请输入作者"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="author" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['authoren']" placeholder="请输入author"  ></a-input>
             </a-form-item>
-          </a-col>
-          <a-col :span="12">
+          </a-col> -->
+          <a-col :span="24">
             <a-form-item label="来源" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['source', validatorRules.source]" placeholder="请输入来源"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="source" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input v-decorator="['sourceen']" placeholder="请输入source"  ></a-input>
             </a-form-item>
-          </a-col>
-          <a-col :span="12">
+          </a-col> -->
+          <a-col :span="24">
             <a-form-item label="文章内容" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-editor v-decorator="['content',{trigger:'input',rules:validatorRules.content.rules}]" />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :span="24">
+            <a-form-item label="正文文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-upload bizPath="contentFile" v-decorator="['contentFile']" :trigger-change="true"/>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="12">
             <a-form-item label="content" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-editor v-decorator="['contenten',{trigger:'input',rules:validatorRules.contenten.rules}]" />
             </a-form-item>
-          </a-col>
-          <a-col :span="12">
+          </a-col> -->
+          <a-col :span="24">
             <a-form-item label="附件" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload bizPath="fujian" v-decorator="['files']" :trigger-change="true"/>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          
+          <!-- <a-col :span="12">
             <a-form-item label="enclosure" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload bizPath="fujianen" v-decorator="['filesen']" :trigger-change="true"/>
             </a-form-item>
-          </a-col>
-          <a-col :span="12">
+          </a-col> -->
+          <a-col :span="24">
             <a-form-item label="是否发布" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-switch v-decorator="['isRelease', validatorRules.isRelease]"  ></j-switch>
             </a-form-item>
@@ -206,7 +212,7 @@
           },
           content: {
             rules: [
-              { required: true, message: '请输入文章内容!'},
+              // { required: true, message: '请输入文章内容!'},
             ]
           },
           contenten: {
diff --git a/src/views/modules/nd/modules/GatewayColumnForm.vue b/src/views/modules/nd/modules/GatewayColumnForm.vue
index 4195c4e..90cadd7 100644
--- a/src/views/modules/nd/modules/GatewayColumnForm.vue
+++ b/src/views/modules/nd/modules/GatewayColumnForm.vue
@@ -33,10 +33,20 @@
               <a-input v-decorator="['name', validatorRules.name]" placeholder="请输入名称"  ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="name" :labelCol="labelCol" :wrapperCol="wrapperCol" help="显示在门户的英文名字">
               <a-input v-decorator="['nameen',validatorRules.nameen]" placeholder="请输入name"  ></a-input>
             </a-form-item>
+          </a-col> -->
+          <a-col :span="12">
+            <a-form-item label="图标" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-upload bizPath="icon" v-decorator="['icon']" :trigger-change="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol" >
+              <a-input v-decorator="['sort', validatorRules.sort]" placeholder="排序"  ></a-input>
+            </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" help="栏目的类型，不选中则显示在首页头部">
@@ -121,6 +131,13 @@
               { required: true, message: '请输入名称!'},
             ]
           },
+          sort: {
+            rules: [
+              { required: true, message: '请输入排序!'},
+              { pattern: /^[0-9]+(.[0-9]{1,2})?$/, message: '请输入小数范围两位内的数字 !'}
+            ],
+            initialValue:1
+          },
           nameen: {
             rules: [
               { required: true, message: ' Please Input Name!'},
@@ -184,7 +201,7 @@
         this.model = Object.assign({}, record);
         this.visible = true;
         this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model,'createBy','createTime','updateBy','updateTime','sysOrgCode','name','nameen','type','parent','isEnable'))
+          this.form.setFieldsValue(pick(this.model,'createBy','createTime','updateBy','updateTime','sysOrgCode','name','nameen','type','parent','isEnable','icon','sort'))
         })
       },
       //渲染流程表单数据
@@ -230,7 +247,7 @@
         })
       },
       popupCallback(row){
-        this.form.setFieldsValue(pick(row,'createBy','createTime','updateBy','updateTime','sysOrgCode','name','nameen','type','parent','isEnable'))
+        this.form.setFieldsValue(pick(row,'createBy','createTime','updateBy','updateTime','sysOrgCode','name','nameen','type','parent','isEnable','icon','sort'))
       },
     }
   }