@dckj-npm/dc-material 0.1.361 → 0.1.363

package/lib/utils/children-node-handle.js

@@ -5,6 +5,13 @@ exports.__esModule = true;
 exports.convertChildren = convertChildren;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
+var normalizeNodeKey = function normalizeNodeKey(rawKey) {
+  if (rawKey === undefined || rawKey === null) {
+    return '';
+  }
+  return String(rawKey).replace(/^\.?\$?/, '');
+};
+
 /**
  * 从children数组中获取指定组件
  * @author ZhuGangMin
@@ -15,17 +22,16 @@ var _react = _interopRequireDefault(require("react"));
  */
 function convertChildren(children, key, props) {
   var node;
+  var targetKey = normalizeNodeKey(key);
   if (Array.isArray(children)) {
     for (var i = 0; i < children.length; i++) {
+      var _child$props;
       var child = children[i];
-      if (child.key === key) {
-        var _child$props;
+      var childKey = normalizeNodeKey(child === null || child === void 0 ? void 0 : child.key);
+      var childPropsKey = normalizeNodeKey(child === null || child === void 0 ? void 0 : (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.key);
+      if (childKey === targetKey || childPropsKey === targetKey) {
         // 属性融合
         var propsContact = props ? (0, _extends2["default"])({}, child.props, props) : child.props;
-        // 样式融合
-        if (props !== null && props !== void 0 && props.style && (_child$props = child.props) !== null && _child$props !== void 0 && _child$props.style) {
-          propsContact.style = (0, _extends2["default"])({}, child.props.style, props.style);
-        }
         node = /*#__PURE__*/_react["default"].cloneElement(child, propsContact);
         break;
       }

package/lowcode/teletext-list/meta.ts

@@ -1,9 +1,125 @@
 import {
   IPublicTypeComponentMetadata,
   IPublicTypeSnippet,
-  IPublicTypeConfigure,
 } from '@alilc/lowcode-types'
 
+const IMAGE_KEY = 'image'
+
+const normalizeNodeKey = (rawKey: any): string => {
+  if (rawKey === undefined || rawKey === null) return ''
+  return String(rawKey).replace(/^\.?\$?/, '')
+}
+
+const parsePxNumber = (value: any): number | undefined => {
+  if (typeof value === 'number' && Number.isFinite(value)) {
+    return value
+  }
+  if (typeof value === 'string') {
+    const numberLike = Number(value.trim())
+    if (Number.isFinite(numberLike)) {
+      return numberLike
+    }
+    const matched = value.match(/^\s*(\d+(?:\.\d+)?)\s*px\s*$/i)
+    if (!matched) return undefined
+    const parsed = Number(matched[1])
+    return Number.isFinite(parsed) ? parsed : undefined
+  }
+  return undefined
+}
+
+const getSchemaChildren = (target: any): any[] => {
+  const nodeSchema = target?.node?.schema
+  return Array.isArray(nodeSchema?.children) ? nodeSchema.children : []
+}
+
+const findImageChildSchema = (target: any): any | undefined => {
+  const schemaChildren = getSchemaChildren(target)
+  return schemaChildren.find((child: any) => {
+    const keyFromProps = normalizeNodeKey(child?.props?.key)
+    const keyFromNode = normalizeNodeKey(child?.key)
+    return keyFromProps === IMAGE_KEY || keyFromNode === IMAGE_KEY
+  })
+}
+
+/**
+ * 通过引擎的 IPublicModelNode API 查找 key='image' 的子节点。
+ * 相比直接读 node.schema.children，这里使用的是引擎可感知的公共 API，
+ * 保证后续 setPropValue/getPropValue 操作能被引擎正确追踪（触发响应式更新）。
+ */
+const findImageChildNode = (target: any): any | undefined => {
+  const children = target?.node?.children
+  if (!children) return undefined
+  if (typeof children.find === 'function') {
+    return children.find((child: any) => {
+      return normalizeNodeKey(child?.getPropValue?.('key')) === IMAGE_KEY
+    })
+  }
+  return undefined
+}
+
+const getImageStyleNumber = (target: any, styleKey: 'width' | 'height'): number | undefined => {
+  // 优先通过引擎 API 读取，保证与 syncImageStyleValue 写入来源一致
+  const imageChildNode = findImageChildNode(target)
+  if (imageChildNode) {
+    return parsePxNumber(imageChildNode.getPropValue?.('style')?.[styleKey])
+  }
+  // 降级：从 schema 快照读取
+  const imageChildSchema = findImageChildSchema(target)
+  return parsePxNumber(imageChildSchema?.props?.style?.[styleKey])
+}
+
+const syncImageStyleValue = (target: any, styleKey: 'width' | 'height', value: number) => {
+  // 优先通过引擎节点 API 更新子节点 style，确保引擎感知变化（布局面板读取时可见）
+  const imageChildNode = findImageChildNode(target)
+  if (imageChildNode) {
+    const currentStyle = imageChildNode.getPropValue?.('style') || {}
+    imageChildNode.setPropValue?.('style', { ...currentStyle, [styleKey]: `${value}px` })
+    return
+  }
+  // 降级：直接写 schema（引擎无法感知，但保留作为兜底）
+  const imageChildSchema = findImageChildSchema(target)
+  if (!imageChildSchema) {
+    return
+  }
+  if (!imageChildSchema.props) {
+    imageChildSchema.props = {}
+  }
+  const currentStyle = imageChildSchema.props.style || {}
+  imageChildSchema.props.style = {
+    ...currentStyle,
+    [styleKey]: `${value}px`,
+  }
+}
+
+const syncImageDimensionPropsFromChild = (target: any) => {
+  const widthFromChild = getImageStyleNumber(target, 'width')
+  const heightFromChild = getImageStyleNumber(target, 'height')
+  const propsApi = target?.getProps?.()
+
+  if (propsApi && widthFromChild !== undefined) {
+    const currentWidth = parsePxNumber(propsApi.getPropValue?.('imgWidth'))
+    if (currentWidth !== widthFromChild) {
+      propsApi.setPropValue('imgWidth', widthFromChild)
+    }
+  }
+
+  if (propsApi && heightFromChild !== undefined) {
+    const currentHeight = parsePxNumber(propsApi.getPropValue?.('imgHeight'))
+    if (currentHeight !== heightFromChild) {
+      propsApi.setPropValue('imgHeight', heightFromChild)
+    }
+  }
+}
+
+const isDataListBoundExpression = (target: any): boolean => {
+  const dataListValue = target?.getProps?.()?.getPropValue?.('dataList')
+  return !!(
+    dataListValue &&
+    typeof dataListValue === 'object' &&
+    (dataListValue as any).type === 'JSExpression'
+  )
+}
+
 const TeletextListMeta: IPublicTypeComponentMetadata = {
   group: '低代码组件',
   componentName: 'TeletextList',
@@ -129,7 +245,18 @@ const TeletextListMeta: IPublicTypeComponentMetadata = {
         },
         extraProps: {
           setValue: (target, value) => {
-            target.getProps().setPropValue('imagePlacement', value)
+            const props = target.getProps()
+            // 显式快照需要保护的配置，防止引擎某些实现在写入时触发重初始化导致配置丢失
+            const prevDataList = props.getPropValue('dataList')
+            const prevDataListBind = props.getPropValue('dataListBind')
+            const prevTextImgGap = props.getPropValue('textImgGap')
+            props.setPropValue('imagePlacement', value)
+            // 写回被保护的配置（幂等操作，若引擎未重置则无副作用）
+            if (prevDataList !== undefined) props.setPropValue('dataList', prevDataList)
+            if (prevDataListBind !== undefined) props.setPropValue('dataListBind', prevDataListBind)
+            if (prevTextImgGap !== undefined) props.setPropValue('textImgGap', prevTextImgGap)
+            // 切换图片布局时同步一次子图片尺寸，避免面板回退到默认值
+            syncImageDimensionPropsFromChild(target)
           },
         },
       },
@@ -140,8 +267,62 @@ const TeletextListMeta: IPublicTypeComponentMetadata = {
         setter: {
           componentName: 'NumberSetter',
           isRequired: false,
-          initialValue: 100,
-          defaultValue: 100,
+          initialValue: (target) => {
+            const styleWidth = getImageStyleNumber(target, 'width')
+            if (styleWidth !== undefined) {
+              return styleWidth
+            }
+            const propValue = target?.getProps()?.getPropValue?.('imgWidth')
+            const parsedPropValue = parsePxNumber(propValue)
+            if (parsedPropValue !== undefined) return parsedPropValue
+            // 数据源已绑定时，避免回退为 100 触发误写回
+            if (isDataListBoundExpression(target)) {
+              return undefined
+            }
+            return 100
+          },
+          defaultValue: (target) => {
+            const styleWidth = getImageStyleNumber(target, 'width')
+            if (styleWidth !== undefined) {
+              return styleWidth
+            }
+            const propValue = target?.getProps()?.getPropValue?.('imgWidth')
+            const parsedPropValue = parsePxNumber(propValue)
+            if (parsedPropValue !== undefined) return parsedPropValue
+            if (isDataListBoundExpression(target)) {
+              return undefined
+            }
+            return 100
+          },
+        },
+        extraProps: {
+          getValue: (target) => {
+            const styleWidth = getImageStyleNumber(target, 'width')
+            if (styleWidth !== undefined) {
+              const currentWidth = parsePxNumber(target?.getProps()?.getPropValue?.('imgWidth'))
+              if (currentWidth !== styleWidth) {
+                target?.getProps()?.setPropValue?.('imgWidth', styleWidth)
+              }
+              return styleWidth
+            }
+            const propValue = target?.getProps()?.getPropValue?.('imgWidth')
+            const parsedPropValue = parsePxNumber(propValue)
+            if (parsedPropValue !== undefined) {
+              return parsedPropValue
+            }
+            if (isDataListBoundExpression(target)) {
+              return undefined
+            }
+            return 100
+          },
+          setValue: (target, value) => {
+            const parsedValue = parsePxNumber(value)
+            if (parsedValue === undefined) {
+              return
+            }
+            target.getProps().setPropValue('imgWidth', parsedValue)
+            syncImageStyleValue(target, 'width', parsedValue)
+          },
         },
       },
       {
@@ -151,8 +332,62 @@ const TeletextListMeta: IPublicTypeComponentMetadata = {
         setter: {
           componentName: 'NumberSetter',
           isRequired: false,
-          initialValue: 100,
-          defaultValue: 100,
+          initialValue: (target) => {
+            const styleHeight = getImageStyleNumber(target, 'height')
+            if (styleHeight !== undefined) {
+              return styleHeight
+            }
+            const propValue = target?.getProps()?.getPropValue?.('imgHeight')
+            const parsedPropValue = parsePxNumber(propValue)
+            if (parsedPropValue !== undefined) return parsedPropValue
+            // 数据源已绑定时，避免回退为 100 触发误写回
+            if (isDataListBoundExpression(target)) {
+              return undefined
+            }
+            return 100
+          },
+          defaultValue: (target) => {
+            const styleHeight = getImageStyleNumber(target, 'height')
+            if (styleHeight !== undefined) {
+              return styleHeight
+            }
+            const propValue = target?.getProps()?.getPropValue?.('imgHeight')
+            const parsedPropValue = parsePxNumber(propValue)
+            if (parsedPropValue !== undefined) return parsedPropValue
+            if (isDataListBoundExpression(target)) {
+              return undefined
+            }
+            return 100
+          },
+        },
+        extraProps: {
+          getValue: (target) => {
+            const styleHeight = getImageStyleNumber(target, 'height')
+            if (styleHeight !== undefined) {
+              const currentHeight = parsePxNumber(target?.getProps()?.getPropValue?.('imgHeight'))
+              if (currentHeight !== styleHeight) {
+                target?.getProps()?.setPropValue?.('imgHeight', styleHeight)
+              }
+              return styleHeight
+            }
+            const propValue = target?.getProps()?.getPropValue?.('imgHeight')
+            const parsedPropValue = parsePxNumber(propValue)
+            if (parsedPropValue !== undefined) {
+              return parsedPropValue
+            }
+            if (isDataListBoundExpression(target)) {
+              return undefined
+            }
+            return 100
+          },
+          setValue: (target, value) => {
+            const parsedValue = parsePxNumber(value)
+            if (parsedValue === undefined) {
+              return
+            }
+            target.getProps().setPropValue('imgHeight', parsedValue)
+            syncImageStyleValue(target, 'height', parsedValue)
+          },
         },
       },
       {
@@ -177,7 +412,7 @@ const TeletextListMeta: IPublicTypeComponentMetadata = {
         },
         extraProps: {
           setValue: (target, value) => {
-            console.log('dataList setValue', target, value)
+            target.getProps().setPropValue('dataListBind', value)
           },
         },
       },
@@ -225,14 +460,15 @@ const TeletextListMeta: IPublicTypeComponentMetadata = {
         extraProps: {
           setValue(target, value) {
             target.getProps().setPropValue('textLines', value)
-            const schema = target?.node?.schema
-            const node = target?.node
+            const schema: any = target?.node?.schema
+            const node: any = target?.node
+            const schemaChildren: any[] = Array.isArray(schema?.children) ? schema.children : []
 
             // 获取当前文本组件数量
             const currentLength =
-              schema?.children?.filter(
+              schemaChildren.filter(
                 (child) =>
-                  child.componentName === 'NextText' && child.props.key?.startsWith('text-'),
+                  child.componentName === 'NextText' && child?.props?.key?.startsWith('text-'),
               )?.length || 0
 
             if (value > currentLength) {
@@ -246,23 +482,30 @@ const TeletextListMeta: IPublicTypeComponentMetadata = {
                     key: `text-${i}`,
                   },
                 }
-                console.log('node', node, 'node-children', node?.children)
                 node?.children?.push(newChild)
               }
             } else if (value < currentLength) {
-              // 需要移除多余的文本组件
-              node?.children?.filter(
-                (child) =>
-                  !(
-                    child.componentName === 'NextText' &&
-                    child.props?.key?.startsWith('text-') &&
-                    parseInt(child?.props?.key.split('-')[1]) > value
-                  ),
-              )
+              // 收集需要移除的节点，再调用 child.remove() 通过引擎 API 逐个删除
+              // 避免 node.children = [...] 直接赋值（IPublicModelNodeChildren 不支持重新赋值）
+              const nodesToRemove: any[] = []
+              node?.children?.forEach?.((child: any) => {
+                const key = child?.schema?.props?.key
+                if (
+                  child?.componentName === 'NextText' &&
+                  typeof key === 'string' &&
+                  key.startsWith('text-')
+                ) {
+                  const order = Number(key.split('-')[1])
+                  if (!Number.isNaN(order) && order > value) {
+                    nodesToRemove.push(child)
+                  }
+                }
+              })
+              nodesToRemove.forEach((child) => child?.remove?.())
             }
 
             // 更新数据源绑定的配置
-            const dataListBindProp = target.parent.items.find(
+            const dataListBindProp = (target?.parent as any)?.items?.find(
               (item) => item.name === 'dataListBind',
             )
             if (dataListBindProp && dataListBindProp.setter) {
@@ -288,17 +531,6 @@ const TeletextListMeta: IPublicTypeComponentMetadata = {
                 ...textChildren,
               ]
             }
-
-            console.log(
-              '文字行数',
-              target,
-              value,
-              schema,
-              target.node,
-              target.parent,
-              target.parent.getPropValue('dataListBind'),
-              target.parent.node?.getProp('dataListBind'),
-            )
           },
         },
       },
@@ -838,9 +1070,5 @@ const getSnippets = (textLines = 2): IPublicTypeSnippet[] => [
 
 export default {
   ...TeletextListMeta,
-  snippets: getSnippets(
-    (TeletextListMeta.configure as IPublicTypeConfigure).props
-      ?.find((prop) => prop.name === 'textLines')
-      ?.setter?.getValue?.() || 2,
-  ),
+  snippets: getSnippets(2),
 }

package/lowcode_es/meta.js

@@ -117,7 +117,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = '@dckj-npm/dc-material';
   }
   if (version === void 0) {
-    version = '0.1.361';
+    version = '0.1.362';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_es/teletext-list/meta.d.ts

@@ -1,4 +1,4 @@
-import { IPublicTypeSnippet, IPublicTypeConfigure } from '@alilc/lowcode-types';
+import { IPublicTypeSnippet } from '@alilc/lowcode-types';
 declare const _default: {
     snippets: IPublicTypeSnippet[];
     componentName: string;
@@ -12,7 +12,7 @@ declare const _default: {
     devMode?: "proCode" | "lowCode";
     npm?: import("@alilc/lowcode-types").IPublicTypeNpmInfo;
     props?: import("@alilc/lowcode-types").IPublicTypePropConfig[];
-    configure?: import("@alilc/lowcode-types").IPublicTypeFieldConfig[] | IPublicTypeConfigure;
+    configure?: import("@alilc/lowcode-types").IPublicTypeFieldConfig[] | import("@alilc/lowcode-types").IPublicTypeConfigure;
     experimental?: import("@alilc/lowcode-types").IPublicTypeAdvanced;
     schema?: import("@alilc/lowcode-types").IPublicTypeComponentSchema;
     group?: string | import("@alilc/lowcode-types").IPublicTypeI18nData;