lu-lowcode-package-form 0.9.70 → 0.9.72

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lu-lowcode-package-form",
-  "version": "0.9.70",
+  "version": "0.9.72",
   "dependencies": {
     "@ant-design/icons": "^4.8.1",
     "@testing-library/jest-dom": "^5.17.0",

package/src/App.jsx

@@ -16,7 +16,7 @@ const searchSelectOptions = [
   { id: 9, name: "9999" },
 ]
 const searchSelectRequest = async (params) => {
-  console.log("params", params)
+  // console.log("params", params)
   return await new Promise((resolve) => {
     setTimeout(() => {
       if (params && params?.name) {
@@ -76,7 +76,7 @@ function App() {
   const formRef = React.createRef();
   const testRef = React.useRef()
   useEffect(() => {
-    console.log("testRef //////", testRef.current)
+    // console.log("testRef //////", testRef.current)
   }, [testRef.current])
   const [cols, setCols] = React.useState(3);
 
@@ -138,9 +138,43 @@ function App() {
         <FormContainerWrapper cols={cols} className="" ref={formRef} >
           <Field.UserSelect label="选择用户" __id="userselect" defaultValue={[{ id: 1, username: "十天" }]} />
           <Layout.FormGroupTitle title={"基本信息"} />
+          <Field.Number label="税率（%）" __id="shuilv" />
+          
+          <Field.WithSingleSelect ref={testRef} fillRules={[
+            {
+              "id": "636d3924-0298-4e9b-809a-26d4a10d7b89",
+              "type": 0,
+              "source": "name",
+              "target": "name",
+              "subRules": [
+
+              ]
+            },
+            {
+              "id": "93401e38-60a4-4acf-84a6-8958785a4a30",
+              "type": 1,
+              "source": "table",
+              "target": "table",
+              "subRules": [
+                {
+                  "id": "c4a65ae5-58ff-4d7f-8738-a04de1acab61",
+                  "type": 0,
+                  "source": "price",
+                  "target": "product_price1"
+                },
+
+                {
+                  "id": "c4a65ae5-58ff-4d7f-8738-a04de1acab61",
+                  "type": 0,
+                  "source": "num",
+                  "target": "product_num1"
+                },
+              ]
+            }
+          ]} label="测试关联单选" options={[{ label: '选项1', value: '1', name: "1111", table: "[{\"price\":1,\"num\":2},{\"price\":2,\"num\":2},{\"price\":3,\"num\":3},{\"price\":3,\"num\":3}]" }, { label: '选项2', value: '2' }]} __id="remark11" />
           <Layout.FormRow layout={'1'}>
             <Field.Table label="子表格" __id="table"  >
-              <Field.DatePicker defaultNow={true}  label="日期时间" prompt="" datetype="date"  __id="datetime2" />
+              <Field.DatePicker defaultNow={true} label="日期时间" prompt="" datetype="date" __id="datetime2" />
               <Field.WithSingleSelect ref={testRef} fillRules={[
                 {
                   "id": "636d3924-0298-4e9b-809a-26d4a10d7b89",
@@ -170,13 +204,57 @@ function App() {
                   ]
                 },
 
-              ]} label="测试关联单选" options={[{ label: '选项1', value: '1', product_price11: "1111", product_price12: "2222", product_price1: 111 }, { label: '选项2', value: '2' }]} __id="remark11" />
+              ]} label="测试关联单选" options={[{ label: '选项1', value: '1', product_price11: "1111", product_price12: "2222", product_price1: 111 }, { label: '选项2', value: '2' }, { label: '选项2', value: '2' }]} __id="remark11" />
 
               <Field.Switch label="开关" __id="switch_table"></Field.Switch>
-              <Field.Input defaultValue={3} isRequired={true} label="商品价格" __id="product_price11" />
-              <Field.Input isRequired={true} label="商品价格" __id="product_price12" />
-              <Field.Input isRequired={true} label="商品价格" __id="product_price13" />
-              <Field.Input isRequired={true} label="商品价格" __id="product_price14" />
+              <Field.Input defaultValue={3} isRequired={true} label="含税单价" __id="product_price11" />
+              <Field.Input isRequired={true} label="未税单价" __id="product_price12"
+                withIds={[
+                  "table.product_price11",
+                  "shuilv"
+                ]}
+                withFill={{
+                  "value": [
+                      {
+                          "insert": "("
+                      },
+                      {
+                          "insert": {
+                              "span": true
+                          },
+                          "attributes": {
+                              "id": "table.product_price11",
+                              "color": "blue",
+                              "tagKey": "fieldsValue",
+                              "content": "当前表单.产品列表.含税单价"
+                          }
+                      },
+                      {
+                          "insert": "/(1+"
+                      },
+                      {
+                          "insert": {
+                              "span": true
+                          },
+                          "attributes": {
+                              "id": "shuilv",
+                              "color": "blue",
+                              "tagKey": "fieldsValue",
+                              "content": "当前表单.税率（%）"
+                          }
+                      },
+                      {
+                          "insert": "/ 100)).toFixed(2)\n\n\n"
+                      }
+                  ],
+                  "version": 1723016911807,
+                  "withData": [
+
+                  ]
+              }}
+              />
+              <Field.Input isRequired={true} defaultValue={1} label="商品价格" __id="product_price13" />
+              <Field.Input isRequired={true}  defaultValue={2} label="商品价格" __id="product_price14" />
               <Field.Input isRequired={true} label="商品价格" __id="product_price1" />
               <Field.Input isRequired={true} label="商品个数" __id="product_num1" />
               <Field.Input label="商品总价" __id="product_sum1"
@@ -325,10 +403,10 @@ function App() {
               return fieldsValue?.switch ? true : false
             }}
           />
-          <Field.DatePicker defaultNow={true} label="日期时间" prompt="" datetype="month" value='2022-10-22' __id="datetime" />
-          <Field.DatePicker label="日期时间" prompt="" datetype="date" value='2022-10-22' __id="datetime2" />
-          <Field.DatePicker disabled={true} defaultNow={true} label="日期时间" prompt="" datetype="datetime" value={'2022-10-22'} __id="datetime3" />
-          <Field.DatePicker defaultNow={true} label="年" prompt="" datetype="year" value={'2022-10-22'} __id="datetime4" />
+          <Field.DatePicker defaultNow={true} label="datetime" prompt="" datetype="month" value='2022-10-22' __id="datetime" />
+          <Field.DatePicker label="datetime2" prompt="" datetype="date" __id="datetime2" />
+          <Field.DatePicker isRequired={true} disabled={true} defaultNow={true} label="datetime3" prompt="" datetype="datetime" value={'2022-10-22'} __id="datetime3" />
+          <Field.DatePicker defaultNow={true} label="datetime4" prompt="" datetype="year" value={'2022-10-22'} __id="datetime4" />
           <Field.Input label="角色名称" __id="name" />
           <Layout.FormRow layout={'1,1'}>
             <Field.Input label="角色名称布局" __id="name1" />
@@ -336,39 +414,7 @@ function App() {
           </Layout.FormRow>
           <Field.CheckboxTree label="角色权限" __id="permissions" addRoot={false} treeData={treeData} />
           <Layout.FormGroupTitle title={"关联信息"} />
-          <Field.WithSingleSelect ref={testRef}  disabled={true} fillRules={[
-            {
-              "id": "636d3924-0298-4e9b-809a-26d4a10d7b89",
-              "type": 0,
-              "source": "name",
-              "target": "name",
-              "subRules": [
-
-              ]
-            },
-            {
-              "id": "93401e38-60a4-4acf-84a6-8958785a4a30",
-              "type": 1,
-              "source": "table",
-              "target": "table",
-              "subRules": [
-                {
-                  "id": "c4a65ae5-58ff-4d7f-8738-a04de1acab61",
-                  "type": 0,
-                  "source": "price",
-                  "target": "product_price1"
-                },
-
-                {
-                  "id": "c4a65ae5-58ff-4d7f-8738-a04de1acab61",
-                  "type": 0,
-                  "source": "num",
-                  "target": "product_num1"
-                },
-              ]
-            }
-          ]} label="测试关联单选" options={[{ label: '选项1', value: '1', name: "1111", table: "[{\"price\":1,\"num\":2},{\"price\":2,\"num\":2}]" }, { label: '选项2', value: '2' }]} __id="remark11" />
-          <Field.WithMultipleSelect  disabled={true} label="测试关联多选" options={[{ label: '选项1', value: '1' }, { label: '选项2', value: '2' }]} __id="remark12" />
+          <Field.WithMultipleSelect disabled={true} label="测试关联多选" options={[{ label: '选项1', value: '1' }, { label: '选项2', value: '2' }]} __id="remark12" />
           <Layout.FormRow > <Field.TextArea label="备注" __id="remark" /></Layout.FormRow>
 
           <Layout.FormRow layout={'1'}>

package/src/components/editor/quill.jsx

@@ -53,7 +53,7 @@ const EditorQuill = ({value,...props}) => {
 
         quill.on('text-change', (delta, oldDelta, source) => {
             const ops = delta.ops;
-            console.log('text-change')
+            // console.log('text-change')
             ops.forEach(op => {
                 if (op.delete) {
 

package/src/components/field/base.jsx

@@ -31,7 +31,10 @@ export const BaseWrapper = ({
     ...otherProps
 }) => {
     useEffect(()=>{
-        if (defaultValue && typeof onChange === "function") onChange(defaultValue)
+        if (defaultValue && typeof onChange === "function") {
+            console.log("defaultValue changed", defaultValue)
+            onChange(defaultValue)
+        }
     },[defaultValue])
     if (!addWrapper) return children;
     // 不接管只读属性的组件

package/src/components/field/date-picker/index.jsx

@@ -21,12 +21,12 @@ const DatePicker = ({ datetype, value, defaultNow, onChange, ...props }) => {
     const [needConfirm, setNeedConfirm] = useState(false)
     const isChanged = useRef(false)
     useEffect(() => {
-        console.log("value change", value)
-        console.log("value type change", typeof value)
+        // console.log(`${props?.__id} defaultNow `, defaultNow)
+        // console.log(`${props?.__id} value `, value)
+        // console.log(`${props?.__id} value type `, typeof value)
         if (defaultNow && !value && !isChanged.current) {
-            const now =dayjs().format("YYYY-MM-DD HH:mm:ss")
-            console.log("now", now)
-            typeof onChange === "function" && onChange(now)
+            const now = dayjs().format("YYYY-MM-DD HH:mm:ss")
+            typeof onChange == "function" && onChange(now)
             return
         }
         // if (value && typeof value === "string" && dayjs(value).isValid()) {
@@ -75,7 +75,7 @@ const DatePicker = ({ datetype, value, defaultNow, onChange, ...props }) => {
     }, [datetype])
     return (
         <BaseWrapper {...props}>
-            <OriginalDatePicker locale={zh} {...props} picker={picker} format={format} style={{ width: '100%' }} onChange={handleChange} value={dayjs(value).isValid() ? dayjs(value) : undefined} showTime={showTime} needConfirm={needConfirm} />
+            <OriginalDatePicker locale={zh} {...props} picker={picker} format={format} style={{ width: '100%' }} onChange={handleChange} value={value && dayjs(value).isValid() ? dayjs(value) : undefined} showTime={showTime} needConfirm={needConfirm} />
         </BaseWrapper>
     );
 }

package/src/components/field/select/select.jsx

@@ -124,7 +124,7 @@ const WithMultipleSelect = ({ readItemRender, readonly, onChange, value, ...prop
 
 // 选择用户组件 
 const UserSelect = ({ customComponent: CustomComponent, ...props }) => {
-    console.log("UserSelect ////// props",props)
+    // console.log("UserSelect ////// props",props)
     if (!CustomComponent) return <BaseWrapper {...props}><Input {...props} /></BaseWrapper>
     else return <BaseWrapper {...props}><CustomComponent {...props} /></BaseWrapper>
 }

package/src/components/field/upload/upload-image.jsx

@@ -5,7 +5,7 @@ import { DeleteOutlined, EyeOutlined, PlusOutlined } from "@ant-design/icons";
 import React, { useEffect, useRef, useState, version } from "react";
 
 const UploadImage = ({ maxCount, value, onChange, ...props }) => {
-    console.log("uploadimage props", props)
+    // console.log("uploadimage props", props)
     useEffect(() => {
         if (value) {
             console.log("value", value)

package/src/components/form-container/index.jsx

@@ -122,6 +122,8 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
         if (dependencyMap.current.has(identifier)) {
             const dependent = dependencyMap.current.get(identifier)
             const dependentChildren = dependent.children;
+            // console.log("identifier", identifier)
+            // console.log("dependentChildren", dependentChildren)
             if (!init && dependent?.fillRules && Array.isArray(dependent?.fillRules) && dependent?.fillRules.length > 0) {
                 handleFillRules(identifier, parentIdentifier, fieldValues, dependent?.fillRules)
             }
@@ -140,8 +142,6 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
 
     // 处理填充规则
     const handleFillRules = (current_identifier, parentIdentifier, fieldValues, fillRules) => {
-
-
         // 获取当前变更的字段数据
         let current_value = getParamValue("fieldsValue", current_identifier, fieldValues, null)
         for (let index = 0; index < fillRules.length; index++) {
@@ -161,13 +161,13 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
 
                 if (!Array.isArray(source_value)) return
                 let target_value = source_value.map(item => {
-                    let target_value = {}
+                    let target_item_value = {}
                     if (rule?.subRules && Array.isArray(rule?.subRules) && rule?.subRules.length > 0)
                         for (let index = 0; index < rule?.subRules.length; index++) {
                             const { source: subSource, target: subTarget } = rule?.subRules[index];
-                            target_value[subTarget] = item?.[subSource]
+                            target_item_value[subTarget] = item?.[subSource]
                         }
-                    return target_value
+                    return target_item_value
                 })
                 setValue = target_value
             }
@@ -187,7 +187,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
             form.setFieldValue(target, setValue)
             handleFieldsWith(target, form.getFieldsValue())
         }
-        console.log("current value", current_value)
+        // console.log("current value", current_value)
     }
     // 处理级联显示隐藏 @return {boolean} 是否需要重新渲染表单的字段
     const handleFieldsVisible = (fieldValues, child, parentIdentifier) => {
@@ -207,6 +207,10 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
     // 处理级联数据源
     // 处理级联填充
     const handleFieldsWithFill = async (fieldValues, child, parentIdentifier, componentName) => {
+        // console.log("handleFieldsWithFill fieldValues", fieldValues)
+        // console.log("handleFieldsWithFill child", child)
+        // console.log("handleFieldsWithFill parentIdentifier", parentIdentifier)
+        // console.log("handleFieldsWithFill componentName", componentName)
         const withFill = child?.component?.props.withFill;
         const withDataFetch = child?.component?.props.withDataFetch;
         let withFillIndex = 0
@@ -219,8 +223,19 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                 childIdentifier = [...parentIdentifier, childIdentifier.replace(`${withFillGroup}.`, "")]
             }
         }
+        // 被依赖字段不是子表字段，依赖字段是子表字段的情况
+        else if (childIdentifier.indexOf(".") >= 0) {
+            childIdentifier = childIdentifier.split(".")
+            let table_values = getParamValue("fieldsValue", childIdentifier[0], fieldValues, [])
+            // console.log("table_values", table_values)
+            if (Array.isArray(table_values) && table_values.length > 0)
+                for (let index = 0; index < table_values.length; index++) {
+                    await handleFieldsWithFill(fieldValues, child, [childIdentifier[0], index], componentName)
+                }
+            return
+
+        }
         let withDatas = [];
-        console.log("componentName", componentName)
         // 先处理依赖数据
         if (withFill?.withData && withFill?.withData.length > 0 && withDataFetch && typeof withDataFetch === 'function') {
             for (let index = 0; index < withFill?.withData.length; index++) {
@@ -259,7 +274,6 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
                 const { insert, attributes } = item
                 if (typeof insert !== "string") {
                     if (insert?.span && attributes && attributes.tagKey && attributes.id) {
-
                         result = getParamValue(attributes.tagKey, attributes.id, fieldValues, withDatas)
                         if (Array.isArray(result)) {
                             if (Array.isArray(childIdentifier) && result.length > withFillIndex) {
@@ -278,6 +292,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
         if (formula && formula.length > 0) {
             const formulaResult = evalFormula(formula);
             // console.log("formulaResult", formulaResult)
+            // console.log("setFieldValue setFieldValue", childIdentifier)
             form.setFieldValue(childIdentifier, formulaResult)
             handleFieldsWith(childIdentifier, form.getFieldsValue())
         }
@@ -312,7 +327,7 @@ const FormContainer = forwardRef(({ cols = 1, children, mode = "view" }, ref) =>
     const handleFieldsChange = debounce((changedFields, allFields) => {
         const fieldValues = form.getFieldsValue();
         let needRefresh = false;
-        console.log("changedFields", changedFields)
+        // console.log("changedFields", changedFields)
         changedFields.forEach(field => {
             if (field.name && field.name.length > 0) {
                 needRefresh = handleFieldsWith(field.name, fieldValues);

package/src/utils/formula.js

@@ -4,9 +4,9 @@ const evalFormula =(formula) => {
     try {
         result = eval(formula.join(""));
     } catch (error) {
-        console.error("formula error", error);
+        // console.error("formula error", error);
     }
-    console.log("formula result", result);
+    // console.log("formula result", result);
     return result.toString();
 };