@openli1115/lowcode-edit-pro-table 1.0.53 → 1.0.55

package/es/components/ProTimePicker/index.js

@@ -1,24 +1,14 @@
 import _TimePicker from "@alifd/next/es/time-picker";
 import _extends from "@babel/runtime/helpers/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/objectWithoutPropertiesLoose";
-var _excluded = ["screen_structure", "screen_structure_field", "screen_inner_id", "range_inner_table", "defaultValue", "disableEdit"];
-import { getFormBindingPath } from "../utils";
-import { useComponentContext } from "../../context/useComponentContext";
-var React = window.React;
-var createElement = React.createElement,
-  useEffect = React.useEffect,
-  useRef = React.useRef,
-  useState = React.useState;
+import { resolveProScreenBinding } from "../utils";
+import { useProBoundValue } from "../../context/useProBoundValue";
+var createElement = window.React.createElement;
 var moment = window.moment;
-
-// 工具函数：Date 转字符串 "HH:mm:ss"
 function timeDateToString(date) {
   if (!date) return '';
   if (moment) {
-    // 使用 moment 格式化
     return moment(date).format('HH:mm:ss');
   }
-  // 降级方案
   var d = new Date(date);
   var h = String(d.getHours()).padStart(2, '0');
   var m = String(d.getMinutes()).padStart(2, '0');
@@ -30,32 +20,33 @@ var ProTimePicker = function ProTimePicker(props) {
     screen_structure_field = props.screen_structure_field,
     screen_inner_id = props.screen_inner_id,
     range_inner_table = props.range_inner_table,
-    defaultValue = props.defaultValue,
     disableEdit = props.disableEdit,
-    otherProps = _objectWithoutPropertiesLoose(props, _excluded);
-  var _getFormBindingPath = getFormBindingPath(screen_structure, screen_structure_field, range_inner_table),
-    structureName = _getFormBindingPath.structureName,
-    structureField = _getFormBindingPath.structureField;
-  var fieldPath = structureName + "." + structureField;
-  var _useComponentContext = useComponentContext(fieldPath),
-    value = _useComponentContext.value,
-    onValueChange = _useComponentContext.onValueChange;
-  console.log('ProTimePicker useComponentContext value', value, fieldPath);
-  // console.log('otherProps', otherProps);
-
+    readOnlyProp = props.readOnly,
+    disabledProp = props.disabled,
+    _v = props.value,
+    schemaOnChange = props.onChange,
+    defaultValue = props.defaultValue;
+  var _resolveProScreenBind = resolveProScreenBinding({
+      screen_structure: screen_structure,
+      screen_structure_field: screen_structure_field,
+      range_inner_table: range_inner_table
+    }),
+    structureName = _resolveProScreenBind.structureName,
+    structureField = _resolveProScreenBind.structureField,
+    fieldPath = _resolveProScreenBind.fieldPath;
+  var _useProBoundValue = useProBoundValue(fieldPath, defaultValue, ''),
+    value = _useProBoundValue.value,
+    commit = _useProBoundValue.commit;
   var handleChange = function handleChange(newValue) {
-    // updateScreenStructure(screen_structure, screen_structure_field, value);
-    if (onValueChange) {
-      onValueChange(timeDateToString(newValue));
-    }
-    // 触发标准 onChange
-    if (props.onChange) {
-      props.onChange(timeDateToString(newValue), structureName, structureField);
-    }
+    var str = timeDateToString(newValue);
+    commit(str);
+    schemaOnChange === null || schemaOnChange === void 0 ? void 0 : schemaOnChange(str, structureName, structureField);
   };
   return /*#__PURE__*/React.createElement("span", {
     className: "field-wrapper " + (disableEdit ? 'disable-edit' : 'enable-edit')
   }, /*#__PURE__*/React.createElement(_TimePicker, _extends({}, props, {
+    readOnly: disableEdit ? true : readOnlyProp,
+    disabled: disabledProp,
     value: value,
     onChange: handleChange
   })));

package/es/components/utils/index.d.ts

@@ -3,9 +3,23 @@ export declare const getStructureFieldName: (screen_structure: string, screen_st
     structureName: string;
     structureField: string;
 };
-/** 范围内表：表名来自 range_inner_table，字段名仍来自 screen_structure_field */
+/**
+ * 屏幕结构：screen_structure + screen_structure_field。
+ * 范围内表：仅 range_inner_table；未选结构字段时默认绑定 low（内表行值）。
+ */
 export declare const getFormBindingPath: (screen_structure?: string, screen_structure_field?: string, range_inner_table?: string) => {
     structureName: string;
     structureField: string;
 };
+/** 合法表单路径；缺省时为空串，避免 lodash path `'.'` 污染数据 */
+export declare const getFormFieldPath: (screen_structure?: string, screen_structure_field?: string, range_inner_table?: string) => string;
+export declare const resolveProScreenBinding: (props: {
+    screen_structure?: string;
+    screen_structure_field?: string;
+    range_inner_table?: string;
+}) => {
+    structureName: string;
+    structureField: string;
+    fieldPath: string;
+};
 export declare const baseUrl: string;

package/es/components/utils/index.js

@@ -30,17 +30,47 @@ export var getStructureFieldName = function getStructureFieldName(screen_structu
   };
 };
 
-/** 范围内表：表名来自 range_inner_table，字段名仍来自 screen_structure_field */
+/**
+ * 屏幕结构：screen_structure + screen_structure_field。
+ * 范围内表：仅 range_inner_table；未选结构字段时默认绑定 low（内表行值）。
+ */
 export var getFormBindingPath = function getFormBindingPath(screen_structure, screen_structure_field, range_inner_table) {
   var rt = range_inner_table && String(range_inner_table).trim();
-  if (rt && screen_structure_field) {
-    var structureName = String(range_inner_table).split('__')[1] || '';
-    var structureField = String(screen_structure_field).split('__')[1] || '';
-    return {
-      structureName: structureName,
-      structureField: structureField
-    };
+  var structureName = '';
+  var structureField = '';
+  if (rt) {
+    structureName = String(range_inner_table).split('__')[1] || '';
+    structureField = screen_structure_field ? String(screen_structure_field).split('__')[1] || '' : '';
+    if (structureName && !structureField) {
+      structureField = 'low';
+    }
+  } else {
+    var pair = getStructureFieldName(screen_structure || '', screen_structure_field || '');
+    structureName = pair.structureName || '';
+    structureField = pair.structureField || '';
   }
-  return getStructureFieldName(screen_structure || '', screen_structure_field || '');
+  return {
+    structureName: structureName,
+    structureField: structureField
+  };
+};
+
+/** 合法表单路径；缺省时为空串，避免 lodash path `'.'` 污染数据 */
+export var getFormFieldPath = function getFormFieldPath(screen_structure, screen_structure_field, range_inner_table) {
+  var _getFormBindingPath = getFormBindingPath(screen_structure, screen_structure_field, range_inner_table),
+    structureName = _getFormBindingPath.structureName,
+    structureField = _getFormBindingPath.structureField;
+  return structureName && structureField ? structureName + "." + structureField : '';
+};
+export var resolveProScreenBinding = function resolveProScreenBinding(props) {
+  var _getFormBindingPath2 = getFormBindingPath(props.screen_structure, props.screen_structure_field, props.range_inner_table),
+    structureName = _getFormBindingPath2.structureName,
+    structureField = _getFormBindingPath2.structureField;
+  var fieldPath = structureName && structureField ? structureName + "." + structureField : '';
+  return {
+    structureName: structureName,
+    structureField: structureField,
+    fieldPath: fieldPath
+  };
 };
 export var baseUrl = "https://" + window.location.hostname + ":18080/prod-api";

package/es/context/useComponentContext.d.ts

@@ -1,4 +1,6 @@
-export declare const useComponentContext: (path: string) => {
+/** 级联等组件用稳定空数组，避免 deps 抖动 */
+export declare const FORM_EMPTY_ARRAY: never[];
+export declare const useComponentContext: (path: string, whenNull?: any) => {
     value: any;
     onValueChange: (newValue: any) => void;
 };

package/es/context/useComponentContext.js

@@ -3,27 +3,27 @@ import { useContext, useCallback, useMemo } from 'react';
 import { get } from 'lodash';
 import { getFormContext } from "./FormProvider";
 var FormContext = getFormContext();
-export var useComponentContext = function useComponentContext(path) {
-  var formContext = useContext(FormContext);
 
-  // 使用 useMemo 缓存值
+/** 级联等组件用稳定空数组，避免 deps 抖动 */
+export var FORM_EMPTY_ARRAY = [];
+export var useComponentContext = function useComponentContext(path, whenNull) {
+  if (whenNull === void 0) {
+    whenNull = '';
+  }
+  var formContext = useContext(FormContext);
+  var safePath = path && path !== '.' ? path : '';
   var value = useMemo(function () {
-    var _get;
-    console.log("[useComponentContext] \u2705 initial value for '" + path + "':", formContext, value);
-    if (!(formContext !== null && formContext !== void 0 && formContext.initialized)) return '';
-    return (_get = get(formContext.values, path)) !== null && _get !== void 0 ? _get : '';
-  }, [formContext, path]);
-
-  // 使用 useCallback 缓存 onValueChange
+    if (!safePath || !(formContext !== null && formContext !== void 0 && formContext.initialized)) return whenNull;
+    var v = get(formContext.values, safePath);
+    if (v === undefined || v === null) return whenNull;
+    return v;
+  }, [formContext, safePath, whenNull]);
   var onValueChange = useCallback(function (newValue) {
-    if (!(formContext !== null && formContext !== void 0 && formContext.setFieldValue)) return;
-    console.log("[useComponentContext] \uD83D\uDCDD onValueChange triggered for '" + path + "' -> new value:", newValue);
-
-    // 检查值是否实际变化
-    var currentValue = get(formContext.values, path);
+    if (!safePath || !(formContext !== null && formContext !== void 0 && formContext.setFieldValue)) return;
+    var currentValue = get(formContext.values, safePath);
     if (currentValue === newValue) return;
-    formContext.setFieldValue(path, newValue);
-  }, [formContext, path]);
+    formContext.setFieldValue(safePath, newValue);
+  }, [formContext, safePath]);
   return {
     value: value,
     onValueChange: onValueChange

package/es/context/useProBoundValue.d.ts

@@ -0,0 +1,6 @@
+/** contextWhenNull：绑定路径下值为 null/undefined 时的展示值（级联用 FORM_EMPTY_ARRAY，选择器用 undefined） */
+export declare function useProBoundValue(fieldPath: string, unboundInitial: any, contextWhenNull?: any): {
+    value: any;
+    commit: (next: any) => void;
+    bound: boolean;
+};

package/es/context/useProBoundValue.js

@@ -0,0 +1,34 @@
+// 表单上下文绑定 + 无路径时本地状态（与 ProInput 等行为一致）
+import { useComponentContext } from "./useComponentContext";
+var React = window.React;
+var useCallback = React.useCallback,
+  useState = React.useState;
+
+/** contextWhenNull：绑定路径下值为 null/undefined 时的展示值（级联用 FORM_EMPTY_ARRAY，选择器用 undefined） */
+export function useProBoundValue(fieldPath, unboundInitial, contextWhenNull) {
+  if (contextWhenNull === void 0) {
+    contextWhenNull = '';
+  }
+  var _useComponentContext = useComponentContext(fieldPath, contextWhenNull),
+    ctxValue = _useComponentContext.value,
+    onValueChange = _useComponentContext.onValueChange;
+  var bound = Boolean(fieldPath);
+  var _useState = useState(function () {
+      return unboundInitial;
+    }),
+    localValue = _useState[0],
+    setLocalValue = _useState[1];
+  var value = bound ? ctxValue : localValue;
+  var commit = useCallback(function (next) {
+    if (bound) {
+      onValueChange === null || onValueChange === void 0 ? void 0 : onValueChange(next);
+    } else {
+      setLocalValue(next);
+    }
+  }, [bound, onValueChange]);
+  return {
+    value: value,
+    commit: commit,
+    bound: bound
+  };
+}

package/es/index.d.ts

@@ -14,4 +14,5 @@ export { default as ProRadio } from './components/ProRadio';
 export { default as ProCascaderSelect } from './components/ProCascaderSelect';
 export { DatePicker, TimePicker } from 'antd';
 export { getFormContext, initializeFormContext, FormProvider } from './context/FormProvider';
-export { useComponentContext } from './context/useComponentContext';
+export { useComponentContext, FORM_EMPTY_ARRAY } from './context/useComponentContext';
+export { useProBoundValue } from './context/useProBoundValue';

package/es/index.js

@@ -12,4 +12,5 @@ export { default as ProRadio } from "./components/ProRadio";
 export { default as ProCascaderSelect } from "./components/ProCascaderSelect";
 export { DatePicker, TimePicker } from 'antd';
 export { getFormContext, initializeFormContext, FormProvider } from "./context/FormProvider";
-export { useComponentContext } from "./context/useComponentContext";
+export { useComponentContext, FORM_EMPTY_ARRAY } from "./context/useComponentContext";
+export { useProBoundValue } from "./context/useProBoundValue";

package/lib/components/ProCascaderSelect/index.js

@@ -5,50 +5,47 @@ exports.__esModule = true;
 exports["default"] = void 0;
 var _cascaderSelect = _interopRequireDefault(require("@alifd/next/lib/cascader-select"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _utils = require("../utils");
-var _useComponentContext2 = require("../../context/useComponentContext");
-var _excluded = ["screen_structure", "screen_structure_field", "screen_inner_id", "range_inner_table", "dataSource", "defaultValue", "disableEdit"];
-var React = window.React;
-var createElement = React.createElement,
-  useEffect = React.useEffect,
-  useRef = React.useRef,
-  useState = React.useState;
+var _useProBoundValue2 = require("../../context/useProBoundValue");
+var _useComponentContext = require("../../context/useComponentContext");
+var createElement = window.React.createElement;
 var ProCascaderSelect = function ProCascaderSelect(props) {
   var screen_structure = props.screen_structure,
     screen_structure_field = props.screen_structure_field,
     screen_inner_id = props.screen_inner_id,
     range_inner_table = props.range_inner_table,
     dataSource = props.dataSource,
-    defaultValue = props.defaultValue,
     disableEdit = props.disableEdit,
-    otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
-  var _getFormBindingPath = (0, _utils.getFormBindingPath)(screen_structure, screen_structure_field, range_inner_table),
-    structureName = _getFormBindingPath.structureName,
-    structureField = _getFormBindingPath.structureField;
-  var fieldPath = structureName + "." + structureField;
-  var _useComponentContext = (0, _useComponentContext2.useComponentContext)(fieldPath),
-    value = _useComponentContext.value,
-    onValueChange = _useComponentContext.onValueChange;
-  console.log('ProCascaderSelect useComponentContext value', value, fieldPath);
-  // console.log('otherProps', otherProps);
-
+    readOnlyProp = props.readOnly,
+    disabledProp = props.disabled,
+    _v = props.value,
+    schemaOnChange = props.onChange,
+    defaultValue = props.defaultValue;
+  var _resolveProScreenBind = (0, _utils.resolveProScreenBinding)({
+      screen_structure: screen_structure,
+      screen_structure_field: screen_structure_field,
+      range_inner_table: range_inner_table
+    }),
+    structureName = _resolveProScreenBind.structureName,
+    structureField = _resolveProScreenBind.structureField,
+    fieldPath = _resolveProScreenBind.fieldPath;
+  var unboundInit = defaultValue != null && Array.isArray(defaultValue) ? defaultValue : _useComponentContext.FORM_EMPTY_ARRAY;
+  var _useProBoundValue = (0, _useProBoundValue2.useProBoundValue)(fieldPath, unboundInit, _useComponentContext.FORM_EMPTY_ARRAY),
+    value = _useProBoundValue.value,
+    commit = _useProBoundValue.commit;
   var handleChange = function handleChange(newValue) {
-    // updateScreenStructure(screen_structure, screen_structure_field, value);
-    if (onValueChange) {
-      onValueChange(newValue);
-    }
-    // 触发标准 onChange
-    if (props.onChange) {
-      props.onChange(newValue, structureName, structureField);
-    }
+    commit(newValue);
+    schemaOnChange === null || schemaOnChange === void 0 ? void 0 : schemaOnChange(newValue, structureName, structureField);
   };
+  var displayValue = Array.isArray(value) ? value : _useComponentContext.FORM_EMPTY_ARRAY;
   return /*#__PURE__*/React.createElement("span", {
     className: "field-wrapper " + (disableEdit ? 'disable-edit' : 'enable-edit')
   }, /*#__PURE__*/React.createElement(_cascaderSelect["default"], (0, _extends2["default"])({}, props, {
-    value: value,
-    onChange: handleChange,
-    dataSource: dataSource
+    readOnly: disableEdit ? true : readOnlyProp,
+    disabled: disabledProp,
+    dataSource: dataSource,
+    value: displayValue,
+    onChange: handleChange
   })));
 };
 var _default = exports["default"] = ProCascaderSelect;

package/lib/components/ProCheckbox/index.d.ts

@@ -1,14 +1,6 @@
 import { Checkbox } from '@alifd/next';
 /**
- * ProCheckbox
- * @description 复选按钮
- * @param {string} screen_structure_field 屏幕结构字段
- * @param {string} screen_inner_id 屏幕内部id
- * @param {string} screen_structure 屏幕结构
- * @param {string} dataSource 数据源
- * @param {string} checkedValue 选中值
- * @param {string} defaultChecked 默认选中
- * @param {string} checked 是否选中
+ * ProCheckbox — 复选框（单框 checked）
  */
 declare const ProCheckbox: typeof Checkbox;
 export default ProCheckbox;

package/lib/components/ProCheckbox/index.js

@@ -5,26 +5,12 @@ exports.__esModule = true;
 exports["default"] = void 0;
 var _checkbox = _interopRequireDefault(require("@alifd/next/lib/checkbox"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _utils = require("../utils");
-var _useComponentContext2 = require("../../context/useComponentContext");
-var _excluded = ["screen_structure", "screen_structure_field", "screen_inner_id", "range_inner_table", "checkedValue", "checked", "disableEdit"];
-var React = window.React;
-var createElement = React.createElement,
-  useEffect = React.useEffect,
-  useRef = React.useRef,
-  useState = React.useState;
+var _useProBoundValue2 = require("../../context/useProBoundValue");
+var createElement = window.React.createElement;
 
 /**
- * ProCheckbox
- * @description 复选按钮
- * @param {string} screen_structure_field 屏幕结构字段
- * @param {string} screen_inner_id 屏幕内部id
- * @param {string} screen_structure 屏幕结构
- * @param {string} dataSource 数据源
- * @param {string} checkedValue 选中值
- * @param {string} defaultChecked 默认选中
- * @param {string} checked 是否选中
+ * ProCheckbox — 复选框（单框 checked）
  */
 var ProCheckbox = function ProCheckbox(props) {
   var screen_structure = props.screen_structure,
@@ -32,33 +18,34 @@ var ProCheckbox = function ProCheckbox(props) {
     screen_inner_id = props.screen_inner_id,
     range_inner_table = props.range_inner_table,
     checkedValue = props.checkedValue,
-    checked = props.checked,
+    _checkedProp = props.checked,
     disableEdit = props.disableEdit,
-    otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
-  var _getFormBindingPath = (0, _utils.getFormBindingPath)(screen_structure, screen_structure_field, range_inner_table),
-    structureName = _getFormBindingPath.structureName,
-    structureField = _getFormBindingPath.structureField;
-  var fieldPath = structureName + "." + structureField;
-  var _useComponentContext = (0, _useComponentContext2.useComponentContext)(fieldPath),
-    value = _useComponentContext.value,
-    onValueChange = _useComponentContext.onValueChange;
-  console.log('ProCheckbox useComponentContext value', value, fieldPath);
-  // console.log('otherProps', otherProps);
-
-  var handleChange = function handleChange(newValue) {
-    // updateScreenStructure(screen_structure, screen_structure_field, value);
-    if (onValueChange) {
-      onValueChange(newValue);
-    }
-    // 触发标准 onChange
-    if (props.onChange) {
-      props.onChange(newValue, structureName, structureField);
-    }
+    readOnlyProp = props.readOnly,
+    disabledProp = props.disabled,
+    _v = props.value,
+    schemaOnChange = props.onChange;
+  var _resolveProScreenBind = (0, _utils.resolveProScreenBinding)({
+      screen_structure: screen_structure,
+      screen_structure_field: screen_structure_field,
+      range_inner_table: range_inner_table
+    }),
+    structureName = _resolveProScreenBind.structureName,
+    structureField = _resolveProScreenBind.structureField,
+    fieldPath = _resolveProScreenBind.fieldPath;
+  var _useProBoundValue = (0, _useProBoundValue2.useProBoundValue)(fieldPath, false, false),
+    value = _useProBoundValue.value,
+    commit = _useProBoundValue.commit;
+  var handleChange = function handleChange(checked) {
+    commit(checked);
+    schemaOnChange === null || schemaOnChange === void 0 ? void 0 : schemaOnChange(checked, structureName, structureField);
   };
   return /*#__PURE__*/React.createElement("span", {
     className: "field-wrapper " + (disableEdit ? 'disable-edit' : 'enable-edit')
   }, /*#__PURE__*/React.createElement(_checkbox["default"], (0, _extends2["default"])({}, props, {
-    checked: value,
+    readOnly: disableEdit ? true : readOnlyProp,
+    disabled: disabledProp,
+    checkedValue: checkedValue,
+    checked: Boolean(value),
     onChange: handleChange
   })));
 };

package/lib/components/ProDatePicker/index.js

@@ -5,46 +5,40 @@ exports.__esModule = true;
 exports["default"] = void 0;
 var _datePicker = _interopRequireDefault(require("@alifd/next/lib/date-picker"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _utils = require("../utils");
-var _useComponentContext2 = require("../../context/useComponentContext");
-var _excluded = ["screen_structure", "screen_structure_field", "screen_inner_id", "range_inner_table", "defaultValue", "disableEdit"];
-var React = window.React;
-var createElement = React.createElement,
-  useEffect = React.useEffect,
-  useRef = React.useRef,
-  useState = React.useState;
+var _useProBoundValue2 = require("../../context/useProBoundValue");
+var createElement = window.React.createElement;
 var ProDatePicker = function ProDatePicker(props) {
   var screen_structure = props.screen_structure,
     screen_structure_field = props.screen_structure_field,
     screen_inner_id = props.screen_inner_id,
     range_inner_table = props.range_inner_table,
-    defaultValue = props.defaultValue,
     disableEdit = props.disableEdit,
-    otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
-  var _getFormBindingPath = (0, _utils.getFormBindingPath)(screen_structure, screen_structure_field, range_inner_table),
-    structureName = _getFormBindingPath.structureName,
-    structureField = _getFormBindingPath.structureField;
-  var fieldPath = structureName + "." + structureField;
-  var _useComponentContext = (0, _useComponentContext2.useComponentContext)(fieldPath),
-    value = _useComponentContext.value,
-    onValueChange = _useComponentContext.onValueChange;
-  console.log('ProDatePicker useComponentContext value', value, fieldPath);
-  // console.log('otherProps', otherProps);
-
+    readOnlyProp = props.readOnly,
+    disabledProp = props.disabled,
+    _v = props.value,
+    schemaOnChange = props.onChange,
+    defaultValue = props.defaultValue;
+  var _resolveProScreenBind = (0, _utils.resolveProScreenBinding)({
+      screen_structure: screen_structure,
+      screen_structure_field: screen_structure_field,
+      range_inner_table: range_inner_table
+    }),
+    structureName = _resolveProScreenBind.structureName,
+    structureField = _resolveProScreenBind.structureField,
+    fieldPath = _resolveProScreenBind.fieldPath;
+  var _useProBoundValue = (0, _useProBoundValue2.useProBoundValue)(fieldPath, defaultValue, ''),
+    value = _useProBoundValue.value,
+    commit = _useProBoundValue.commit;
   var handleChange = function handleChange(newValue) {
-    // updateScreenStructure(screen_structure, screen_structure_field, value);
-    if (onValueChange) {
-      onValueChange(newValue);
-    }
-    // 触发标准 onChange
-    if (props.onChange) {
-      props.onChange(newValue, structureName, structureField);
-    }
+    commit(newValue);
+    schemaOnChange === null || schemaOnChange === void 0 ? void 0 : schemaOnChange(newValue, structureName, structureField);
   };
   return /*#__PURE__*/React.createElement("span", {
     className: "field-wrapper " + (disableEdit ? 'disable-edit' : 'enable-edit')
   }, /*#__PURE__*/React.createElement(_datePicker["default"], (0, _extends2["default"])({}, props, {
+    readOnly: disableEdit ? true : readOnlyProp,
+    disabled: disabledProp,
     value: value,
     onChange: handleChange
   })));

package/lib/components/ProInput/index.d.ts

@@ -2,9 +2,6 @@ import { Input } from '@alifd/next';
 /**
  * ProInput
  * @description 输入框组件
- * @param {string} screen_structure_field 屏幕结构字段
- * @param {string} screen_inner_id 屏幕内部id
- * @param {string} screen_structure 屏幕结构
  */
 declare const ProInput: typeof Input;
 export default ProInput;

package/lib/components/ProInput/index.js

@@ -5,22 +5,13 @@ exports.__esModule = true;
 exports["default"] = void 0;
 var _input = _interopRequireDefault(require("@alifd/next/lib/input"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _utils = require("../utils");
-var _useComponentContext2 = require("../../context/useComponentContext");
-var _excluded = ["screen_structure", "screen_structure_field", "screen_inner_id", "range_inner_table", "disableEdit"];
-var React = window.React;
-var createElement = React.createElement,
-  useEffect = React.useEffect,
-  useRef = React.useRef,
-  useState = React.useState;
+var _useProBoundValue2 = require("../../context/useProBoundValue");
+var createElement = window.React.createElement;
 
 /**
  * ProInput
  * @description 输入框组件
- * @param {string} screen_structure_field 屏幕结构字段
- * @param {string} screen_inner_id 屏幕内部id
- * @param {string} screen_structure 屏幕结构
  */
 var ProInput = function ProInput(props) {
   var screen_structure = props.screen_structure,
@@ -28,30 +19,31 @@ var ProInput = function ProInput(props) {
     screen_inner_id = props.screen_inner_id,
     range_inner_table = props.range_inner_table,
     disableEdit = props.disableEdit,
-    otherProps = (0, _objectWithoutPropertiesLoose2["default"])(props, _excluded);
-  var _getFormBindingPath = (0, _utils.getFormBindingPath)(screen_structure, screen_structure_field, range_inner_table),
-    structureName = _getFormBindingPath.structureName,
-    structureField = _getFormBindingPath.structureField;
-  var fieldPath = structureName + "." + structureField;
-  var _useComponentContext = (0, _useComponentContext2.useComponentContext)(fieldPath),
-    value = _useComponentContext.value,
-    onValueChange = _useComponentContext.onValueChange;
-  console.log('ProInput useComponentContext value', value, fieldPath);
-  // console.log('otherProps', otherProps);
-
+    readOnlyProp = props.readOnly,
+    disabledProp = props.disabled,
+    _schemaValue = props.value,
+    schemaOnChange = props.onChange,
+    schemaDefaultValue = props.defaultValue;
+  var _resolveProScreenBind = (0, _utils.resolveProScreenBinding)({
+      screen_structure: screen_structure,
+      screen_structure_field: screen_structure_field,
+      range_inner_table: range_inner_table
+    }),
+    structureName = _resolveProScreenBind.structureName,
+    structureField = _resolveProScreenBind.structureField,
+    fieldPath = _resolveProScreenBind.fieldPath;
+  var _useProBoundValue = (0, _useProBoundValue2.useProBoundValue)(fieldPath, schemaDefaultValue != null ? String(schemaDefaultValue) : '', ''),
+    value = _useProBoundValue.value,
+    commit = _useProBoundValue.commit;
   var handleChange = function handleChange(newValue) {
-    // updateScreenStructure(screen_structure, screen_structure_field, value);
-    if (onValueChange) {
-      onValueChange(newValue);
-    }
-    // 触发标准 onChange
-    if (props.onChange) {
-      props.onChange(newValue, structureName, structureField);
-    }
+    commit(newValue);
+    schemaOnChange === null || schemaOnChange === void 0 ? void 0 : schemaOnChange(newValue, structureName, structureField);
   };
   return /*#__PURE__*/React.createElement("span", {
     className: "field-wrapper " + (disableEdit ? 'disable-edit' : 'enable-edit')
   }, /*#__PURE__*/React.createElement(_input["default"], (0, _extends2["default"])({}, props, {
+    readOnly: disableEdit ? true : readOnlyProp,
+    disabled: disabledProp,
     value: value,
     onChange: handleChange
   })));

package/lib/components/ProRadio/index.d.ts

@@ -1,14 +1,6 @@
 import { Radio } from '@alifd/next';
 /**
- * ProRadio
- * @description 单选按钮组
- * @param {string} defaultValue 默认值(radio.group才有的字段)
- * @param {string} screen_structure_field 屏幕结构字段
- * @param {string} screen_inner_id 屏幕内部id
- * @param {string} screen_structure 屏幕结构
- * @param {string} dataSource 数据源
- * @param {string} checkedValue 选中值
- * @param {string} checked 默认选中
+ * ProRadio — 单选按钮组
  */
 declare const ProRadio: typeof Radio;
 export default ProRadio;