aldehyde 0.2.433 → 0.2.435

package/src/aldehyde/controls/upload/mult-file-upload.tsx

@@ -7,74 +7,74 @@ import Super from "../../tmpl/superagent";
 import Units from "../../units";
 import { LocaleContext } from "../../locale/LocaleProvider";
 interface UploadProps extends EControlProps {
-  maxCount:number
+  maxCount: number
 }
 
 interface UploadState {
-  fileList:any[],
+  fileList: any[],
 }
 
 export default class MultiFileUpload extends React.PureComponent<
   UploadProps,
   UploadState
 > {
-  state = {fileList:null};
+  state = { fileList: null };
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
 
   handleRemove = (info) => {
-    const {fileList}=this.state;
+    const { fileList } = this.state;
     const { onChange } = this.props;
-    if(fileList && fileList.length>1){
-      let tFileList=[];
-     for(let f of fileList){
-       if(f.uid != info.uid){
-         tFileList.push(f);
-       }
-     }
+    if (fileList && fileList.length > 1) {
+      let tFileList = [];
+      for (let f of fileList) {
+        if (f.uid != info.uid) {
+          tFileList.push(f);
+        }
+      }
       //this.setState({fileList:fileList})
       onChange(JSON.stringify(tFileList));
 
-     //this.setState({fileList:tFileList});
-    }else{
+      //this.setState({fileList:tFileList});
+    } else {
       onChange(JSON.stringify({ valid: "delete" }));
-      this.setState({fileList:[]});
+      this.setState({ fileList: [] });
     }
   };
 
   handleChange = async (info) => {
     console.log("file change:", info);
-    let fileList:any[]=[];
+    let fileList: any[] = [];
 
-    let status=undefined;
-    if(info.fileList){
-      info.fileList.forEach(a=>{
-        if(a.status===undefined || a.status  == "uploading"){
-          status="uploading";
+    let status = undefined;
+    if (info.fileList) {
+      info.fileList.forEach(a => {
+        if (a.status === undefined || a.status == "uploading") {
+          status = "uploading";
         }
       })
 
-      if(!status){
-        status="done";
+      if (!status) {
+        status = "done";
       }
 
     }
 
-    if(status == "uploading"){
-      if(info.fileList){
-        info.fileList.forEach(a=>{
-          if(a.status===undefined || a.status  == "done"){
+    if (status == "uploading") {
+      if (info.fileList) {
+        info.fileList.forEach(a => {
+          if (a.status === undefined || a.status == "done") {
             fileList.push(a);
-         }
+          }
         })
       }
-      if(info.fileList){
-        info.fileList.forEach(a=>{
-          if(a.status  === "uploading"){
+      if (info.fileList) {
+        info.fileList.forEach(a => {
+          if (a.status === "uploading") {
             let newFile1: FileValue = {
               valid: "new",
-              uid:a.uid,
-              status:a.status,
+              uid: a.uid,
+              status: a.status,
               fileKey: "",
               fileName: a.name,
             };
@@ -82,17 +82,17 @@ export default class MultiFileUpload extends React.PureComponent<
           }
         })
       }
-      this.setState({fileList})
-    }else if (status == "done") {
-      if(info.fileList){
-        info.fileList.forEach(a=>{
-          if(!a.originFileObj){//已保存的数据
-           fileList.push(a);
-          }else{
+      this.setState({ fileList })
+    } else if (status == "done") {
+      if (info.fileList) {
+        info.fileList.forEach(a => {
+          if (!a.originFileObj) {//已保存的数据
+            fileList.push(a);
+          } else {
             let newFile: FileValue = {
               valid: "new",
-              status:a.status,
-              uid:a.uid,
+              status: a.status,
+              uid: a.uid,
               fileKey: a.response.fileKey,
               fileName: a.name,
             };
@@ -110,84 +110,84 @@ export default class MultiFileUpload extends React.PureComponent<
 
     const isLt5M = file.size / 1024 / 1024 < 200;
     if (!isLt5M) {
-      message.error(translate("${超过200M限制 不允许上传~}"),5);
+      message.error(translate("${超过200M限制 不允许上传~}"), 5);
       return false;
     } else {
       return true;
     }
   };
   componentDidMount() {
-    const {value}=this.props;
-      let fileList=this.transvalue(value);
-      this.setState({fileList})
-    }
+    const { value } = this.props;
+    let fileList = this.transvalue(value);
+    this.setState({ fileList })
+  }
 
   componentDidUpdate(prevProps: Readonly<UploadProps>, prevState: Readonly<UploadState>, snapshot?: any) {
-    const {value:preValue}=prevProps;
-    const {value}=this.props;
-    if(value && value!=preValue){
-      let fileList=this.transvalue(value);
-      this.setState({fileList})
+    const { value: preValue } = prevProps;
+    const { value } = this.props;
+    if (value && value != preValue) {
+      let fileList = this.transvalue(value);
+      this.setState({ fileList })
     }
   }
 
-  transvalue=(value)=>{
-    const {serverKey}=this.props;
+  transvalue = (value) => {
+    const { serverKey } = this.props;
     let value_1 = value;
     let fileList = [];
     if (typeof value_1 == "string") {
       value_1 = JSON.parse(value);
-      if(value_1 instanceof Array){
-        value_1.forEach(a=>{
+      if (value_1 instanceof Array) {
+        value_1.forEach(a => {
           if (a.valid == "new") {
             fileList.push({
-              valid:"new",
-              url:a.url,
-              fileKey:a.fileKey,
-              status:"done",
+              valid: "new",
+              url: a.url,
+              fileKey: a.fileKey,
+              status: "done",
               uid: a.uid,
-              name: a.fileName?a.fileName:a.name,
+              name: a.fileName ? a.fileName : a.name,
             })
-          } else if(a.uid){
+          } else if (a.uid) {
             fileList.push({
-              atRatCode:a.atRatCode,
-              valid:a.valid,
+              atRatCode: a.atRatCode,
+              valid: a.valid,
               uid: a.uid,
               name: a.name,
-              fileKey:a.base?a.base.bytesInfoVO.code:a.fileKey,
+              fileKey: a.base ? a.base.bytesInfoVO.code : a.fileKey,
               status: "done",
-              url:a.url,
+              url: a.url,
             });
-          }else {
+          } else {
             fileList.push({
-              atRatCode:a.atRatCode,
-              valid:a.valid,
-              uid: a.base?a.base.bytesInfoVO.code:a.fileKey,
+              atRatCode: a.atRatCode,
+              valid: a.valid,
+              uid: a.base ? a.base.bytesInfoVO.code : a.fileKey,
               name: a.base.fileName,
-              fileKey:a.base?a.base.bytesInfoVO.code:a.fileKey,
+              fileKey: a.base ? a.base.bytesInfoVO.code : a.fileKey,
               status: "done",
               url: encodeURI(Units.joinPath(
-                      Units.joinPath(Units.api(), "/v3/files"),
-                      a.base.path
-                  )) +
-                  `?@token=${Units.serverHydrocarbonToken(serverKey)}&@programToken=${Units.programCode(serverKey)}&disposition=attachment`,
+                Units.joinPath(Units.api(), "/v3/files"),
+                a.base.path
+              )) +
+                `?@token=${Units.serverHydrocarbonToken(serverKey)}&@programToken=${Units.programCode(serverKey)}&disposition=attachment`,
             });
           }
 
         })
-      }else if (value_1.valid === true) {
+      } else if (value_1.valid === true) {
         fileList.push({
-          atRatCode:value_1.atRatCode,
+          atRatCode: value_1.atRatCode,
           uid: value_1.base.bytesInfoVO.code,
           name: value_1.base.fileName,
-          fileKey:value_1.base.bytesInfoVO.code,
+          fileKey: value_1.base.bytesInfoVO.code,
           status: "done",
           url:
-              encodeURI(Units.joinPath(
-                  Units.joinPath(Units.api(), "/v3/files"),
-                  value_1.base.path
-              )) +
-              `?@token=${Units.serverHydrocarbonToken(serverKey)}&@programToken=${Units.programCode(serverKey)}&disposition=attachment`,
+            encodeURI(Units.joinPath(
+              Units.joinPath(Units.api(), "/v3/files"),
+              value_1.base.path
+            )) +
+            `?@token=${Units.serverHydrocarbonToken(serverKey)}&@programToken=${Units.programCode(serverKey)}&disposition=attachment`,
         });
       }
     }
@@ -195,10 +195,11 @@ export default class MultiFileUpload extends React.PureComponent<
   }
 
   render() {
-    const { id, itemType, disabled, serverKey } = this.props;
+    const { id, itemType, disabled, serverKey, fieldConfig } = this.props;
+    const { showUploadList = true, uploadText } = fieldConfig || {};
     const { translate } = this.context;
-    const {fileList}=this.state;
-    let maxCount=this.props.maxCount?this.props.maxCount:1;
+    const { fileList } = this.state;
+    let maxCount = this.props.maxCount ? this.props.maxCount : 1;
 
     return (
       <div>
@@ -209,8 +210,8 @@ export default class MultiFileUpload extends React.PureComponent<
             itemType === "picture"
               ? ".png, .jpg, .jpeg"
               : itemType === "video"
-              ? ".mp4"
-              : undefined
+                ? ".mp4"
+                : undefined
           }
           listType={itemType == "picture" ? "picture" : "text"}
           fileList={!fileList ? undefined : fileList}
@@ -222,13 +223,14 @@ export default class MultiFileUpload extends React.PureComponent<
           beforeUpload={this.beforeUpload}
           onChange={this.handleChange}
           onRemove={this.handleRemove}
+          showUploadList={showUploadList}
         >
           {fileList && fileList.length >= maxCount ? (
             ""
           ) : (
             <Button disabled={disabled}>
-              <UploadOutlined />{" "}
-              {disabled ? translate("${无需上传}") : translate("${上传文件}")}
+              <UploadOutlined />
+              {disabled ? translate("${无需上传}") : (uploadText ? translate("${" + uploadText + "}") : translate("${上传文件}"))}
             </Button>
           )}
         </AntdUpload>

package/src/aldehyde/form/criteria-form.tsx

@@ -159,7 +159,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
 
   useEffect(() => { // 表单初始化设置
     if (Object.keys(initialValues)?.length) {
-      onValuesChange(initialValues);
+      onValuesChange(initialValues, false);
     }
   }, [initialValues]);
 
@@ -404,7 +404,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
     );
   };
 
-  const onValuesChange = (changedValues) => {
+  const onValuesChange = (changedValues, clearCurrent = true) => {
     let appCtmplConfig = ProgramConfig.getAppCtmplConfig(
       ltmplConfig,
       data,
@@ -415,7 +415,8 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
       appCtmplConfig.onCriteriaValuesChange(
         changedValues,
         data,
-        form
+        form,
+        clearCurrent
       );
     }
     // if (onValuesChange) {
@@ -507,7 +508,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
       initialValues={initialValues}
       layout="inline"
       onFinish={searchSubmit}
-      onValuesChange={onValuesChange}
+      onValuesChange={(val) => onValuesChange(val)}
       style={{ width: "100%" }}
     >
 

package/src/aldehyde/tmpl/interface.tsx

@@ -464,6 +464,7 @@ export interface FieldConfig extends FieldBase {
   themeIcon?: string; // Icon
   defShowIcon?: boolean; // 图片组件，是否默认显示缩略图，默认显示
   showUploadList?: boolean; // 上传组件是否显示文件列表
+  uploadText?: string; // 上传组件文本配置
 }
 
 export interface ActionRenderProps {

package/src/aldehyde/tmpl/tmpl-config-analysis.tsx

@@ -524,7 +524,8 @@ TmplConfigAnalysis.buildInCtmplConfig = (
         function setConfig(
             changedValues,
             allValues: DtmplData,
-            formInstance: FormInstance
+            formInstance: FormInstance,
+            clearCurrent = true
         ) {
             for (let field of ltmplConfig.buildInFuncFields) {
 
@@ -541,11 +542,13 @@ TmplConfigAnalysis.buildInCtmplConfig = (
                         "secondCriteria": secondCriteria
                     };
                     field.configChanged = true;
-                    if (formInstance.getFieldValue(field.id)) {
-                        formInstance.setFieldValue(field.id, null);
-                    }
-                    if (formInstance.getFieldValue("c_" + field.id)) {
-                        formInstance.setFieldValue("c_" + field.id, null);
+                    if (clearCurrent) { // 是否清除关联项（搜索表单初始化设置不可清除）
+                        if (formInstance.getFieldValue(field.id)) {
+                            formInstance.setFieldValue(field.id, null);
+                        }
+                        if (formInstance.getFieldValue("c_" + field.id)) {
+                            formInstance.setFieldValue("c_" + field.id, null);
+                        }
                     }
                 }
             }
@@ -553,8 +556,8 @@ TmplConfigAnalysis.buildInCtmplConfig = (
 
         //debugger
         setConfig(null, criteriaData, null);
-        ltmplConfig.onCriteriaValuesChange = (changedValues, allValues, formInstance) => {
-            setConfig(changedValues, allValues, formInstance);
+        ltmplConfig.onCriteriaValuesChange = (changedValues, allValues, formInstance, clearCurrent?: boolean) => {
+            setConfig(changedValues, allValues, formInstance, clearCurrent);
         };
         return ltmplConfig;
     } else {