@veltra/sheet 2.3.0 → 2.3.1

package/dist/components/report/hub-dataset-editor.js

@@ -66,11 +66,25 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			resetPreview();
 			runDescribe();
 		}, { immediate: true });
+		/** 立即把草稿 SQL 落入数据集（v-model 实时、change 失焦才发且提交有 debounce），供预览同步拿到最新 SQL */
+		function flushSqlDraft(datasetId) {
+			if (sqlTimer) {
+				clearTimeout(sqlTimer);
+				sqlTimer = void 0;
+			}
+			const current = dataset.value;
+			if (!current || current.sql === sqlDraft.value) return;
+			props.hub.updateDataset(datasetId, { sql: sqlDraft.value });
+			runDescribe();
+		}
 		function onSqlChange(value) {
 			sqlDraft.value = value;
+			const datasetId = props.datasetId;
 			if (sqlTimer) clearTimeout(sqlTimer);
 			sqlTimer = setTimeout(() => {
-				props.hub.updateDataset(props.datasetId, { sql: value });
+				sqlTimer = void 0;
+				if (props.datasetId !== datasetId) return;
+				props.hub.updateDataset(datasetId, { sql: value });
 				runDescribe();
 			}, 280);
 		}
@@ -104,6 +118,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			}));
 		});
 		async function runPreview() {
+			flushSqlDraft(props.datasetId);
 			previewing.value = true;
 			previewError.value = "";
 			const result = await props.hub.previewDataset(props.datasetId);

package/dist/components/sheet/popups/fill-color-popup.js

@@ -13,7 +13,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		*/
 		const props = __props;
 		/** 填充颜色（'' = 无填充） */
-		const fillColor = ref("");
+		const fillColor = ref();
 		onMounted(() => {
 			const active = props.context.getSelection().activeCell;
 			const style = active ? props.context.getEffectiveStyle(active) : void 0;
@@ -21,6 +21,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		});
 		/** 填充颜色变化（'' = 无填充：清除 fill 保留边框） */
 		function applyFillColor(color) {
+			fillColor.value = color;
 			const range = currentRange(props.context);
 			if (!range) return;
 			props.context.applyStyle(range, color ? { fill: { color } } : { fill: {} });

package/package.json

@@ -1,6 +1,15 @@
 {
   "name": "@veltra/sheet",
-  "version": "2.3.0",
+  "version": "2.3.1",
+  "homepage": "https://github.com/cabinet-fe/ultra-ui#readme",
+  "bugs": {
+    "url": "https://github.com/cabinet-fe/ultra-ui/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/cabinet-fe/ultra-ui",
+    "directory": "packages/sheet"
+  },
   "files": [
     "dist",
     "src"
@@ -30,12 +39,12 @@
   "peerDependencies": {
     "@cat-kit/core": ">=1.1.8",
     "@cat-kit/fe": ">=1.1.8",
-    "@veltra/compositions": "^1.6.0",
-    "@veltra/desktop": "^1.6.0",
+    "@veltra/compositions": "^1.6.2",
+    "@veltra/desktop": "^1.6.2",
     "@veltra/icons": "^1.5.0",
-    "@veltra/sheet-core": "^2.3.0",
-    "@veltra/styles": "^1.6.0",
-    "@veltra/utils": "^1.6.0",
+    "@veltra/sheet-core": "^2.3.1",
+    "@veltra/styles": "^1.6.2",
+    "@veltra/utils": "^1.6.2",
     "vue": ">=3.5.41"
   }
 }

package/src/components/report/hub-dataset-editor.vue

@@ -219,11 +219,27 @@ watch(
   { immediate: true }
 )
 
+/** 立即把草稿 SQL 落入数据集（v-model 实时、change 失焦才发且提交有 debounce），供预览同步拿到最新 SQL */
+function flushSqlDraft(datasetId: string): void {
+  if (sqlTimer) {
+    clearTimeout(sqlTimer)
+    sqlTimer = undefined
+  }
+  const current = dataset.value
+  if (!current || current.sql === sqlDraft.value) return
+  props.hub.updateDataset(datasetId, { sql: sqlDraft.value })
+  void runDescribe()
+}
+
 function onSqlChange(value: string): void {
   sqlDraft.value = value
+  const datasetId = props.datasetId
   if (sqlTimer) clearTimeout(sqlTimer)
   sqlTimer = setTimeout(() => {
-    props.hub.updateDataset(props.datasetId, { sql: value })
+    sqlTimer = undefined
+    // 防抖窗口内切换了数据集则丢弃，避免把旧草稿写进新数据集
+    if (props.datasetId !== datasetId) return
+    props.hub.updateDataset(datasetId, { sql: value })
     void runDescribe()
   }, 280)
 }
@@ -271,6 +287,8 @@ const schemaRows = computed(() => {
 // ---- 记录预览（按参数默认值经连接器取数） ----
 
 async function runPreview(): Promise<void> {
+  // 编辑器 change 仅在失焦时触发且提交有 debounce，先同步落草稿 SQL，避免用旧 SQL 取数
+  flushSqlDraft(props.datasetId)
   previewing.value = true
   previewError.value = ''
   const result = await props.hub.previewDataset(props.datasetId)

package/src/components/sheet/popups/fill-color-popup.vue

@@ -21,7 +21,7 @@ const props = defineProps<{
 }>()
 
 /** 填充颜色（'' = 无填充） */
-const fillColor = ref('')
+const fillColor = ref<string>()
 
 // 打开时初始化为活动格当前填充色
 onMounted(() => {
@@ -31,7 +31,8 @@ onMounted(() => {
 })
 
 /** 填充颜色变化（'' = 无填充：清除 fill 保留边框） */
-function applyFillColor(color: string): void {
+function applyFillColor(color?: string): void {
+  fillColor.value = color
   const range = currentRange(props.context)
   if (!range) return
   props.context.applyStyle(range, color ? { fill: { color } } : { fill: {} })