dsh-niuma 0.2.0 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-niuma",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "牛马加速器 — DSH 工资换算实时计数器：按实收月薪、上下班时间、午休（可设是否算工时）、法定节假日自动折算秒/分/时/日/周/月工资，工资每秒滚动增长。Community salary ticker plugin for DeepSeek Harness.",
   "type": "module",
   "main": "lib/index.js",

package/src/client/index.js

@@ -116,19 +116,27 @@ const zh = {
   'paidHoursPerDay': '日有效工时',
   'todayTarget': '今日目标',
   'monthEarned': '本月已赚',
+  'monthWorkedDays': '本月已工作',
+  'monthRemainingDays': '剩余工作日',
   'holidaySourceLink': '国务院办公厅 2026 年节假日安排',
   'configLoading': '正在读取设置…',
   'configFailed': '设置读取失败，使用默认值',
   'retry': '重试',
   'settings': '设置',
   'settingsHint': '改完点「保存」生效；格式不对会在下方红字提示，不影响计时。',
-  'salaryField': '实收月薪（元/月）',
+  'salaryField': '实收月薪',
+  'groupSalary': '工资',
+  'groupWorkTime': '工作时间',
+  'groupLunch': '午休',
+  'salaryUnit': '元 / 月',
   'workStartField': '上班时间',
   'workEndField': '下班时间',
   'lunchEnabledField': '启用午休',
+  'lunchEnabledShort': '启用',
   'lunchStartField': '午休开始',
   'lunchEndField': '午休结束',
   'lunchPaidField': '午休算工时',
+  'lunchPaidShort': '算工时',
   'holidaysCardTitle': '节假日安排',
   'holidays2026Label': '2026 年（官方）',
   'holidays2027Label': '2027 年（预估）',
@@ -153,6 +161,7 @@ const zh = {
   'saveFailed': '保存失败：',
   'dayUnit': '天',
   'hourUnit': '小时',
+  'minuteUnit': '分钟',
   'viewLabel': '查看',
   'viewCurrent': '本月',
   'viewYear': '全年平均',
@@ -207,19 +216,27 @@ const en = {
   'paidHoursPerDay': 'Paid hours / day',
   'todayTarget': "Today's target",
   'monthEarned': 'Earned this month',
+  'monthWorkedDays': 'Worked this month',
+  'monthRemainingDays': 'Workdays left',
   'holidaySourceLink': 'State Council 2026 holiday schedule',
   'configLoading': 'Loading settings…',
   'configFailed': 'Failed to load settings, using defaults',
   'retry': 'Retry',
   'settings': 'Settings',
   'settingsHint': 'Click Save to apply. Invalid input is shown in red below; the ticker keeps running.',
-  'salaryField': 'Net monthly salary (CNY)',
+  'salaryField': 'Net monthly salary',
+  'groupSalary': 'Salary',
+  'groupWorkTime': 'Working hours',
+  'groupLunch': 'Lunch break',
+  'salaryUnit': 'CNY / month',
   'workStartField': 'Work start',
   'workEndField': 'Work end',
   'lunchEnabledField': 'Enable lunch break',
+  'lunchEnabledShort': 'On',
   'lunchStartField': 'Lunch start',
   'lunchEndField': 'Lunch end',
   'lunchPaidField': 'Lunch is paid',
+  'lunchPaidShort': 'Paid',
   'holidaysCardTitle': 'Holiday calendar',
   'holidays2026Label': '2026 (official)',
   'holidays2027Label': '2027 (estimated)',
@@ -244,6 +261,7 @@ const en = {
   'saveFailed': 'Save failed: ',
   'dayUnit': 'd',
   'hourUnit': 'h',
+  'minuteUnit': 'min',
   'viewLabel': 'View',
   'viewCurrent': 'This month',
   'viewYear': 'Year average',
@@ -695,6 +713,8 @@ function DetailsFooter(props) {
     { key: 'hours', label: t('paidHoursPerDay'), value: `${trimNumber(rates.paidHours, 2)}${t('hourUnit')}` },
     { key: 'target', label: t('todayTarget'), value: money(snap.todayTarget, 2) },
     { key: 'month', label: t('monthEarned'), value: money(snap.monthEarned, 2) },
+    { key: 'worked', label: t('monthWorkedDays'), value: `${snap.monthWorkdaysDone}${t('dayUnit')}` },
+    { key: 'left', label: t('monthRemainingDays'), value: `${snap.monthWorkdaysLeft}${t('dayUnit')}` },
   ];
   return React.createElement('div', {
     style: {
@@ -854,81 +874,111 @@ function SettingsSection(props) {
   const save = props.save;
   const onSave = props.onSave;
 
+  // E 方案：行式短控件 —— 标签固定左列，控件都按内容定宽（不拉满）
+  const rowStyle = {
+    display: 'flex', alignItems: 'center', gap: 10,
+    minHeight: 33, padding: '2px 0', borderTop: `1px solid ${C.border1}`,
+  };
+  const rowKeyStyle = { width: 62, flex: '0 0 62px', fontSize: 11.5, color: C.label3 };
+  const rowValStyle = { display: 'flex', alignItems: 'center', gap: 4, flexWrap: 'wrap', minWidth: 0 };
   const inputStyle = {
-    width: '100%',
-    boxSizing: 'border-box',
-    padding: '6px 9px',
-    borderRadius: 8,
-    border: `1px solid ${C.border}`,
-    background: C.layer2,
-    color: C.label,
-    fontSize: 13,
-    fontVariantNumeric: 'tabular-nums',
-    outline: 'none',
+    boxSizing: 'border-box', width: 88, minHeight: 28, padding: '4px 8px',
+    borderRadius: 7, border: `1px solid ${C.border}`, background: C.layer2,
+    color: C.label, fontSize: 12.5, fontVariantNumeric: 'tabular-nums', outline: 'none',
   };
-  const labelStyle = { fontSize: 10.5, color: C.label3, fontWeight: 500 };
+  const selectStyle = {
+    boxSizing: 'border-box', width: 48, minHeight: 28, padding: '4px 2px 4px 6px',
+    borderRadius: 7, border: `1px solid ${C.border}`, background: C.layer2,
+    color: C.label, fontSize: 12.5, fontVariantNumeric: 'tabular-nums', outline: 'none', cursor: 'pointer',
+  };
+  const unitStyle = { fontSize: 10.5, color: C.label3, whiteSpace: 'nowrap' };
+  const dashStyle = { fontSize: 11, color: C.label3, margin: '0 1px' };
+  const HOUR_OPTIONS = Array.from({ length: 24 }, (_, i) => String(i).padStart(2, '0'));
+  const MINUTE_OPTIONS = Array.from({ length: 60 }, (_, i) => String(i).padStart(2, '0'));
 
-  const textField = (field, labelKey, placeholder) => React.createElement('label', {
-    key: field,
-    style: { display: 'flex', flexDirection: 'column', gap: 4, flex: '1 1 130px', minWidth: 112 },
+  const row = (key, label, values) => React.createElement('div', { key, style: rowStyle }, [
+    React.createElement('span', { key: 'k', style: rowKeyStyle }, label),
+    React.createElement('div', { key: 'v', style: rowValStyle }, values),
+  ]);
+
+  /** 24 小时制时间：小时/分钟两个下拉，各 46px（不受浏览器 locale 影响）。 */
+  const timeSelects = (field, label, disabled = false) => {
+    const [rawHour = '00', rawMinute = '00'] = String(form[field] || '00:00').split(':');
+    const hour = HOUR_OPTIONS.includes(rawHour) ? rawHour : '00';
+    const minute = MINUTE_OPTIONS.includes(rawMinute) ? rawMinute : '00';
+    const commit = (nextHour, nextMinute) => setField(field, `${nextHour}:${nextMinute}`);
+    const style = { ...selectStyle, opacity: disabled ? 0.45 : 1, cursor: disabled ? 'default' : 'pointer' };
+    return React.createElement('span', { key: field, style: { display: 'inline-flex', alignItems: 'center', gap: 2 } }, [
+      React.createElement('select', {
+        key: 'h', value: hour, disabled, 'aria-label': `${label} ${t('hourUnit')}`,
+        onChange: (event) => commit(event.target.value, minute), style,
+      }, HOUR_OPTIONS.map((value) => React.createElement('option', { key: value, value }, value))),
+      React.createElement('span', { key: 'c', style: { color: C.label3, fontWeight: 700, fontSize: 12 } }, ':'),
+      React.createElement('select', {
+        key: 'm', value: minute, disabled, 'aria-label': `${label} ${t('minuteUnit')}`,
+        onChange: (event) => commit(hour, event.target.value), style,
+      }, MINUTE_OPTIONS.map((value) => React.createElement('option', { key: value, value }, value))),
+    ]);
+  };
+
+  const timeRange = (startField, endField, label, disabled) => React.createElement('span', {
+    key: `${startField}-${endField}`,
+    style: { display: 'inline-flex', alignItems: 'center', gap: 2 },
   }, [
-    React.createElement('span', { key: 'l', style: labelStyle }, t(labelKey)),
-    React.createElement('input', {
-      key: 'i',
-      type: 'text',
-      value: form[field],
-      placeholder: placeholder || 'HH:mm',
-      onChange: (event) => setField(field, event.target.value),
-      style: inputStyle,
-    }),
+    timeSelects(startField, label, disabled),
+    React.createElement('span', { key: 'dash', style: dashStyle }, '–'),
+    timeSelects(endField, label, disabled),
   ]);
 
-  const checkField = (field, labelKey) => React.createElement('label', {
+  const toggle = (field, labelKey, disabled) => React.createElement('label', {
     key: field,
     style: {
-      display: 'flex', alignItems: 'center', gap: 6, flex: '1 1 140px',
-      fontSize: 12, color: C.label2, cursor: 'pointer', minHeight: 30,
+      display: 'inline-flex', alignItems: 'center', gap: 5,
+      padding: '2px 6px', borderRadius: 8,
+      border: `1px solid ${C.border1}`, background: C.layer2,
+      fontSize: 10.5, color: disabled ? C.label3 : C.label2, whiteSpace: 'nowrap',
+      cursor: disabled ? 'default' : 'pointer', opacity: disabled ? 0.55 : 1,
     },
   }, [
     React.createElement('input', {
-      key: 'i',
-      type: 'checkbox',
-      checked: Boolean(form[field]),
+      key: 'i', type: 'checkbox', checked: Boolean(form[field]), disabled,
       onChange: (event) => setCheck(field, event.target.checked),
+      style: { accentColor: GOLD_TINT, width: 13, height: 13, margin: 0, cursor: 'inherit' },
     }),
     React.createElement('span', { key: 'l' }, t(labelKey)),
   ]);
 
+  const lunchDisabled = !form.lunchEnabled;
+
   return React.createElement('details', {
-    style: { background: C.layer1, border: `1px solid ${C.border1}`, borderRadius: 12, padding: '11px 13px' },
+    open: true,
+    style: { background: C.layer1, border: `1px solid ${C.border1}`, borderRadius: 12, padding: '10px 12px' },
   }, [
     React.createElement('summary', {
       key: 'sum',
-      style: { cursor: 'pointer', fontSize: 13, fontWeight: 650, color: C.label, userSelect: 'none' },
+      style: { cursor: 'pointer', fontSize: 12.5, fontWeight: 650, color: C.label, userSelect: 'none' },
     }, t('settings')),
-    React.createElement('div', {
-      key: 'hint',
-      style: { fontSize: 10.5, color: C.label3, margin: '5px 0 10px' },
-    }, t('settingsHint')),
-    React.createElement('div', {
-      key: 'dataNote',
-      style: { fontSize: 10.5, color: C.label3, margin: '-4px 0 10px', lineHeight: 1.55 },
-    }, t('settingsDataNote')),
-    React.createElement('div', {
-      key: 'fields',
-      style: { display: 'flex', flexWrap: 'wrap', gap: 9 },
-    }, [
-      textField('monthlySalary', 'salaryField', '10000'),
-      textField('workStart', 'workStartField', '09:00'),
-      textField('workEnd', 'workEndField', '18:00'),
-      textField('lunchStart', 'lunchStartField', '12:00'),
-      textField('lunchEnd', 'lunchEndField', '13:00'),
-      checkField('lunchEnabled', 'lunchEnabledField'),
-      checkField('lunchPaid', 'lunchPaidField'),
+    React.createElement('div', { key: 'body', style: { marginTop: 7 } }, [
+      row('salary', t('salaryField'), [
+        React.createElement('input', {
+          key: 'i', type: 'text', inputMode: 'decimal', value: form.monthlySalary, placeholder: '10000',
+          onChange: (event) => setField('monthlySalary', event.target.value), style: inputStyle,
+        }),
+        React.createElement('span', { key: 'u', style: unitStyle }, t('salaryUnit')),
+      ]),
+      row('worktime', t('groupWorkTime'), [
+        timeRange('workStart', 'workEnd', t('groupWorkTime'), false),
+      ]),
+      row('lunch', t('groupLunch'), [
+        // 时间在前、两个开关在后（放到行尾）
+        timeRange('lunchStart', 'lunchEnd', t('groupLunch'), lunchDisabled),
+        toggle('lunchEnabled', 'lunchEnabledShort', false),
+        toggle('lunchPaid', 'lunchPaidShort', lunchDisabled),
+      ]),
     ]),
     React.createElement('div', {
       key: 'actions',
-      style: { display: 'flex', alignItems: 'center', gap: 10, flexWrap: 'wrap', marginTop: 11 },
+      style: { display: 'flex', alignItems: 'center', gap: 10, marginTop: 7, paddingTop: 7, borderTop: `1px solid ${C.border1}` },
     }, [
       React.createElement('button', {
         key: 'save',
@@ -936,30 +986,29 @@ function SettingsSection(props) {
         onClick: onSave,
         disabled: save.status === 'saving',
         style: {
-          // 金色按钮：与主卡金额、节假日强调同一套金色系；深棕字保证任何主题下都有对比度
           border: `1px solid color-mix(in srgb, ${GOLD_TINT} 72%, rgba(0,0,0,.18))`,
           color: '#3A2A05',
           background: save.status === 'saving'
             ? `color-mix(in srgb, ${GOLD_TINT} 52%, #fff)`
             : 'linear-gradient(180deg, #F8DC86 0%, #EFC258 52%, #D99D2C 100%)',
           borderRadius: 8,
-          padding: '7px 20px',
-          fontSize: 13,
+          padding: '5px 16px',
+          fontSize: 12.5,
           fontWeight: 700,
           letterSpacing: '.3px',
           cursor: save.status === 'saving' ? 'default' : 'pointer',
           opacity: save.status === 'saving' ? 0.72 : 1,
-          boxShadow: `0 2px 10px color-mix(in srgb, ${GOLD_TINT} 36%, transparent), inset 0 1px 0 rgba(255,255,255,.45)`,
+          boxShadow: `0 2px 9px color-mix(in srgb, ${GOLD_TINT} 34%, transparent), inset 0 1px 0 rgba(255,255,255,.45)`,
           textShadow: '0 1px 0 rgba(255,255,255,.28)',
         },
       }, save.status === 'saving' ? t('saving') : t('save')),
       save.status === 'ok'
-        ? React.createElement('span', { key: 'ok', style: { fontSize: 12, color: C.ok } }, save.message || t('saved'))
+        ? React.createElement('span', { key: 'ok', style: { fontSize: 11.5, color: C.ok } }, save.message || t('saved'))
         : null,
       save.status === 'error'
         ? React.createElement('span', {
           key: 'err',
-          style: { fontSize: 12, color: C.error, flex: '1 1 220px', whiteSpace: 'pre-wrap' },
+          style: { fontSize: 11.5, color: C.error, flex: '1 1 200px', whiteSpace: 'pre-wrap' },
         }, `${t('saveFailed')}${save.errors.join('；')}`)
         : null,
     ]),

package/src/core.mjs

@@ -342,6 +342,16 @@ export function earnedToday(config, now) {
   const secondsToStart = workday && nowSec < startSec ? startSec - nowSec : 0;
   const secondsToEnd = workday && nowSec < endSec ? endSec - nowSec : 0;
 
+  // 本月工作天数进度：已完成 = 今天之前的完整工作日 +（今天已下班则 +1）；
+  // 「今天」在上班/午休中时算剩余（还没干完），这样「已工作 + 剩余 = 本月总工作日」。
+  const monthWorkdays = rates.monthlyWorkdays;
+  let monthWorkdaysDone = 0;
+  for (let day = 1; day < date.getDate(); day += 1) {
+    if (isWorkday(dateKeyOf(new Date(date.getFullYear(), date.getMonth(), day)), config)) monthWorkdaysDone += 1;
+  }
+  if (workday && status === 'off') monthWorkdaysDone += 1;
+  const monthWorkdaysLeft = Math.max(0, monthWorkdays - monthWorkdaysDone);
+
   return {
     dateKey: key,
     isWorkday: workday,
@@ -352,6 +362,9 @@ export function earnedToday(config, now) {
     todayTarget,
     todayProgress,
     monthEarned,
+    monthWorkdays,
+    monthWorkdaysDone,
+    monthWorkdaysLeft,
     secondsToStart,
     secondsToEnd,
     rates,