zen-gitsync 2.11.14 → 2.11.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -76,7 +76,7 @@ start /min cmd /k "g -y --path=你要同步的文件夹 --interval"
76
76
  ```shell
77
77
  start /min cmd /k "g --cmd=\"echo hello\" --cmd-interval=5" # 每5秒执行一次echo hello
78
78
  start /min cmd /k "g --cmd=\"echo at-time\" --at=23:59" # 在23:59执行一次echo at-time
79
- start /min cmd /k "g --cmd=\"echo daily\" --at=23:59 --daily" # 每天23:59执行一次echo daily
79
+ start /min cmd /k "g --cmd=\"echo daily\" --at=23:59 --daily" # 每天23:59执行一次echo daily
80
80
  ```
81
81
 
82
82
  #### 不显示git diff内容
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zen-gitsync",
3
- "version": "2.11.14",
3
+ "version": "2.11.16",
4
4
  "description": "一个 git 提交的工具",
5
5
  "main": "index.js",
6
6
  "type": "module",
package/src/config.js CHANGED
@@ -123,13 +123,13 @@ async function loadConfig() {
123
123
  // 新版结构:{ projects: { [key]: projectConfig }, theme?, locale?, recentDirectories? }
124
124
  const projectConfig = raw?.projects?.[key];
125
125
  // 合并:默认配置 + 项目配置 + 全局通用设置(theme, locale, models)
126
- // models 是全局配置(跨项目共享),优先取项目级,否则回退顶层(兼容旧数据)
126
+ // models 是全局配置(跨项目共享),始终取顶层,不使用项目级的(防止旧数据 models:[] 覆盖)
127
127
  return {
128
128
  ...defaultConfig,
129
129
  ...(projectConfig || {}),
130
130
  theme: raw?.theme ?? defaultConfig.theme,
131
131
  locale: raw?.locale ?? defaultConfig.locale,
132
- models: projectConfig?.models ?? raw?.models ?? defaultConfig.models
132
+ models: raw?.models ?? defaultConfig.models
133
133
  };
134
134
  }
135
135