semanticdb-core 1.1.21 → 1.1.23

package/dist/schema/property.d.ts

@@ -13,6 +13,8 @@ export declare type PropertyTypePrimalType = 'string' | 'number' | 'boolean' | '
 export interface PropertyTypeDraft {
     _sid?: string | number;
     _id?: string;
+    sid?: string;
+    id?: string;
     name: string;
     syno?: string[];
     description?: string;

package/dist/schema/schema.utils/getDrilldownDimensions.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDrilldownDimensions = void 0;
 const logicform_utils_1 = require("../../logicform/logicform.utils");
-const property_utils_1 = require("../property.utils");
 const moment_1 = __importDefault(require("moment"));
 // 日期粒度，从粗到细
 const DATE_GRANULARITIES = [
@@ -50,7 +49,6 @@ const getDrilldownDimensions = (schema_1, schemasDict_1, logicform_1, ...args_1)
     let drilldownProps = [];
     // 一个递归函数
     const addToArrayWithProperty = (property, prefix, schema) => {
-        var _a;
         if (usage === 'analyze' && property.is_analyzable === false)
             return;
         const pushToPropNames = (property, level, prefix, schema) => {
@@ -76,22 +74,12 @@ const getDrilldownDimensions = (schema_1, schemasDict_1, logicform_1, ...args_1)
         if (property.can_drilldown === false)
             return;
         if (property.primal_type === 'date') {
-            // 日期维度的下钻：提供更细粒度的选项
-            const propertyId = prefix ? `${prefix}_${property.name}` : property.name;
-            // 找到当前 logicform 中该属性的粒度
-            const currentGroupBy = (_a = logicform === null || logicform === void 0 ? void 0 : logicform.groupby) === null || _a === void 0 ? void 0 : _a.find((g) => g._id === propertyId);
-            const currentGranularity = currentGroupBy === null || currentGroupBy === void 0 ? void 0 : currentGroupBy.level;
-            // 获取属性的默认粒度
-            const defaultGranularity = (0, property_utils_1.getGranularity)(property);
-            // 确定起始粒度索引
-            const startIndex = currentGranularity
-                ? DATE_GRANULARITIES.indexOf(currentGranularity)
-                : DATE_GRANULARITIES.indexOf(defaultGranularity);
-            if (startIndex >= 0 && startIndex < DATE_GRANULARITIES.length - 1) {
-                // 提供比当前粒度更细的所有选项
-                for (let i = startIndex + 1; i < DATE_GRANULARITIES.length; i++) {
-                    pushToPropNames(property, DATE_GRANULARITIES[i], prefix, schema);
-                }
+            // 日期维度的下钻：从 year 开始，提供更细粒度的所有选项
+            // TODO: 后续需要从 logicform.query 中获取当前粒度
+            const startIndex = DATE_GRANULARITIES.indexOf('year');
+            // 提供比当前粒度更细的所有选项
+            for (let i = startIndex + 1; i < DATE_GRANULARITIES.length; i++) {
+                pushToPropNames(property, DATE_GRANULARITIES[i], prefix, schema);
             }
         }
         else if (property.is_categorical) {

package/dist/schema/schema.utils.js

@@ -35,10 +35,6 @@ function isSchemaValid(schema, schemasDict) {
     if (!schema.properties.every((property) => property.name && property.name.trim() !== '' && property.type)) {
         return { valid: false, message: '每一个属性都必须有名称和类型' };
     }
-    // 检查_id
-    if (!schema._id) {
-        return { valid: false, message: '错误的schema配置，缺少_id' };
-    }
     // 检查db
     if (!schema.db) {
         return { valid: false, message: '缺少数据库配置' };
@@ -100,11 +96,11 @@ function isSchemaValid(schema, schemasDict) {
         seenNames.add(name);
     }
     // ==================== 检查属性_id重复 ====================
-    const propertyIds = schema.properties.map((p) => p._id).filter((id) => !!id);
+    const propertyIds = schema.properties.map((p) => p.id).filter((id) => !!id);
     const seenIds = new Set();
     for (const id of propertyIds) {
         if (seenIds.has(id)) {
-            return { valid: false, message: `${schema.name} 中有两个相同_id的属性：${id}` };
+            return { valid: false, message: `${schema.name} 中有两个相同id的属性：${id}` };
         }
         seenIds.add(id);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "semanticdb-core",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [