diff --git a/app/Models/Option.php b/app/Models/Option.php new file mode 100755 index 00000000..12f753ec --- /dev/null +++ b/app/Models/Option.php @@ -0,0 +1,47 @@ +first()?->v; + + return $v; + } + + public static function _list() + { + $oSelf = self::get(); + + return self::_filterList($oSelf); + } + + public static function _filter($oOption) + { + $arr = []; + $arr[$oOption->k] = $oOption->v; + + return $arr; + } + + public static function _filterList($oOption) + { + $arr = []; + foreach ($oOption as $oOptionRow) { + $arr[] = self::_filter($oOptionRow); + } + + return $arr; + } + +} diff --git a/app/Services/TG/Hook/Dog.php b/app/Services/TG/Hook/Dog.php index ac2ed181..e5669879 100644 --- a/app/Services/TG/Hook/Dog.php +++ b/app/Services/TG/Hook/Dog.php @@ -14,14 +14,14 @@ use App\Models\Option as ModelOption; // $this->oDog->_setInFormat(["type"]); // 可选,zero^int,^date,^dateFull // $this->oDog->_setOutFormat(["time" => "date"]); // 可选,date,dateFull -class Dog extends Base { +class Dog extends Mod\Base { public $oModelSelf; public $sPrimaryKey = "id"; public $iStrMaxLen = 50; public $aStrField = []; - public $inFormat = []; - public $outFormat = []; + public $aInFormat = []; + public $aOutFormat = []; public $sDogName; public function __construct($oModelSelf = false) diff --git a/app/Services/TG/Hook/Mod/Option.php b/app/Services/TG/Hook/Mod/Option.php new file mode 100644 index 00000000..c373382a --- /dev/null +++ b/app/Services/TG/Hook/Mod/Option.php @@ -0,0 +1,49 @@ +oDog = new Dog(new ModelOption()); + $this->oDog->_setPrimaryKey("k"); // 可选,默认id + $this->oDog->_setDogName("option"); // 必须 + } + + public function __call($sName, $aArg) + { + return $this->oDog->$sName($aArg[0]); + } + +// public function Pause($aParam) +// { +// $v = $aParam['aArg'][1]; +// +// // 获取第一个匹配的选项 +// $oOption = ModelOption::where("type", "pause")->first(); +// +// // 检查是否找到了选项 +// if ($oOption) { +// $oOption->value = $v; +// +// // 保存并返回结果 +// return json_encode($oOption->save()); +// } +// +// // 如果没有找到选项,返回一个错误信息 +// return json_encode(['error' => 'Option not found']); +// } +// +// public function List() +// { +// $aOptionList = ModelOption::all()->toArray(); +// +// return json_encode($aOptionList, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT); +// } + +} diff --git a/resources/views/cmd.blade.php b/resources/views/cmd.blade.php index b69feae1..c0b7a697 100644 --- a/resources/views/cmd.blade.php +++ b/resources/views/cmd.blade.php @@ -346,8 +346,10 @@ $(document).ready(function(){ } if (event.shiftKey && event.metaKey && event.key === 'Enter') { + + //submit("input"); - submit("input"); + submit($('input[name="cmd_text"]').first(), "input"); }