feat: Supporting regex when matching override name #421

xobserve · Apr 20, 2024 · 61cd5b7 · 61cd5b7
1 parent 98ee1e8
commit 61cd5b7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/datav/frontend/src/utils/dashboard/panel.ts b/datav/frontend/src/utils/dashboard/panel.ts
@@ -29,7 +29,7 @@ export const findOverrideRule = (panel: Panel, overideTarget, ruleType) => {
 }
 
 export const findOverride = (panel: Panel, overideTarget) => {
-  return panel.overrides.find((o) => o.target == overideTarget)
+  return panel.overrides.find((o) => overideTarget.match(o.target))
 }
 
 export const findRuleInOverride = (override: OverrideItem, ruleType) => {

diff --git a/datav/frontend/src/views/dashboard/edit-panel/PanelOverrides.tsx b/datav/frontend/src/views/dashboard/edit-panel/PanelOverrides.tsx
@@ -34,6 +34,7 @@ import { PanelForceRebuildEvent } from 'src/data/bus-events'
 import { MobileBreakpoint } from 'src/data/constants'
 import { externalPanelPlugins } from '../plugins/external/plugins'
 import { builtinPanelPlugins } from '../plugins/built-in/plugins'
+import InputSelect from 'components/select/InputSelect'
 
 const PanelOverrides = ({ panel, onChange, data }: PanelEditorProps) => {
   const t1 = useStore(panelMsg)
@@ -115,23 +116,15 @@ const PanelOverrides = ({ panel, onChange, data }: PanelEditorProps) => {
             <FaTimes fontSize='0.8rem' />
           </Box>
           <FormItem title={t1.targetName} alignItems='center'>
-            <Select
-              style={{ minWidth: isLargeScreen ? '150px' : '100px' }}
-              showSearch
-              size='large'
-              value={o.target}
-              onChange={(v) => {
-                onChange((panel: Panel) => {
-                  const o = panel.overrides[i]
-                  o.target = v
-                })
-              }}
-              options={names.map((name, i) => ({
-                value: name.value,
-                label: name.label,
-              }))}
-              popupMatchSelectWidth={false}
-            />
+            <InputSelect value={o.target} options={names.map((name, i) => ({
+              value: name.value,
+              label: name.label,
+            }))} onChange={(v) => {
+              onChange((panel: Panel) => {
+                const o = panel.overrides[i]
+                o.target = v
+              })
+            }} />
           </FormItem>
 
           <VStack