Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

crmeb/crmeb/services/upload/storage/Local.php

@@ -150,11 +150,11 @@ class Local extends BaseUpload
 
     /**
      * 文件流上传
-     * @param string $fileContent
+     * @param $fileContent
      * @param string|null $key
      * @return array|bool|mixed|\StdClass
      */
-    public function stream(string $fileContent, string $key = null)
+    public function stream($fileContent, string $key = null)
     {
         if (!$key) {
             $key = $this->saveFileName();

template/admin/src/pages/marketing/lottery/addGoods.vue

@@ -49,7 +49,7 @@
           </div>
         </template>
         <div v-else class="upLoad pictrueTab acea-row row-center-wrapper">
-          <Icon type="ios-camera-outline" size="26" @click="modals = true" />
+          <Icon type="ios-camera-outline" size="26" @click="changeGoods" />
         </div>
       </FormItem>
       <FormItem label="奖品名称" prop="name">
@@ -116,7 +116,7 @@
       width="900"
       @on-cancel="cancel"
     >
-      <goods-list ref="goodslist" v-if="modals" @getProductId="getProductId"></goods-list>
+      <goods-list ref="goodslist" @getProductId="getProductId"></goods-list>
     </Modal>
     <coupon-list ref="couponTemplates" :luckDraw="true" @getCouponId="getCouponId"></coupon-list>
     <!--<coupon-list-->
@@ -232,6 +232,14 @@ export default {
     });
   },
   methods: {
+    // 选择商品
+    changeGoods() {
+      this.modals = true;
+      this.$refs.goodslist.formValidate.is_presale = 0;
+      this.$refs.goodslist.formValidate.is_virtual = 0;
+      this.$refs.goodslist.getList();
+      this.$refs.goodslist.goodsCategory();
+    }, 
     getCouponId(e) {
       this.formValidate.coupon_id = e.id;
       this.formValidate.coupon_title = e.coupon_title;

template/admin/src/pages/marketing/storeBargain/create.vue

@@ -955,6 +955,7 @@ export default {
     changeGoods() {
       this.modals = true;
       this.$refs.goodslist.formValidate.is_presale = 0;
+      this.$refs.goodslist.formValidate.is_virtual = 0;
       this.$refs.goodslist.getList();
       this.$refs.goodslist.goodsCategory();
     },

template/admin/src/pages/marketing/storeCombination/create.vue

@@ -949,6 +949,7 @@ export default {
     changeGoods() {
       this.modals = true;
       this.$refs.goodslist.formValidate.is_presale = 0;
+      this.$refs.goodslist.formValidate.is_virtual = 0;
       this.$refs.goodslist.getList();
       this.$refs.goodslist.goodsCategory();
     },

template/admin/src/pages/marketing/storeIntegral/create.vue

@@ -699,6 +699,7 @@ export default {
     changeGoods() {
       this.modals = true;
       this.$refs.goodslist.formValidate.is_presale = 0;
+      this.$refs.goodslist.formValidate.is_virtual = 0;
       this.$refs.goodslist.getList();
       this.$refs.goodslist.goodsCategory();
     }, // 移动

template/admin/src/pages/marketing/storeSeckill/create.vue

@@ -875,6 +875,7 @@ export default {
     changeGoods() {
       this.modals = true;
       this.$refs.goodslist.formValidate.is_presale = 0;
+      this.$refs.goodslist.formValidate.is_virtual = 0;
       this.$refs.goodslist.getList();
       this.$refs.goodslist.goodsCategory();
     }, // 移动

template/admin/src/pages/setting/systemOutInterface/index.vue

@@ -1010,6 +1010,8 @@ export default {
 
     .text-area {
       white-space: pre-wrap;
+      word-break: break-word;
+
     }
   }
 

template/admin/src/pages/system/backendRouting/debugging.vue

@@ -330,11 +330,7 @@ export default {
           ? this.jsonBody
           : this.filtersData((await this.$refs.yTable.getTableData().tableData) || []);
       let h = this.filtersData((await this.$refs.zTable.getTableData().tableData) || []);
-      let h1 = this.filtersData((await this.$refs.zaTable.getTableData().tableData) || []);
-      headers = {
-        ...h,
-        ...h1,
-      };
+      headers = h;
       console.log(url, method, params, body, headers);
       this.codes = '';
       requestMethod(url, method, params, body, headers)

template/admin/src/pages/system/backendRouting/index.vue

@@ -9,11 +9,11 @@
           </template>
         </Tree> -->
       <!-- <Tree :data="treeData" :render="renderContent" class="demo-tree-render"></Tree> -->
-      <Card :bordered="false" dis-hover class="ivu-mt mr20 card-tree">
+      <div class="ivu-mt mr20 card-tree">
         <div class="tree">
           <div class="main-btn">
             <Button class="mb5 mr10" style="flex: 1" type="primary" @click="clickMenu(4)" long>新增分类</Button>
-            <Button type="success mr10" @click="syncRoute()">同步</Button>
+            <Button class="mr10" type="success" @click="syncRoute()">同步</Button>
             <Button type="info" @click="debugging()">调试</Button>
           </div>
 
@@ -24,7 +24,8 @@
             :model="treeData"
             default-tree-node-name="默认文件夹"
             default-leaf-node-name="默认接口名"
-            v-bind:default-expanded="true"
+            v-bind:default-expanded="false"
+            :expand-only-one="true"
           >
             <template v-slot:leafNameDisplay="slotProps">
               <div></div>
@@ -84,7 +85,7 @@
             </template>
           </vue-tree-list>
         </div>
-      </Card>
+      </div>
       <Card :bordered="false" dis-hover class="ivu-mt right-card">
         <div class="data">
           <div class="eidt-sub">
@@ -581,9 +582,15 @@ export default {
   },
   methods: {
     syncRoute() {
-      syncRoute(this.app_name).then((res) => {
-        this.getInterfaceList('one');
-        this.$Message.success(res.msg);
+      this.$Modal.warning({
+        title: '立即同步',
+        content: '您确认立即同步路由权限？',
+        onOk: () => {
+          syncRoute(this.app_name).then((res) => {
+            this.getInterfaceList('one');
+            this.$Message.success(res.msg);
+          });
+        },
       });
     },
     debugging() {
@@ -616,6 +623,9 @@ export default {
             if (res.data.length) {
               res.data[0].expand = false;
               this.treeData = new Tree(res.data);
+              this.$nextTick((e) => {
+                if (disk_type) document.querySelectorAll('.vtl-icon-caret-right')[0].click();
+              });
               if (res.data[0].children && res.data[0].children.length) {
                 this.onClick(res.data[0].children[0]);
               }
@@ -960,12 +970,14 @@ export default {
   margin-left: 10px;
 }
 .card-tree {
+   background: #fff;
    height: 72px;
    box-sizing: border-box;
    overflow-x: scroll; /* 设置溢出滚动 */
    white-space: nowrap;
    overflow-y: hidden;
    /* 隐藏滚动条 */
+   border-radius: 4px;
    scrollbar-width: none; /* firefox */
    -ms-overflow-style: none; /* IE 10+ */
 }
@@ -977,15 +989,23 @@ export default {
   display: flex;
   .main-btn {
     display:flex;
+    position: sticky;
+    padding: 15px 15px 0 15px;
+    width: 100%;
+    background: #fff;
+    top: 0px;
+    background-color: rgba(255, 255, 255, 0.6);
+    backdrop-filter: blur(4px);
   }
   .card-tree{
-    width: 270px;
+    width: 290px;
     height: calc(100vh - 115px);
     overflow-y: scroll;
   }
   >>> .tree {
     .tree-list{
       margin-left:10px;
+      padding: 0 15px;
 
     }
     .vtl-caret{

template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue

@@ -45,7 +45,12 @@
         <div class="tip">用于生成模块名称</div>
       </FormItem>
       <FormItem label="表名" prop="tableName">
-        <Input class="form-width" v-model="foundation.tableName" placeholder="请输入表名" @on-blur="initfield"></Input>
+        <Input
+          class="form-width"
+          v-model="foundation.tableName"
+          placeholder="请输入表名"
+          @on-blur="initTableName"
+        ></Input>
         <div class="tip">
           用于生成CRUD指定的表名，不需要携带表前缀；对于生成过的表将不能在进行生成；或者可以删除对应的文件重新生成！对应系统中重要的数据表将不允许生成！
         </div>
@@ -269,6 +274,9 @@ export default {
         this.addRow();
       }
     },
+    initTableName() {
+      this.tableField = [];
+    },
     addRow() {
       if (!this.foundation.tableName) return this.$Message.warning('请先填写表名');
       if (!this.tableField.length) {