diff --git a/src/pages/home/QuickEntryPage.vue b/src/pages/home/QuickEntryPage.vue
index 3e7f2e3..98e4bf5 100644
--- a/src/pages/home/QuickEntryPage.vue
+++ b/src/pages/home/QuickEntryPage.vue
@@ -88,8 +88,10 @@
/>
-
+
{
padding: 0 1rem;
}
- .source-value-panel {
- padding: .75rem 1rem 1rem;
-
- .source-value-title {
- font-weight: 700;
- }
-
- .t-input {
- margin-top: .5rem;
- border: 1px solid var(--td-component-border);
- border-radius: .75rem;
- }
- }
-
.photo {
width: 100%;
@@ -882,11 +870,6 @@ watch(scanCode, (value) => {
}
}
- .source-value-panel .t-input {
- background: rgba(15, 23, 42, .72);
- border-color: rgba(148, 163, 184, .16);
- }
-
:deep(.textarea .t-textarea__inner) {
color: #e2e8f0;
background: rgba(15, 23, 42, .72);
diff --git a/src/utils/point.ts b/src/utils/point.ts
index bfe06d2..aadb026 100644
--- a/src/utils/point.ts
+++ b/src/utils/point.ts
@@ -75,36 +75,10 @@ export function resolvePointRuleAction(rule: PointRule): PointAction | undefined
}
function resolvePointValueRuleConfig(rule: PointRule): SourceValueConfig | undefined {
- if (rule.status !== "ACTIVE") {
+ if (rule.status !== "ACTIVE" || rule.triggerType !== "SOURCE_VALUE" || rule.pointMode !== "SOURCE_VALUE") {
return undefined;
}
- if (rule.pointMode === "FIXED") {
- return resolveFixedPointValueRuleConfig(rule);
- }
- if (rule.triggerType === "SOURCE_VALUE" && rule.pointMode === "SOURCE_VALUE") {
- return resolveSourceValueRuleConfig(rule);
- }
- return undefined;
-}
-
-function resolveFixedPointValueRuleConfig(rule: PointRule): SourceValueConfig | undefined {
- const action = resolvePointRuleAction(rule);
- const pointValue = rule.pointValue;
- if (
- action === undefined
- || pointValue === undefined
- || pointValue === null
- || !Number.isSafeInteger(pointValue)
- || pointValue === 0
- ) {
- return undefined;
- }
-
- const value = Math.abs(pointValue);
- return {
- action,
- range: [value, value]
- };
+ return resolveSourceValueRuleConfig(rule);
}
function resolveSourceValueRuleConfig(rule: PointRule): SourceValueConfig | undefined {