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

crmeb/app/adminapi/controller/v1/setting/SystemCrud.php

@@ -87,18 +87,25 @@ class SystemCrud extends AuthController
                 ];
             }
             if ($item['from_type']) {
-                if (!$item['table_name']) {
-                    return app('json')->fail('表单标题必须填写');
+                $name = $item['table_name'] ?: $item['comment'];
+                if (!$name) {
+                    return app('json')->fail($item['field'] . '字段的表单标题必须填写');
                 }
                 $fromField[] = [
                     'field' => $item['field'],
                     'type' => $item['from_type'],
-                    'name' => $item['table_name'],
+                    'name' => $name,
                     'required' => $item['required'],
                     'option' => $item['option'] ?? [],
                 ];
             }
         }
+        if (!$fromField) {
+            return app('json')->fail('至少选择一个字段作为表单项');
+        }
+        if (!$columnField) {
+            return app('json')->fail('至少选择一个字段作为列展示在列表中');
+        }
         $data['fromField'] = $fromField;
         $data['columnField'] = $columnField;
         if (!$data['tableName']) {
@@ -134,17 +141,7 @@ class SystemCrud extends AuthController
 
         $routeName = 'crud/' . Str::snake($tableName);
 
-        $make = $this->services->makeFile($tableName, $routeName, false, [
-            'menuName' => '',
-            'fromField' => [],
-            'columnField' => [],
-        ]);
-
-        $makePath = [];
-        foreach ($make as $key => $item) {
-            $makePath[$key] = $item['path'];
-        }
-
+        $key = 'id';
         $tableField = [];
         if ($isTable) {
             $field = $this->services->getColumnNamesList($tableName);
@@ -152,6 +149,9 @@ class SystemCrud extends AuthController
                 return app('json')->fail('表不存在');
             }
             foreach ($field as $item) {
+                if ($item['primaryKey']) {
+                    $key = $item['name'];
+                }
                 $tableField[] = [
                     'field' => $item['name'],
                     'field_type' => $item['type'],
@@ -167,6 +167,18 @@ class SystemCrud extends AuthController
             }
         }
 
+        $make = $this->services->makeFile($tableName, $routeName, false, [
+            'menuName' => '',
+            'key' => $key,
+            'fromField' => [],
+            'columnField' => [],
+        ]);
+
+        $makePath = [];
+        foreach ($make as $k => $item) {
+            $makePath[$k] = $item['path'];
+        }
+
         return app('json')->success(compact('makePath', 'tableField'));
     }
 

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();

crmeb/public/admin/system_static/css/chunk-fde7c08a.978c76f0.css

@@ -0,0 +1 @@
+.tabBox_img[data-v-ce9e058c]{width:36px;height:36px;border-radius:4px;cursor:pointer}.tabBox_img img[data-v-ce9e058c]{width:100%;height:100%}

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();
     }, // 移动