Merge remote-tracking branch 'origin/build' into build

packages/wxwork/Announce/AppAnnounce/components/Add.vue

@@ -281,7 +281,7 @@
             <el-button @click="onDateForm" type="primary" :loading="isLoading2" style="width: 92px;">确认</el-button>
           </div>
         </ai-dialog>
-        <ChooseMaterial ref="ChooseMaterial" :instance="instance"></ChooseMaterial>
+        <!-- <ChooseMaterial ref="ChooseMaterial" :instance="instance"></ChooseMaterial> -->
       </div>
     </template>
     <template #footer>
@@ -294,7 +294,7 @@
 
 <script>
 import Phone from './Phone'
-import ChooseMaterial from '../../../AppMaterialLibrary/components/ChooseMaterial.vue'
+// import ChooseMaterial from '../../../AppMaterialLibrary/components/ChooseMaterial.vue'
 import { mapActions, mapState } from 'vuex'
 
 export default {
@@ -308,7 +308,7 @@ export default {
 
   components: {
     Phone,
-    ChooseMaterial
+    // ChooseMaterial
   },
 
   data() {

packages/wxwork/AppMaterialLibrary/components/List.vue

@@ -322,6 +322,8 @@
               ...this.form,
               type: this.currIndex,
               fileUrl: this.form.fileUrl.length ? this.form.fileUrl[0].url : '',
+              fileId: this.form.fileUrl.length ? this.form.fileUrl[0].id : '',
+              pictureId: this.form.pictureUrl.length ? this.form.pictureUrl[0].id : '',
               pictureUrl: this.form.pictureUrl.length ? this.form.pictureUrl[0].url : '',
               fileSize: this.form.fileUrl.length ? this.form.fileUrl[0].fileSize : '',
             }).then(res => {