[增添]增添了datasource中的配置参数及对应页面

2024-08-27 16:00:00 +08:00
parent 205c74ddbe
commit 016e6b215d
4 changed files with 84 additions and 20 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,13 +5,10 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="596fb1a0-d6fb-4db8-a922-13b01593ce79" name="更改" comment="[修改]修改了Exporter变量名称及页面配置">
-      <change afterPath="$PROJECT_DIR$/management-panel/app/Settings/ExporterSettings.php" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/management-panel/database/settings/2024_08_27_023643_exporter_settings.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/management-panel/app/Filament/Pages/ManageExposer.php" beforeDir="false" afterPath="$PROJECT_DIR$/management-panel/app/Filament/Pages/ManageExporter.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/management-panel/app/Settings/ExposerSettings.php" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/management-panel/database/settings/2024_08_27_023643_exposer_settings.php" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/management-panel/app/Filament/Pages/ManageDataSource.php" beforeDir="false" afterPath="$PROJECT_DIR$/management-panel/app/Filament/Pages/ManageDataSource.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/management-panel/app/Settings/DataSourceSettings.php" beforeDir="false" afterPath="$PROJECT_DIR$/management-panel/app/Settings/DataSourceSettings.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/management-panel/database/settings/2024_08_27_015013_data_source_settings.php" beforeDir="false" afterPath="$PROJECT_DIR$/management-panel/database/settings/2024_08_27_015013_data_source_settings.php" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -303,19 +300,19 @@
    <option name="hideEmptyMiddlePackages" value="true" />
    <option name="showLibraryContents" value="true" />
  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "master",
-    "last_opened_file_path": "E:/data-collection-terminal",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;last_opened_file_path&quot;: &quot;E:/data-collection-terminal&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
  }
-}]]></component>
+}</component>
  <component name="RecentsManager">
    <key name="CopyFile.RECENT_KEYS">
      <recent name="E:\data-collection-terminal\management-panel\app" />
@@ -363,6 +360,7 @@
      <workItem from="1724723165774" duration="1511000" />
      <workItem from="1724724784154" duration="12793000" />
      <workItem from="1724743649380" duration="22000" />
+      <workItem from="1724743707590" duration="1543000" />
    </task>
    <task id="LOCAL-00001" summary="[增添]添加注册">
      <option name="closed" value="true" />
@@ -444,13 +442,51 @@
      <option name="project" value="LOCAL" />
      <updated>1724743562420</updated>
    </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="[修改]修改了Exporter变量名称及页面配置">
+      <option name="closed" value="true" />
+      <created>1724743728810</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1724743728810</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
    <option name="version" value="3" />
  </component>
  <component name="Vcs.Log.Tabs.Properties">
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list>
+              <RecentGroup>
+                <option name="FILTER_VALUES">
+                  <option value="HEAD" />
+                </option>
+              </RecentGroup>
+              <RecentGroup>
+                <option name="FILTER_VALUES">
+                  <option value="origin/feature/panel" />
+                </option>
+              </RecentGroup>
+              <RecentGroup>
+                <option name="FILTER_VALUES">
+                  <option value="origin/master" />
+                </option>
+              </RecentGroup>
+              <RecentGroup>
+                <option name="FILTER_VALUES">
+                  <option value="master" />
+                </option>
+              </RecentGroup>
+            </list>
+          </value>
+        </entry>
+      </map>
+    </option>
    <option name="TAB_STATES">
      <map>
        <entry key="MAIN">
--- a/management-panel/app/Filament/Pages/ManageDataSource.php
+++ b/management-panel/app/Filament/Pages/ManageDataSource.php
@@ -51,6 +51,25 @@ class ManageDataSource extends SettingsPage
                            ->label('opcua服务地址')
                            ->prefix('opc.tcp://')
                            ->required(),
+
+                        Select::make('read_mode')
+                            ->label("读取模式")
+                            ->options([
+                                'Sync' => '同步模式',
+                                'Async' => '异步模式',
+                                'Monitor' => '监控模式',
+                            ])
+                            ->required(),
+
+                        TextInput::make('cache_update')
+                            ->label("缓存更新时间")
+                            ->suffix("ms")
+                            ->required(),
+
+                        TextInput::make('cache_timeout')
+                            ->label("缓存超时时间")
+                            ->suffix("ms")
+                            ->required()
                    ])
                    ->visible(fn($get) => in_array($get('data_source_type'), ['opcua'])),

--- a/management-panel/app/Settings/DataSourceSettings.php
+++ b/management-panel/app/Settings/DataSourceSettings.php
@@ -38,7 +38,12 @@ class DataSourceSettings extends Settings
    public string $key_identity_file;
    //启用
    public bool  $state;
-
+    //读取模式
+    public ?string $read_mode;
+    //缓存更新
+    public int $cache_update;
+    //缓存超时
+    public int $cache_timeout;

    public static function group(): string
    {
--- a/management-panel/database/settings/2024_08_27_015013_data_source_settings.php
+++ b/management-panel/database/settings/2024_08_27_015013_data_source_settings.php
@@ -22,5 +22,9 @@ return new class extends SettingsMigration
        $this->migrator->add('datasource.certificate_identity_file', '');
        $this->migrator->add('datasource.key_identity_file', '');
        $this->migrator->add('datasource.state', false);
+
+        $this->migrator->add('datasource.read_mode', "sync");
+        $this->migrator->add('datasource.cache_update', 500);
+        $this->migrator->add('datasource.cache_timeout', 1000);
    }
 };