gx

@@ -76,6 +76,9 @@ class ExtensionModuleController extends BaseController
                 $v['is_use'] = 1;
                 $v['is_use'] = 1;
             }
             }
             $list[$k] = $v;
             $list[$k] = $v;
+            if(!empty($v['data'])){
+                $v['data'] = json_decode($v['data'],true);
+            }
         }
         }
         $this->response('success',Code::SUCCESS,$list);
         $this->response('success',Code::SUCCESS,$list);
     }
     }
@@ -224,7 +227,34 @@ class ExtensionModuleController extends BaseController
      * @time   :2024/8/20 10:31
      * @time   :2024/8/20 10:31
      */
      */
     public function sendUniqueStr(){
     public function sendUniqueStr(){
-        $uniqueString = md5(time() . rand(1000, 9999));
+        $this->request->validate([
+            'id'=>'required',
+        ],[
+            'id.required' => '字段id不能为空',
+        ]);
+        $uniqueString = date('YmdHis');
+        //查看当前字段id的data
+        $moduleFieldModel = new ExtensionModuleField();
+        $info = $moduleFieldModel->read(['id'=>$this->param['id']]);
+        if(empty($info['data'])){
+            $uniqueString = md5(time() . rand(1000, 9999));
+        }else{
+            $data = json_decode($info['data']);
+            foreach ($data as  $v){
+                foreach ($v as $k => $sonV){
+                    if($k == 1){
+                        $uniqueString .= $sonV;
+                    }elseif ($k == 2){
+                        $uniqueString .= date('YmdHis');
+                    }elseif ($k == 3){
+                        $uniqueString .= uniqid(date());
+                    }else{
+                        $randomString = md5(uniqid(mt_rand(), true));
+                        $uniqueString .= substr($randomString, 0, (int)$sonV);
+                    }
+                }
+            }
+        }
         $this->response('success',Code::SUCCESS,['str'=>$uniqueString]);
         $this->response('success',Code::SUCCESS,['str'=>$uniqueString]);
     }
     }
 }
 }

@@ -39,6 +39,9 @@ class ExtensionModuleFieldLogic extends BaseLogic
         if($info !== false){
         if($info !== false){
             $this->fail('当前字段名已存在');
             $this->fail('当前字段名已存在');
         }
         }
+        if(isset($this->param['data']) && !empty($this->param['data'])){
+            $this->param['data'] = json_encode($this->param['data']);
+        }
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $id = $this->param['id'];
             $id = $this->param['id'];
             $this->model->edit($this->param,['id'=>$id]);
             $this->model->edit($this->param,['id'=>$id]);
@@ -59,11 +62,11 @@ class ExtensionModuleFieldLogic extends BaseLogic
     public function delModuleField(){
     public function delModuleField(){
         //查看当前字段是否在使用
         //查看当前字段是否在使用
         $moduleValueModel = new ExtensionModuleValue();
         $moduleValueModel = new ExtensionModuleValue();
-        $info = $moduleValueModel->read(['filed_id'=>$this->param['filed_id']]);
+        $info = $moduleValueModel->read(['field_id'=>$this->param['field_id']]);
         if($info !== false){
         if($info !== false){
             $this->fail('当前字段正在使用中,不允许删除');
             $this->fail('当前字段正在使用中,不允许删除');
         }
         }
-        $this->model->del(['id'=>$this->param['filed_id']]);
+        $this->model->del(['id'=>$this->param['field_id']]);
         return $this->success();
         return $this->success();
     }
     }
 }
 }