jufubao-admin-library 1.1.171 → 1.1.172

package/library/viewModules/viewsMaterial/viewsMaterial/components/CusUpload.vue

@@ -56,8 +56,11 @@
               <span>{{item.name|fitersName}}</span>
             </div>
           </draggable>
-          <div><el-button
+          <div>
+            <div style="margin-bottom: 10px"><span style="color:#999999;font-size:12px">(上传文件格式：JPG/PNG/JPEG/GIF，不超过5MB)</span></div>
+            <el-button
             type="primary"
+            size="small"
             :disabled="isBtnMaterialMore || disabled"
             @click="isDialogShow=true"
           >{{materialBtnName}}</el-button></div>
@@ -249,8 +252,9 @@
             :limit="limit"
             multiple
           >
-            <div class="xd-upload__list-btn">
+             <div class="xd-upload__list-btn" style="text-align: left;">
               <slot>
+                <div style="margin-bottom: 10px"><span style="color:#999999;font-size:12px">(上传文件格式：JPG/PNG/JPEG/GIF，不超过5MB)</span></div>
                 <el-button :disabled="!(showList.length < limit ) || disabled" size="small" type="primary">{{uploadName}}</el-button>
               </slot>
               <div class="xd-upload__disabled" v-if="disabled"></div>
@@ -327,7 +331,7 @@
    * @slot tip插槽：提示文案插槽（one，list，''）
    *
    */
-  import dialogMaterial from "@/viewsMaterial/dialogMaterial.vue";
+  // import dialogMaterial from "@/viewsMaterial/dialogMaterial.vue";
   import XdFontIcon from "@/components/XdFontIcon.vue";
 	import {Loading} from 'element-ui';
 	import draggable from 'vuedraggable';
@@ -341,7 +345,7 @@
     components: {
       XdItemImage,
       draggable,
-      dialogMaterial,
+      // dialogMaterial,
       XdFontIcon
     },
 		props: {
@@ -567,6 +571,7 @@
             url: temp['url'] || temp['file_src'],
             name: temp['name'] || temp['file_name'],
             uid: temp['uid'] || temp['file_id'],
+            file_id: temp['file_id'] || '',
           }
           this.update(this.oneItem);
         }
@@ -578,6 +583,7 @@
               url: item['url'] || item['file_src'],
               name: item['name'] || item['file_name'],
               uid: item['uid'] || item['file_id'],
+              file_id: item['file_id'] || '',
             }
           });
           this.showList = this.$xdHelper.cloneDeep(this.showList).concat(list).map((item)=>{

package/library/viewModules/viewsMaterial/viewsMaterial/components/uploadForm.vue

@@ -3,7 +3,18 @@
     <div class="form-wrap">
       <div class="form-input">
         <div>
-          <div style="margin-bottom: 10px">添加素材：<span style="color:#999999;font-size:12px">(上传文件格式：JPG/PNG/JPEG/GIF，不超过5MB)</span></div>
+          <!-- <div style="margin-bottom: 10px">添加素材：<span style="color:#999999;font-size:12px">(上传文件格式：JPG/PNG/JPEG/GIF，不超过5MB)</span></div> -->
+          <el-form ref="radioForm" :model="radioForm" label-width="65px">
+            <el-form-item label="上传方式">
+              <el-radio-group v-model="radioForm.method" @change="handleRaidoMethodChange">
+                <el-radio
+                  v-for="item in radioOptions"
+                  :key="item.value"
+                  :label="item.value"
+                >{{ item.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-form>
           <cus-upload
             v-model="form.file_info"
             action="action"
@@ -12,9 +23,11 @@
             tipsformet="上传文件格式：@imageType@，不超过@size@MB."
             styleType="list"
             uploadType="aliyun"
-            :is-material="false"
+            :is-material="radioForm.method==='local'?false:true"
             :isHideFileName="true"
+            :materialBtnName="'上传'"
             :sort="true"
+            :key="cusUploadKey"
             :showtype="false"
             listSize="100*100"
             :maxlen="100"
@@ -66,7 +79,7 @@ import XdUpload from "@/components/XdUpload.vue";
 import handleUpdate from "@/mixins/handleUpdate";
 import CusUpload from "./CusUpload.vue";
 export default {
-  name: "Form",
+  name: "UploadForm",
   components: {
     XdUpload,
     CusUpload,
@@ -100,6 +113,19 @@ export default {
         status: "",
         file_info: [],
       },
+      radioForm:{
+        method: 'local',
+      },
+      radioOptions:[
+        {
+          label:'直接上传',
+          value:'local'
+        },{
+          label:'选择素材',
+          value:'material'
+        }
+      ],
+      cusUploadKey:'cusUploadKey',
     };
   },
   created() {
@@ -167,6 +193,9 @@ export default {
         });
       }
     },
+    handleRaidoMethodChange(){
+      this.cusUploadKey = Date.now();
+    },
   },
 };
 </script>
@@ -226,4 +255,11 @@ export default {
   color: #409eff;
   background: #ecf5ff;
 }
+::v-deep .form-input .el-form-item__label{
+  width: 65px !important;
+  text-align: left !important;
+  padding: 0 !important;
+  color: #333333!important;
+  font-weight: 400!important;
+}
 </style>

package/library/viewModules/viewsMaterial/viewsMaterial/dialogMaterial.vue

@@ -75,7 +75,7 @@ import company from "./dialog/component/company.vue";
 import share from "./dialog/component/share.vue";
 
 export default {
-  name: "XdMaterial",
+  name: "DialogMaterial",
   props: {
     setting: {
       type: Object,
@@ -197,6 +197,7 @@ export default {
           url: item.file_url,
           name: item.file_name,
           uid: item.file_uid,
+          file_id: item.file_id||'',
         };
       })
 

package/library/viewModules/viewsMaterial/viewsMaterial/material.vue

@@ -125,6 +125,7 @@ import uploadForm from "./components/uploadForm";
 import { mapActions } from "vuex";
 import axios from "axios";
 export default {
+  name: "Material",
   components: {
     XdPagination,
     XdDialog,
@@ -361,6 +362,7 @@ export default {
       this.addMaterial(data)
         .then((res) => {
           this.uploadVisible = false;
+          this.materialForm = {};
           this.getList(this.searchParams);
         })
         .catch((err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.171",
+  "version": "1.1.172",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {