form-driver 0.4.7 → 0.4.9

package/es/m3.css

@@ -503,6 +503,12 @@ table.M3_table tr:last-child td {
   width: 40px;
 }
 
+.weight-slider .ant-slider-handle {
+  width: 20px;
+  height: 20px;
+  margin-top: -8px;
+}
+
 .form-driver-plugin-richtext-viewer-wrap .richtext-viewer-more {
   text-align: center;
   box-shadow: 0px -5px 5px rgba(232,232,232,0.38039);

package/es/m3.js

@@ -20440,9 +20440,9 @@ var InputSlider = /*#__PURE__*/memo(function (props) {
   };
 
   return jsxs(Row, {
-    gutter: [12, 12],
+    gutter: [18, 12],
     children: [jsx(Col, {
-      span: 4,
+      span: 5,
       children: jsx(InputNumber, {
         precision: 0,
         style: {
@@ -20457,14 +20457,15 @@ var InputSlider = /*#__PURE__*/memo(function (props) {
         onBlur: onAfterChange
       })
     }), jsx(Col, {
-      span: 20,
+      span: 19,
       children: jsx(Slider, {
         min: min,
         max: max,
         marks: (_marks = {}, _marks[min] = min, _marks[max] = max, _marks),
         onChange: _onChange,
         onAfterChange: onAfterChange,
-        value: typeof value === "number" ? value : 0
+        value: typeof value === "number" ? value : 0,
+        className: "weight-slider"
       })
     })]
   });
@@ -20499,6 +20500,7 @@ var AWeight = /*#__PURE__*/function (_Viewer) {
       })) == null ? void 0 : _values$find.value) != null ? _values$find$value : 0;
     })) != null ? _this$_enumFields$map : new Array(_this._enumFields.length).fill(0);
     _this.state = {
+      hasAssignWeight: 0,
       allSliderValues: _this.allValues,
       ctrlVersion: 1
     }; // 初始化数据,避免出现 null 的情况
@@ -20584,15 +20586,21 @@ var AWeight = /*#__PURE__*/function (_Viewer) {
     return current + (target - current) * factor;
   };
 
+  _proto.calAssignWeight = function calAssignWeight() {
+    var values = _Viewer.prototype.getValue.call(this);
+
+    return values.reduce(function (total, current) {
+      return total + current.value;
+    }, 0);
+  };
+
   _proto.element = function element() {
     var _this3 = this;
 
-    var hasAssignWeight = this.state.allSliderValues.reduce(function (total, current) {
-      return total + current;
-    }, 0);
     return jsxs("div", {
       style: {
-        padding: 16
+        padding: 16,
+        paddingBottom: 32
       },
       children: [this._enumFields.map(function (option, index) {
         return jsxs("div", {
@@ -20612,32 +20620,37 @@ var AWeight = /*#__PURE__*/function (_Viewer) {
                   label: _this3._enumFields[index].value,
                   value: n
                 };
-              })); // 使用节流控制联动更新频率
-
-
-              var now = Date.now();
-
-              if (now - _this3.lastUpdateTime >= _this3.THROTTLE_DELAY) {
-                _this3.updateLinkedSliders(numbers, index, isInputChange);
+              }));
 
-                _this3.lastUpdateTime = now;
-              } else {
-                // 使用防抖确保最后一次更新被执行
-                if (_this3.debounceTimer) {
-                  clearTimeout(_this3.debounceTimer);
-                }
-
-                _this3.debounceTimer = setTimeout(function () {
-                  _this3.updateLinkedSliders(numbers, index, isInputChange);
+              _this3.setState({
+                allSliderValues: numbers
+              }); // 使用节流控制联动更新频率
+              // const now = Date.now();
+              // if (now - this.lastUpdateTime >= this.THROTTLE_DELAY) {
+              //   this.updateLinkedSliders(numbers, index, isInputChange);
+              //   this.lastUpdateTime = now;
+              // } else {
+              //   // 使用防抖确保最后一次更新被执行
+              //   if (this.debounceTimer) {
+              //     clearTimeout(this.debounceTimer);
+              //   }
+              //   this.debounceTimer = setTimeout(() => {
+              //     this.updateLinkedSliders(numbers, index, isInputChange);
+              //     this.lastUpdateTime = Date.now();
+              //   }, this.THROTTLE_DELAY);
+              // }
 
-                  _this3.lastUpdateTime = Date.now();
-                }, _this3.THROTTLE_DELAY);
-              }
             },
             value: _this3.state.allSliderValues[index],
             onAfterChange: function onAfterChange(value) {
               // 结束更新后，再重设一遍数据，确保数据的准确性
               _this3.updateLinkedSliders(_this3.state.allSliderValues, index, true);
+
+              console.log("onAfterChange", _this3.calAssignWeight());
+
+              _this3.setState({
+                hasAssignWeight: _this3.calAssignWeight()
+              });
             },
             max: _this3.totalWeight,
             min: 0
@@ -20646,9 +20659,9 @@ var AWeight = /*#__PURE__*/function (_Viewer) {
       }), this.totalWeight > 0 && this._enumFields.length > 0 ? jsxs("div", {
         children: ["\u63D0\u793A\uFF1A\u603B\u6BD4\u91CD\u5FC5\u987B\u4E3A", this.totalWeight, "\uFF0C\u5DF2\u5206\u914D\u6BD4\u91CD\uFF1A", jsxs("span", {
           style: {
-            color: hasAssignWeight > this.totalWeight ? "red" : "#000"
+            color: this.state.hasAssignWeight > this.totalWeight ? "red" : "#000"
           },
-          children: [hasAssignWeight, hasAssignWeight > this.totalWeight ? "\uFF0C\u8BF7\u4FEE\u6539" : ""]
+          children: [this.state.hasAssignWeight, this.state.hasAssignWeight > this.totalWeight ? "\uFF0C\u8BF7\u4FEE\u6539" : ""]
         })]
       }) : null]
     });
@@ -21608,7 +21621,7 @@ function validateWeightValue(a, schema, value, path) {
   // 验证总比重是否小于目标值
 
 
-  if (schema.weight && currentTotal < schema.weight && currentTotal !== 0) {
+  if (schema.weight && currentTotal < schema.weight) {
     return {
       message: "\u5DF2\u5206\u914D\u6BD4\u91CD\u4E0D\u5F97\u5C0F\u4E8E\u603B\u6BD4\u91CD",
       path: path

package/lib/m3.css

@@ -503,6 +503,12 @@ table.M3_table tr:last-child td {
   width: 40px;
 }
 
+.weight-slider .ant-slider-handle {
+  width: 20px;
+  height: 20px;
+  margin-top: -8px;
+}
+
 .form-driver-plugin-richtext-viewer-wrap .richtext-viewer-more {
   text-align: center;
   box-shadow: 0px -5px 5px rgba(232,232,232,0.38039);

package/lib/m3.js

@@ -20464,9 +20464,9 @@ var InputSlider = /*#__PURE__*/React.memo(function (props) {
   };
 
   return jsxRuntime.jsxs(antd.Row, {
-    gutter: [12, 12],
+    gutter: [18, 12],
     children: [jsxRuntime.jsx(antd.Col, {
-      span: 4,
+      span: 5,
       children: jsxRuntime.jsx(antd.InputNumber, {
         precision: 0,
         style: {
@@ -20481,14 +20481,15 @@ var InputSlider = /*#__PURE__*/React.memo(function (props) {
         onBlur: onAfterChange
       })
     }), jsxRuntime.jsx(antd.Col, {
-      span: 20,
+      span: 19,
       children: jsxRuntime.jsx(antd.Slider, {
         min: min,
         max: max,
         marks: (_marks = {}, _marks[min] = min, _marks[max] = max, _marks),
         onChange: _onChange,
         onAfterChange: onAfterChange,
-        value: typeof value === "number" ? value : 0
+        value: typeof value === "number" ? value : 0,
+        className: "weight-slider"
       })
     })]
   });
@@ -20523,6 +20524,7 @@ var AWeight = /*#__PURE__*/function (_Viewer) {
       })) == null ? void 0 : _values$find.value) != null ? _values$find$value : 0;
     })) != null ? _this$_enumFields$map : new Array(_this._enumFields.length).fill(0);
     _this.state = {
+      hasAssignWeight: 0,
       allSliderValues: _this.allValues,
       ctrlVersion: 1
     }; // 初始化数据,避免出现 null 的情况
@@ -20608,15 +20610,21 @@ var AWeight = /*#__PURE__*/function (_Viewer) {
     return current + (target - current) * factor;
   };
 
+  _proto.calAssignWeight = function calAssignWeight() {
+    var values = _Viewer.prototype.getValue.call(this);
+
+    return values.reduce(function (total, current) {
+      return total + current.value;
+    }, 0);
+  };
+
   _proto.element = function element() {
     var _this3 = this;
 
-    var hasAssignWeight = this.state.allSliderValues.reduce(function (total, current) {
-      return total + current;
-    }, 0);
     return jsxRuntime.jsxs("div", {
       style: {
-        padding: 16
+        padding: 16,
+        paddingBottom: 32
       },
       children: [this._enumFields.map(function (option, index) {
         return jsxRuntime.jsxs("div", {
@@ -20636,32 +20644,37 @@ var AWeight = /*#__PURE__*/function (_Viewer) {
                   label: _this3._enumFields[index].value,
                   value: n
                 };
-              })); // 使用节流控制联动更新频率
-
-
-              var now = Date.now();
-
-              if (now - _this3.lastUpdateTime >= _this3.THROTTLE_DELAY) {
-                _this3.updateLinkedSliders(numbers, index, isInputChange);
+              }));
 
-                _this3.lastUpdateTime = now;
-              } else {
-                // 使用防抖确保最后一次更新被执行
-                if (_this3.debounceTimer) {
-                  clearTimeout(_this3.debounceTimer);
-                }
-
-                _this3.debounceTimer = setTimeout(function () {
-                  _this3.updateLinkedSliders(numbers, index, isInputChange);
+              _this3.setState({
+                allSliderValues: numbers
+              }); // 使用节流控制联动更新频率
+              // const now = Date.now();
+              // if (now - this.lastUpdateTime >= this.THROTTLE_DELAY) {
+              //   this.updateLinkedSliders(numbers, index, isInputChange);
+              //   this.lastUpdateTime = now;
+              // } else {
+              //   // 使用防抖确保最后一次更新被执行
+              //   if (this.debounceTimer) {
+              //     clearTimeout(this.debounceTimer);
+              //   }
+              //   this.debounceTimer = setTimeout(() => {
+              //     this.updateLinkedSliders(numbers, index, isInputChange);
+              //     this.lastUpdateTime = Date.now();
+              //   }, this.THROTTLE_DELAY);
+              // }
 
-                  _this3.lastUpdateTime = Date.now();
-                }, _this3.THROTTLE_DELAY);
-              }
             },
             value: _this3.state.allSliderValues[index],
             onAfterChange: function onAfterChange(value) {
               // 结束更新后，再重设一遍数据，确保数据的准确性
               _this3.updateLinkedSliders(_this3.state.allSliderValues, index, true);
+
+              console.log("onAfterChange", _this3.calAssignWeight());
+
+              _this3.setState({
+                hasAssignWeight: _this3.calAssignWeight()
+              });
             },
             max: _this3.totalWeight,
             min: 0
@@ -20670,9 +20683,9 @@ var AWeight = /*#__PURE__*/function (_Viewer) {
       }), this.totalWeight > 0 && this._enumFields.length > 0 ? jsxRuntime.jsxs("div", {
         children: ["\u63D0\u793A\uFF1A\u603B\u6BD4\u91CD\u5FC5\u987B\u4E3A", this.totalWeight, "\uFF0C\u5DF2\u5206\u914D\u6BD4\u91CD\uFF1A", jsxRuntime.jsxs("span", {
           style: {
-            color: hasAssignWeight > this.totalWeight ? "red" : "#000"
+            color: this.state.hasAssignWeight > this.totalWeight ? "red" : "#000"
           },
-          children: [hasAssignWeight, hasAssignWeight > this.totalWeight ? "\uFF0C\u8BF7\u4FEE\u6539" : ""]
+          children: [this.state.hasAssignWeight, this.state.hasAssignWeight > this.totalWeight ? "\uFF0C\u8BF7\u4FEE\u6539" : ""]
         })]
       }) : null]
     });
@@ -21632,7 +21645,7 @@ function validateWeightValue(a, schema, value, path) {
   // 验证总比重是否小于目标值
 
 
-  if (schema.weight && currentTotal < schema.weight && currentTotal !== 0) {
+  if (schema.weight && currentTotal < schema.weight) {
     return {
       message: "\u5DF2\u5206\u914D\u6BD4\u91CD\u4E0D\u5F97\u5C0F\u4E8E\u603B\u6BD4\u91CD",
       path: path

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-driver",
-  "version": "0.4.7",
+  "version": "0.4.9",
   "description": "An efficient framework for creating forms.",
   "license": "MIT",
   "authors": [

package/src/types/MWeightType.ts

@@ -32,7 +32,7 @@ function validateWeightValue(
 
   // 比重题的校验文案都是固定显示在表单上，所以返回的 message 都是空的
   // 验证总比重是否小于目标值
-  if (schema.weight && currentTotal < schema.weight && currentTotal !== 0) {
+  if (schema.weight && currentTotal < schema.weight) {
     return {
       message: `已分配比重不得小于总比重`,
       path,

package/src/ui/editor/complex/AWeight.less

@@ -0,0 +1,7 @@
+.weight-slider {
+  .ant-slider-handle {
+    width: 20px;
+    height: 20px;
+    margin-top: -8px;
+  }
+}

package/src/ui/editor/complex/AWeight.tsx

@@ -4,7 +4,7 @@ import { MEnumField, MProp, ValueConst } from "../../../framework/Schema";
 import { ViewerState } from "../../BaseViewer";
 import { Slider, Row, Col, InputNumber } from "antd";
 import { MUtil } from "../../../framework/MUtil";
-
+import "./AWeight.less";
 export interface AWeightProps {
   /** 总比值，默认100 */
   total?: number;
@@ -34,6 +34,7 @@ export interface AWeightProps {
 // 扩展 ViewerState 接口
 interface AWeightState extends ViewerState {
   allSliderValues: any;
+  hasAssignWeight: number;
 }
 
 const mockOptions = [
@@ -58,8 +59,8 @@ const InputSlider = memo((props: any) => {
   };
 
   return (
-    <Row gutter={[12, 12]}>
-      <Col span={4}>
+    <Row gutter={[18, 12]}>
+      <Col span={5}>
         <InputNumber
           precision={0}
           style={{ width: "100%" }}
@@ -70,7 +71,7 @@ const InputSlider = memo((props: any) => {
           onBlur={onAfterChange}
         />
       </Col>
-      <Col span={20}>
+      <Col span={19}>
         <Slider
           min={min}
           max={max}
@@ -78,6 +79,7 @@ const InputSlider = memo((props: any) => {
           onChange={onChange}
           onAfterChange={onAfterChange}
           value={typeof value === "number" ? value : 0}
+          className="weight-slider"
         />
       </Col>
     </Row>
@@ -105,6 +107,7 @@ export class AWeight extends Viewer<AWeightState> {
         return values?.find((v) => i.value === v.label)?.value ?? 0;
       }) ?? new Array(this._enumFields.length).fill(0);
     this.state = {
+      hasAssignWeight: 0,
       allSliderValues: this.allValues,
       ctrlVersion: 1,
     };
@@ -190,13 +193,14 @@ export class AWeight extends Viewer<AWeightState> {
     return current + (target - current) * factor;
   }
 
+  private calAssignWeight() {
+    const values = super.getValue();
+    return values.reduce((total, current) => total + current.value, 0);
+  }
+
   element() {
-    const hasAssignWeight = this.state.allSliderValues.reduce(
-      (total, current) => total + current,
-      0
-    );
     return (
-      <div style={{ padding: 16 }}>
+      <div style={{ padding: 16, paddingBottom: 32 }}>
         {this._enumFields.map((option, index) => {
           return (
             <div key={(option as any).value}>
@@ -215,22 +219,25 @@ export class AWeight extends Viewer<AWeightState> {
                       };
                     })
                   );
+                  this.setState({
+                    allSliderValues: numbers,
+                  });
 
                   // 使用节流控制联动更新频率
-                  const now = Date.now();
-                  if (now - this.lastUpdateTime >= this.THROTTLE_DELAY) {
-                    this.updateLinkedSliders(numbers, index, isInputChange);
-                    this.lastUpdateTime = now;
-                  } else {
-                    // 使用防抖确保最后一次更新被执行
-                    if (this.debounceTimer) {
-                      clearTimeout(this.debounceTimer);
-                    }
-                    this.debounceTimer = setTimeout(() => {
-                      this.updateLinkedSliders(numbers, index, isInputChange);
-                      this.lastUpdateTime = Date.now();
-                    }, this.THROTTLE_DELAY);
-                  }
+                  // const now = Date.now();
+                  // if (now - this.lastUpdateTime >= this.THROTTLE_DELAY) {
+                  //   this.updateLinkedSliders(numbers, index, isInputChange);
+                  //   this.lastUpdateTime = now;
+                  // } else {
+                  //   // 使用防抖确保最后一次更新被执行
+                  //   if (this.debounceTimer) {
+                  //     clearTimeout(this.debounceTimer);
+                  //   }
+                  //   this.debounceTimer = setTimeout(() => {
+                  //     this.updateLinkedSliders(numbers, index, isInputChange);
+                  //     this.lastUpdateTime = Date.now();
+                  //   }, this.THROTTLE_DELAY);
+                  // }
                 }}
                 value={this.state.allSliderValues[index]}
                 onAfterChange={(value) => {
@@ -240,6 +247,10 @@ export class AWeight extends Viewer<AWeightState> {
                     index,
                     true
                   );
+                  console.log("onAfterChange", this.calAssignWeight());
+                  this.setState({
+                    hasAssignWeight: this.calAssignWeight(),
+                  });
                 }}
                 max={this.totalWeight}
                 min={0}
@@ -252,11 +263,14 @@ export class AWeight extends Viewer<AWeightState> {
             提示：总比重必须为{this.totalWeight}，已分配比重：
             <span
               style={{
-                color: hasAssignWeight > this.totalWeight ? "red" : "#000",
+                color:
+                  this.state.hasAssignWeight > this.totalWeight
+                    ? "red"
+                    : "#000",
               }}
             >
-              {hasAssignWeight}
-              {hasAssignWeight > this.totalWeight ? `，请修改` : ""}
+              {this.state.hasAssignWeight}
+              {this.state.hasAssignWeight > this.totalWeight ? `，请修改` : ""}
             </span>
           </div>
         ) : null}

package/types/ui/editor/complex/AWeight.d.ts

@@ -2,6 +2,7 @@
 import { Viewer } from "../../BaseViewer";
 import { MEnumField, MProp, ValueConst } from "../../../framework/Schema";
 import { ViewerState } from "../../BaseViewer";
+import "./AWeight.less";
 export interface AWeightProps {
     /** 总比值，默认100 */
     total?: number;
@@ -22,6 +23,7 @@ export interface AWeightProps {
 }
 interface AWeightState extends ViewerState {
     allSliderValues: any;
+    hasAssignWeight: number;
 }
 export declare class AWeight extends Viewer<AWeightState> {
     _enumFields: MEnumField[];
@@ -37,6 +39,7 @@ export declare class AWeight extends Viewer<AWeightState> {
     componentDidUpdate(pre: any, cur: any): void;
     private updateLinkedSliders;
     private smoothValue;
+    private calAssignWeight;
     element(): JSX.Element;
 }
 export {};