@byteluck-fe/model-driven-controls 7.1.0-beta.2 → 7.1.0-beta.4

package/dist/esm/catalog/query.js

@@ -9,6 +9,17 @@ function _array_with_holes(arr) {
 function _array_without_holes(arr) {
     if (Array.isArray(arr)) return _array_like_to_array(arr);
 }
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else obj[key] = value;
+    return obj;
+}
 function _iterable_to_array(iter) {
     if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) {
         return Array.from(iter);
@@ -44,12 +55,54 @@ function _non_iterable_rest() {
 function _non_iterable_spread() {
     throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
 function _sliced_to_array(arr, i) {
     return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
 function _to_consumable_array(arr) {
     return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
 }
+function _type_of(obj) {
+    "@swc/helpers - typeof";
+    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+}
 function _unsupported_iterable_to_array(o, minLen) {
     if (!o) return;
     if (typeof o === "string") return _array_like_to_array(o, minLen);
@@ -100,6 +153,7 @@ export function getControlSettingFacts(type) {
  * propsSchema 可能声明了工厂默认模型未实际物化的可选属性，因此必须同时命中
  * propertyNameMap 与 defaultProps，才能作为控件切换时的能力证据。
  */ export function getControlSavedPropertyFact(type, savedPropertyKey) {
+    var _definition_absentRuntimeDefaults;
     var definition = definitionsByType.get(type);
     if (!definition) return undefined;
     var propertyEntry = Object.entries(definition.propertyNameMap).find(function(param) {
@@ -114,12 +168,212 @@ export function getControlSettingFacts(type) {
     var defaultValue = definition.defaultProps[propertyKey];
     // generated JSON 不允许 undefined；若产物被破坏则窄查询继续失败关闭。
     if (defaultValue === undefined) return undefined;
-    return clone({
+    var hasAbsentRuntimeValue = Object.prototype.hasOwnProperty.call(definition.absentRuntimeDefaults || {}, propertyKey);
+    var absentRuntimeValue = (_definition_absentRuntimeDefaults = definition.absentRuntimeDefaults) === null || _definition_absentRuntimeDefaults === void 0 ? void 0 : _definition_absentRuntimeDefaults[propertyKey];
+    // 声明为已登记却出现 undefined 说明生成物损坏，不能对外返回不完整事实。
+    if (hasAbsentRuntimeValue && absentRuntimeValue === undefined) return undefined;
+    return clone(_object_spread_props(_object_spread({
         controlType: definition.type,
-        defaultValue: defaultValue,
+        defaultValue: defaultValue
+    }, hasAbsentRuntimeValue ? {
+        absentRuntimeValue: absentRuntimeValue
+    } : {}), {
         propertyKey: propertyKey,
         savedPropertyKey: savedPropertyKey
+    }));
+}
+var CATALOG_VALUE_TYPES = new Set([
+    'array',
+    'boolean',
+    'integer',
+    'null',
+    'number',
+    'object',
+    'string'
+]);
+function isRecord(value) {
+    return (typeof value === "undefined" ? "undefined" : _type_of(value)) === 'object' && value !== null && !Array.isArray(value);
+}
+function schemaValueTypes(value) {
+    if (!isRecord(value)) return [];
+    var result = new Set();
+    var addType = function addType(type) {
+        if (typeof type === 'string' && CATALOG_VALUE_TYPES.has(type)) {
+            result.add(type);
+        }
+    };
+    if (Array.isArray(value.type)) value.type.forEach(addType);
+    else addType(value.type);
+    if (Array.isArray(value.anyOf)) {
+        value.anyOf.forEach(function(item) {
+            return schemaValueTypes(item).forEach(function(type) {
+                return result.add(type);
+            });
+        });
+    }
+    return _to_consumable_array(result).sort();
+}
+function jsonValues(value) {
+    if (!Array.isArray(value)) return undefined;
+    // generated catalog 已是 JSON；仍复制一份，避免查询结果污染共享文档。
+    return clone(value);
+}
+function numberValue(value) {
+    return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
+}
+function valueTypeForDefault(value) {
+    if (value === null) return 'null';
+    if (Array.isArray(value)) return 'array';
+    if (typeof value === 'boolean') return 'boolean';
+    if (typeof value === 'number') {
+        return Number.isInteger(value) ? 'integer' : 'number';
+    }
+    if (typeof value === 'string') return 'string';
+    return 'object';
+}
+/**
+ * 按保存键返回单个紧凑 authoring 事实；不存在或未被真实默认模型物化时失败关闭。
+ */ export function getControlAuthoringPropertyFact(type, savedPropertyKey) {
+    var _ref, _ref1, _ref2, _ref3;
+    var definition = definitionsByType.get(type);
+    var savedFact = getControlSavedPropertyFact(type, savedPropertyKey);
+    if (!definition || !savedFact) return undefined;
+    var settingFact = definition.settingFacts.find(function(fact) {
+        return fact.savedPropertyKey === savedPropertyKey;
+    });
+    var propertySchema = isRecord(definition.propsSchema.properties) ? definition.propsSchema.properties[savedFact.propertyKey] : undefined;
+    var schemaTypes = schemaValueTypes(propertySchema);
+    var schema = isRecord(propertySchema) ? propertySchema : undefined;
+    var defaultType = valueTypeForDefault(savedFact.defaultValue);
+    // schema 联合类型、setting 类型与真实创建默认值都是独立事实；不能用某一个默认值
+    // 反向缩窄整个合法值域，否则 integer|string 之类的历史合法值会被误拒绝。
+    var valueTypes = _to_consumable_array(new Set(_to_consumable_array(schemaTypes).concat(_to_consumable_array(settingFact ? [
+        settingFact.valueType
+    ] : []), [
+        defaultType
+    ]))).sort();
+    // setting options 与当前 schema enum 尚无“完整值域”发布事实，只能作为 authoring 提示。
+    var optionHints = (settingFact === null || settingFact === void 0 ? void 0 : settingFact.options) || jsonValues(schema === null || schema === void 0 ? void 0 : schema.enum);
+    var min = (_ref = (_ref1 = settingFact === null || settingFact === void 0 ? void 0 : settingFact.min) !== null && _ref1 !== void 0 ? _ref1 : numberValue(schema === null || schema === void 0 ? void 0 : schema.minimum)) !== null && _ref !== void 0 ? _ref : numberValue(schema === null || schema === void 0 ? void 0 : schema.min);
+    var max = (_ref2 = (_ref3 = settingFact === null || settingFact === void 0 ? void 0 : settingFact.max) !== null && _ref3 !== void 0 ? _ref3 : numberValue(schema === null || schema === void 0 ? void 0 : schema.maximum)) !== null && _ref2 !== void 0 ? _ref2 : numberValue(schema === null || schema === void 0 ? void 0 : schema.max);
+    var hasTopLevelOnly = valueTypes.some(function(valueType) {
+        return valueType === 'array' || valueType === 'object';
     });
+    return clone(_object_spread_props(_object_spread({
+        controlType: type,
+        propertyKey: savedFact.propertyKey,
+        savedPropertyKey: savedPropertyKey,
+        createDefaultValue: savedFact.defaultValue,
+        absentRuntimeValue: savedFact.absentRuntimeValue !== undefined ? {
+            known: true,
+            value: savedFact.absentRuntimeValue
+        } : {
+            known: false
+        },
+        valueTypes: valueTypes
+    }, optionHints ? {
+        optionHints: optionHints
+    } : {}, min !== undefined ? {
+        min: min
+    } : {}, max !== undefined ? {
+        max: max
+    } : {}), {
+        constraintCompleteness: hasTopLevelOnly ? 'top-level' : 'complete',
+        settingExposed: Boolean(settingFact),
+        explicitConstructionSupported: !definition.unsupportedExplicitProps.includes(savedFact.propertyKey)
+    }));
+}
+/**
+ * 返回一个控件的紧凑 authoring 事实，属性按保存键稳定排序；不复制完整 catalog。
+ */ export function getControlAuthoringFacts(type) {
+    var definition = definitionsByType.get(type);
+    if (!definition) return undefined;
+    var properties = Object.values(definition.propertyNameMap).map(function(savedPropertyKey) {
+        return getControlAuthoringPropertyFact(type, savedPropertyKey);
+    }).filter(function(fact) {
+        return fact !== undefined;
+    }).sort(function(left, right) {
+        return left.savedPropertyKey.localeCompare(right.savedPropertyKey);
+    });
+    return clone(_object_spread_props(_object_spread({
+        controlType: type,
+        baseType: definition.baseType
+    }, definition.fieldType ? {
+        fieldType: definition.fieldType
+    } : {}), {
+        catalogRevision: catalog.revision,
+        properties: properties
+    }));
+}
+/**
+ * 解析一个保存属性的有效值，仅在 catalog 已登记历史缺失语义时补值。
+ *
+ * `null` 是显式 JSON 值，不能与缺失/undefined 混为一谈。调用方可传 camelCase
+ * 构造态或 snake_case 保存态 props，返回值始终指出公共构造属性名。
+ */ export function resolveControlSavedPropertyValue(input) {
+    var fact = getControlSavedPropertyFact(input.controlType, input.savedPropertyKey);
+    if (!fact) return undefined;
+    for(var _i = 0, _iter = [
+        fact.propertyKey,
+        fact.savedPropertyKey
+    ]; _i < _iter.length; _i++){
+        var key = _iter[_i];
+        var value = input.props[key];
+        if (Object.prototype.hasOwnProperty.call(input.props, key) && value !== undefined) {
+            return {
+                propertyKey: fact.propertyKey,
+                savedPropertyKey: fact.savedPropertyKey,
+                value: clone(value),
+                source: 'explicit'
+            };
+        }
+    }
+    if (fact.absentRuntimeValue === undefined) return undefined;
+    return {
+        propertyKey: fact.propertyKey,
+        savedPropertyKey: fact.savedPropertyKey,
+        value: clone(fact.absentRuntimeValue),
+        source: 'absent_runtime_value'
+    };
+}
+/**
+ * 为 Designer 等构造态消费者补齐 Runtime 已核实的历史缺失语义。
+ *
+ * 未命中时保留原对象引用；命中时只浅拷贝 props 并写入公共属性名，不修改保存态原对象。
+ */ export function applyControlRuntimeAbsentDefaults(controlType, props) {
+    var definition = definitionsByType.get(controlType);
+    if (!definition) return props;
+    var result = props;
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = Object.entries(definition.absentRuntimeDefaults || {})[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var _step_value = _sliced_to_array(_step.value, 2), propertyKey = _step_value[0], absentRuntimeValue = _step_value[1];
+            var savedPropertyKey = definition.propertyNameMap[propertyKey];
+            if (!savedPropertyKey) continue;
+            var resolved = resolveControlSavedPropertyValue({
+                controlType: controlType,
+                savedPropertyKey: savedPropertyKey,
+                props: props
+            });
+            if (!resolved || resolved.source !== 'absent_runtime_value') continue;
+            if (result === props) result = _object_spread({}, props);
+            result[propertyKey] = clone(absentRuntimeValue);
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return result;
 }
 /** headless 按稳定 key 窄查消息事实，避免复制整份 catalog。 */ export function getControlLocaleMessageFact(key) {
     var fact = catalog.localeMessages[key];

package/dist/esm/listControls/SubTable/property.js

@@ -362,6 +362,12 @@ var SubTableControlProperty = /*#__PURE__*/ function(ListControlProperty) {
     return SubTableControlProperty;
 }(ListControlProperty);
 _define_property(SubTableControlProperty, "Rules", SubTableControlPropertyRules);
+/**
+   * 历史页面未保存 label_position 时，Runtime 一直按左右布局解释。
+   * 新建控件仍使用构造器中的 top；catalog 将两类语义分开发布，供 Designer 对齐历史运行态。
+   */ _define_property(SubTableControlProperty, "catalogAbsentRuntimeDefaults", {
+    labelPosition: 'left'
+});
 _define_property(SubTableControlProperty, "RuntimeRules", SubtableControlRuntimeRules);
 export default SubTableControlProperty;
 export { SubTableControlProperty, SubTableControlPropertyRules, SubtableControlRuntimeRules,  };