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

package/dist/esm/catalog/generated/control-catalog.v1.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": "model-driven.control-catalog.v1",
-  "packageVersion": "7.1.0-beta.2",
-  "sourceRevision": "sha256:4cdee256c5d2cda0cd50a4e95062cbf508b492bf72cedf51d97fed16cc1232ab",
-  "revision": "sha256:0298f53a35e5849dc05fdf4277e9945bb627d04325f6f8fca9f1098469c2ad93",
+  "packageVersion": "7.1.0-beta.3",
+  "sourceRevision": "sha256:5699432a72e9369aeccc3083c2479d8c12e506bb74ae068a21c89ba77f6937dc",
+  "revision": "sha256:f352354ca2e86d563cfd767830aa9c5aeab204de26401d3517824f8a45f54bdb",
   "localeMessages": {
     "CMD.approvedDocuments": {
       "key": "CMD.approvedDocuments",
@@ -69799,6 +69799,9 @@
         "triggerEdit": "trigger_edit",
         "useCustomHeight": "use_custom_height"
       },
+      "absentRuntimeDefaults": {
+        "labelPosition": "left"
+      },
       "settings": [
         {
           "key": "subtable-datasource-bind",

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,6 +55,44 @@ 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();
 }
@@ -100,6 +149,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 +164,89 @@ 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
-    });
+    }));
+}
+/**
+ * 解析一个保存属性的有效值，仅在 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,  };