aldehyde 0.1.83 → 0.1.85

package/lib/tmpl/superagent.js

@@ -31,7 +31,7 @@ export default class Superagent {
                 .end((req, res) => {
                 if (!res) {
                     message.error("服务器连接失败");
-                    reject("服务器连接失败");
+                    resolve(null);
                 }
                 else {
                     if (options.data && options.data.isShowLoading !== false) {

package/lib/tmpl/superagent.js.map

@@ -1 +1 @@
-{"version":3,"file":"superagent.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/superagent.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"superagent.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/superagent.js"],"names":[],"mappings":"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"}

package/lib/units/index.d.ts

@@ -31,7 +31,7 @@ declare const _default: {
         showQuickIumper: boolean;
     };
     getRadioList(data: any): any[];
-    openFile(url: any, fileName: any): void;
+    openFile(url: any, fileName: any, toolbar: any): void;
     toLogin(): void;
     downloadFile(url: any, fileName: any): void;
     downloadFile_old(url: any): void;

package/lib/units/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/units/index.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,mBAAmB,CAAC;;+BAuCpC,MAAM,sBAAsB,WAAW,aAAa,SAAS,KAAK,WAAW;mCAIzE,WAAW,aAAa,SAAS;sCAM9B,WAAW;uBAO1B,MAAM,QAAQ,MAAM;0BAGjB,MAAM,QAAQ,MAAM,QAAQ,MAAM;8BAI9B,MAAM;8BAIN,MAAM;uBAGb,MAAM;8BAGC,MAAM;+BAGL,MAAM;;iCAcJ,MAAM;;iCAMN,MAAM;;yCAME,MAAM;;iDAME,MAAM;;;;;;;;;;;;;;;;;;;IAuHnD;;;;;OAKG;;;;;;;;;4BAuIqB,MAAM;;;;;4BAqEN,QAAQ,EAAE;;;;;2BAqGX,QAAQ,EAAE;;yCAwBI,MAAM;;;;;;;;;AA7gB/C,wBA4kBC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/units/index.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,mBAAmB,CAAC;;+BAsCpC,MAAM,sBAAsB,WAAW,aAAa,SAAS,KAAK,WAAW;mCAIzE,WAAW,aAAa,SAAS;sCAM9B,WAAW;uBAO1B,MAAM,QAAQ,MAAM;0BAGjB,MAAM,QAAQ,MAAM,QAAQ,MAAM;8BAI9B,MAAM;8BAIN,MAAM;uBAGb,MAAM;8BAGC,MAAM;+BAGL,MAAM;;iCAcJ,MAAM;;iCAMN,MAAM;;yCAME,MAAM;;iDAME,MAAM;;;;;;;;;;;;;;;;;;;IAuHnD;;;;;OAKG;;;;;;;;;4BAuIqB,MAAM;;;;;4BAqEN,QAAQ,EAAE;;;;;2BAqGX,QAAQ,EAAE;;yCAwBI,MAAM;;;;;;;;;AA7gB/C,wBA4kBC"}

package/lib/units/index.js

@@ -24,7 +24,6 @@ Axios.create().get('programConfig.json').then((result) => {
     window.localStorage['programName_NavLeft'] = result.data.programName_NavLeft;
     window.localStorage['programName_sub'] = result.data.programName_sub;
     window.localStorage['programName_Logo'] = result.data.programName_Logo;
-    debugger;
     window.localStorage['programCode'] = result.data.programCode;
 }).catch((error) => {
     console.log(error);
@@ -165,10 +164,10 @@ export default {
     //         message.error(e)
     //     }
     // },
-    openFile(url, fileName) {
+    openFile(url, fileName, toolbar) {
         try {
             let a = document.createElement("a");
-            a.href = url;
+            a.href = url + toolbar;
             a.target = "_blank";
             document.body.appendChild(a);
             a.click();
@@ -529,7 +528,6 @@ export default {
         return format;
     },
     getSelectOptions(data) {
-        // debugger
         if (!data) {
             return [];
         }
@@ -541,7 +539,6 @@ export default {
         return options;
     },
     getSelectListOfStrList(data) {
-        // debugger
         if (!data) {
             return [];
         }

package/lib/units/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/aldehyde/units/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/aldehyde/units/index.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.1.83",
+  "version": "0.1.85",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",

package/src/aldehyde/controls/auto-complete/index.tsx

@@ -53,7 +53,6 @@ const AutoComplete: React.FC<AutoCompleteProps> = (props) => {
             options.push(option)
             return false
         })
-        //  debugger
         return options
     };
 

package/src/aldehyde/controls/entry-control.tsx

@@ -94,6 +94,8 @@ function  renderControl(id:any,mainCode:string|Promise<string>,fieldConfig: Fiel
         return React.createElement(ProgramConfig.getCustomEditControl(itemType),controlProps);
     }
 
+
+
     switch (itemType) {
         case 'int':
         case 'decimal':
@@ -131,7 +133,6 @@ function  renderControl(id:any,mainCode:string|Promise<string>,fieldConfig: Fiel
             break;
         case 'multiselect':
         case 'texttags':
-
             entryControl = <Select
                 mode="multiple"
                 {...antdControlProps}
@@ -153,11 +154,18 @@ function  renderControl(id:any,mainCode:string|Promise<string>,fieldConfig: Fiel
             entryControl = <RadioGroup {...antdControlProps} options={getOptions(fieldConfig.mstrucId)} value={typeof (fieldValue) == 'string' ? fieldValue.split(',')[0] : fieldValue}  />
             break;
         case "yes-no-switch":
-            const {value,onChange,style,...other}=antdControlProps
-            entryControl =<Switch style={{width:'60px'}} checkedChildren="是" unCheckedChildren="否" checked={value=='是'?true:false} onChange={(checked)=>{
-                onChange(checked?'是':'否');
+            const {value:value1,onChange:onChange1,style:style1,...other1}=antdControlProps
+            entryControl =<Switch style={{width:'60px'}} checkedChildren="是" unCheckedChildren="否" checked={value1=='是' ?true:false} onChange={(checked)=>{
+                onChange1(checked?'是':'否');
             }
-            } {...other} />
+            } {...other1} />
+            break;
+        case "yes-no-radio":
+            const {value:value2,...other2}=antdControlProps
+            entryControl =<RadioGroup   value={value2?value2=='是' ?"是":"否":null} {...other2}>
+                <Radio value={"是"}>是</Radio>
+                <Radio value={"否"}>否</Radio>
+            </RadioGroup>
             break;
         case 'date-YY':
         case 'daterange-YY':
@@ -209,6 +217,7 @@ function  renderControl(id:any,mainCode:string|Promise<string>,fieldConfig: Fiel
         case 'file':
         case 'video':
         case 'picture':
+        case 'non-download-file':
             entryControl = <Upload {...controlProps} />
             break;
         case 'chemstruc':

package/src/aldehyde/controls/file-view/drawer-file-view.tsx

@@ -13,6 +13,7 @@ const FileViewer = loadable(() =>
     import('react-file-viewer'), {fallback: Loading});
 interface DrawerFileViewProps {
     file: FileValue,
+    downloadAble?:boolean,
 };
 
 interface DrawerFileViewState {
@@ -20,7 +21,9 @@ interface DrawerFileViewState {
 
 };
 export default class DrawerFileView extends React.PureComponent<DrawerFileViewProps, DrawerFileViewState> {
-
+    static defaultProps={
+        downloadAble:false,
+    }
     state = {
         drawerVisible: false
     }
@@ -34,15 +37,15 @@ export default class DrawerFileView extends React.PureComponent<DrawerFileViewPr
     }
 
     render() {
-        const {file} = this.props;
+        const {file,downloadAble} = this.props;
         const {drawerVisible} = this.state;
         return <span className='labelcss'>
                         <Button type={'link'} onClick={() => {
                             this.setState({drawerVisible: true})
                         }} size="small">{file.base.fileName}</Button>
-                <Button type={'text'} onClick={async () => {
+            {downloadAble? <Button type={'text'} onClick={async () => {
                         await HCService.download(file.base.path);
-                    }} size="small"><DownloadOutlined/></Button>
+                    }} size="small"><DownloadOutlined/></Button>:null}
             {drawerVisible ? <Drawer
                 title={file.base.fileName}
                 placement={'left'}
@@ -52,9 +55,9 @@ export default class DrawerFileView extends React.PureComponent<DrawerFileViewPr
                 visible={drawerVisible}
                 extra={
                 <Space>
-                    <Button  onClick={async () => {
+                    {downloadAble? <Button  onClick={async () => {
                         await HCService.download(file.base.path);
-                    }} ><DownloadOutlined/></Button>
+                    }} ><DownloadOutlined/></Button>:null}
                     <Button onClick={this.onClose}><CloseOutlined /></Button>
                 </Space>
             }>

package/src/aldehyde/controls/file-view/index.tsx

@@ -1,8 +1,7 @@
 import * as React from 'react'
 import {Button, Col, Image, Row,Space} from 'antd'
 import DrawerFileView from './drawer-file-view'
-// import { CustomErrorComponent } from 'custom-error';
-// import './index.css'
+
 import {FieldConfig} from "../../tmpl/interface";
 import {DownloadOutlined} from '@ant-design/icons';
 import HCService from "../../tmpl/hcservice-v3";
@@ -10,6 +9,7 @@ import Player from "griffith";
 
 interface FileViewProps {
     fieldConfig: FieldConfig,
+    downloadAble?:boolean,
     value: any,
     width?: number,
     height?:number,
@@ -21,6 +21,10 @@ interface FileViewState {
 };
 export default class FileView extends React.PureComponent<FileViewProps, FileViewState> {
 
+    static defaultProps={
+        downloadAble:false,
+    }
+
     state={
         urlData:undefined,
     }
@@ -61,7 +65,7 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
 
     packFile2Show =  (file) => {
         const {urlData}=this.state;
-       // const {width,height}=this.props;
+       const {downloadAble}=this.props;
         let jsonFile=this.getJsonValue(file);
         if (jsonFile) {
                 if ("new" == jsonFile.valid) {
@@ -108,28 +112,30 @@ export default class FileView extends React.PureComponent<FileViewProps, FileVie
                     //         errorComponent={undefined}
                     //         onError={this.onError}/>
                     //   </span>
-                    return <DrawerFileView file={jsonFile} ></DrawerFileView>
+                    return <DrawerFileView file={jsonFile} downloadAble={downloadAble}></DrawerFileView>
                 }
                 else if ([ 'pdf','txt'].includes(jsonFile.base.type)){
+
                     return <span className='labelcss'>
                         {/*<a href={this.getFileUrl(file.base.path)}>{file.base.fileName}</a>*/}
                         <Button type={'link'} onClick={async () => {
-                            await HCService.openfile(jsonFile.base.path);
+                            await HCService.openfile(jsonFile.base.path, downloadAble? "":'#toolbar=0');
                         }} size="small">{jsonFile.base.fileName}</Button>
-                         <Button type={'text'}  onClick={async () => {
+                            {downloadAble? <Button type={'text'}  onClick={async () => {
                              await HCService.download(jsonFile.base.path);
-                         }} size="small"><DownloadOutlined/></Button>
+                         }} size="small"><DownloadOutlined/></Button>:null}
                       </span>
                 }
                 else {
                     return <Space className='labelcss'>
                         {/*<a href={this.getFileUrl(file.base.path)}>{file.base.fileName}</a>*/}
-                        <Button type={'link'} onClick={async () => {
+                        {downloadAble?<><Button type={'link'} onClick={async () => {
                             await HCService.download(jsonFile.base.path);
                         }} size="small">{jsonFile.base.fileName}</Button>
                         <Button type={'text'}  onClick={async () => {
                             await HCService.download(jsonFile.base.path);
-                        }} size="small"><DownloadOutlined/></Button>
+                        }} size="small"><DownloadOutlined/></Button></>:
+                            <Button type={'text'}  size="small">{jsonFile.base.fileName}</Button>}
                       </Space>
                 }
         } else {

package/src/aldehyde/controls/text/ellipsis-text.tsx

@@ -38,7 +38,6 @@ export default class EllipsisText extends React.PureComponent<EllipsisTextProps,
                 // <Card bodyStyle={{padding:'0px'}}>
                 <>
                     {isHtml?<div  style={{padding:'6px'}} dangerouslySetInnerHTML={{__html: value}} ></div>:<div style={{padding:'6px'}}>{value}</div>}
-
                     </>
                 // </Card>
             } >
@@ -57,7 +56,7 @@ export default class EllipsisText extends React.PureComponent<EllipsisTextProps,
 
         let style = Units.getLongTextStyle(text.substring(0,showMax));
        return <>
-               { text.length<=showMax?<span className="infoStyle" style={style}>{text}</span>:
+               { text.length<=showMax || showMax<=0 ?<span className="infoStyle" style={style}>{text}</span>:
                    <span className="infoStyle" style={style}>{text.substring(0,showMax)}...
                        {this.viewButton()}
                    </span>

package/src/aldehyde/controls/view-control.tsx

@@ -104,7 +104,7 @@ function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:Con
         case 'textarea':
         case 'preselect':
             if(holderType=='table'){
-                viewControl=<EllipsisText maxWidth={'400px'} isHtml={false} value={value} ></EllipsisText>
+                viewControl=<EllipsisText maxWidth={'400px'} isHtml={false} value={value} showMax={fieldConfig.ellipsisLength} ></EllipsisText>
             }else{
                 viewControl = <span className="infoStyle">{value}</span>
             }
@@ -114,6 +114,13 @@ function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:Con
         case "yes-no-switch":
             viewControl = <EnumBadge {...controlProps}/>
             break;
+        case 'yes-no-radio':
+            viewControl =  <span className="infoStyle">
+                      {value ?
+                          <Badge color={value=='是' ?  'green':'red'} text={value}/>
+                          : null}
+            </span>
+            break;
         case 'multiselect':
         case 'checkbox':
             viewControl = <EnumTags {...controlProps} />
@@ -142,6 +149,9 @@ function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:Con
         case 'video':
             viewControl = <FileView {...controlProps}></FileView>
             break;
+        case 'non-download-file':
+            viewControl = <FileView {...controlProps}></FileView>
+            break;
         case 'chemstruc':
             viewControl = <ChemStruc  {...controlProps}></ChemStruc>
             //viewControl = unSupportControl

package/src/aldehyde/detail/view/act-dtmpl-view.tsx

@@ -16,7 +16,6 @@ export interface ActDtmplViewProps extends DtmplBaseProps {
 export interface ActDtmplViewStat {
     loading: boolean,
     dtmplConfig: DtmplConfig,
-    dtmplData: DtmplData,
     premisesTitle: string,
     snapshotVisible: boolean,
     layout: object,
@@ -33,7 +32,6 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
         loading: true,
         dtmplConfig: undefined,
         snapshotVisible: false,
-        dtmplData: undefined,
         premisesTitle: "默认字段",
         layout: {
             labelCol: {span: 8},
@@ -86,7 +84,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
 
     render() {
         const {showRightNav, rightBarPositionRight, code,  sourceId,goDtmpl} = this.props;
-        const {dtmplConfig, premisesTitle, loading, dtmplData, layout, snapshotVisible,refreshCode} = this.state;
+        const {dtmplConfig, premisesTitle, loading, layout, snapshotVisible,refreshCode} = this.state;
         const buttons = dtmplConfig ? dtmplConfig.buttons : undefined;
         const premises = dtmplConfig ? dtmplConfig.premises : undefined;
         let showRightNav_ = showRightNav;

package/src/aldehyde/detail/view/dtmpl-view.tsx

@@ -64,6 +64,10 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
             this.setState({
                 dtmplData, loading:false,
             })
+        }else{
+            this.setState({
+                loading:false,
+            })
         }
     }
 
@@ -112,6 +116,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
         const premises = dtmplConfig ? dtmplConfig.premises : undefined;
 
         return (
+
             <div>
                 {this.fieldGroupList()}
                 {premises && premises.length > 0 ?

package/src/aldehyde/form/form-Item-group.tsx

@@ -47,7 +47,6 @@ export default class FormItemGroup extends React.PureComponent<FieldGroupProps,
     getMainCode = (item: FieldConfig, mainCode) => {
         const {formRef} = this.props;
         //  let a=formRef.current;
-        // debugger
         if (!item.mainCode) {
             return mainCode;
         }

package/src/aldehyde/layout/menu/menu-render.tsx

@@ -32,11 +32,15 @@ export default {
                     break;
                 case "编辑":
                     routePath='detail-edit';
-                    codeSource='&codeSource=listTop';
+                    codeSource='&codeSource=listop';
+                    break;
+                case "编辑或添加":
+                    routePath='detail-edit';
+                    codeSource='&codeSource=listop-new';
                     break;
                 case "详情":
                     routePath='detail-view';
-                    codeSource='&codeSource=listTop';
+                    codeSource='&codeSource=listop';
                     break;
             }
 

package/src/aldehyde/layout/menu/user-bar.tsx

@@ -42,7 +42,7 @@ class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
         let {roles} = this.state;
         let loading = document.getElementById('ajaxLoading');
         loading.style.display = "block";
-        HCDataSource.clear(roles);
+        HCDataSource.reload(roles);
         loading.style.display = "none";
     }
 

package/src/aldehyde/login/context-setter.tsx

@@ -29,8 +29,7 @@ class LtmplPage extends React.PureComponent<ContextSetterProps, ContextSetterSta
     async componentDidMount() {
         let config = await HCserviceV3.getContextSourceConfig();
         let context = await HCserviceV3.getContextSourceValue();
-        debugger
-        if (!config || config.length==0 || !context || context.length==0) {
+        if (!config || config.length==0 ) {
             config = []
             window.location.hash = "#/home";
             return;

package/src/aldehyde/routable/dtmpl-route.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import {Button, Card, Form as AntdForm, Modal} from 'antd';
+import {Button, Card, Form as AntdForm, Empty} from 'antd';
 import  {RouterCompProps} from '../tmpl/interface';
 import Units from "../units";
 import DtmplEdit from "../detail/edit/dtmpl-edit";
@@ -12,7 +12,7 @@ export interface DtmplRouteProps extends RouterCompProps {
 };
 
 export interface DtmplRoutePropsStat {
-    codeSource:'new'|'listTop'|undefined,
+    codeSource:'new'|'listop'|'listop-new'|undefined,
     queriedCode:string,
 };
 
@@ -29,20 +29,32 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
     async componentDidMount() {
         const {location,match}=this.props;
         const {sourceId,} = match.params;
-        let codeSource:'new'|'listTop'|undefined=this.getCodeSource();
+        let codeSource:'new'|'listop'|'listop-new'|undefined=this.getCodeSource();
         let queriedCode=undefined;
-        if(codeSource && codeSource=='listTop'){
-            //查询
-          let data= await HcserviceV3.requestMstrucLtmplQueryTop(sourceId,{top:1});
-          if(data && data.entities && data.entities[0]){
-              queriedCode=data.entities[0].code;
-          }
+        if(codeSource){
+            if( codeSource=='listop'){
+                queriedCode=await this.queryTop1(sourceId);
+                if(!queriedCode){
+                    queriedCode="bad-code";
+                }
+            }else if( codeSource=='listop-new'){
+                queriedCode=await this.queryTop1(sourceId);
+            }else if(codeSource=='new'){
+                queriedCode=null;
+            }
         }
         this.setState({
             codeSource,queriedCode
         })
     }
-
+    queryTop1=async (sourceId)=>{
+        let data= await HcserviceV3.requestMstrucLtmplQueryTop(sourceId,{top:1});
+        let queriedCode=null;
+        if(data && data.entities && data.entities[0]){
+            queriedCode=data.entities[0].code
+        }
+        return queriedCode;
+    }
     getMenuId=()=>{
         const {location} = this.props;
         //console.log("this.props.match.params",this.props);
@@ -103,7 +115,7 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
         const {codeSource,queriedCode}=this.state;
         const {location}=this.props;
         //let code;
-        if(codeSource=='listTop'){
+        if(codeSource){
             return queriedCode;
         }else{
             let params=Units.transQueryStrToParams(location.search);
@@ -121,19 +133,22 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
         const {location,match}=this.props;
         const {sourceId,} = match.params;
         const {codeSource}=this.state;
-        //console.log("this.props.match.params",match);
         if(!location){
             return <></>;
         }
+        const code=this.getCode();
+        if(code && code=='bad-code'){
+            return <Empty />
+        }
         let params=Units.transQueryStrToParams(location.search);
         let versionId=params['versionId'];
         if(location.pathname.endsWith("detail-view")){
             return (
-                <ActDtmplView goDtmpl={this.goDtmpl} sourceId={sourceId}  versionId={versionId} code={this.getCode()} mainCode={this.getMainCode()}  />
+                <ActDtmplView goDtmpl={this.goDtmpl} sourceId={sourceId}  versionId={versionId} code={code} mainCode={this.getMainCode()}  />
             );
         }else{
             return (
-                <DtmplEdit addOrUpdate={this.getMode()} sourceId={sourceId} code={this.getCode()} mainCode={this.getMainCode()} goBackToLtmpl={codeSource?undefined:this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
+                <DtmplEdit addOrUpdate={this.getMode()} sourceId={sourceId} code={code} mainCode={this.getMainCode()} goBackToLtmpl={codeSource?undefined:this.goBackToLtmpl} goDtmpl={this.goDtmpl}></DtmplEdit>
             );
         }
 

package/src/aldehyde/table/query-table.tsx

@@ -250,7 +250,6 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
                 }
             }
         }
-        // debugger
         return ds;
     }
 

package/src/aldehyde/tmpl/control-type-supportor.tsx

@@ -34,6 +34,7 @@ SupportInputTypes.add('select');
 SupportInputTypes.add('multiselect');
 SupportInputTypes.add('checkbox');
 SupportInputTypes.add('radio');
+SupportInputTypes.add('yes-no-radio');
 SupportInputTypes.add('yes-no-switch');
 SupportInputTypes.add('caselect');
 SupportInputTypes.add('relation');
@@ -44,6 +45,7 @@ SupportInputTypes.add('sql-code-editor');
 SupportInputTypes.add('video');//没支持上
 SupportInputTypes.add('takeVideo');//没支持上
 SupportInputTypes.add('signature');//签名组件
+SupportInputTypes.add('non-download-file');
 
 SupportInputTypes.add('decimal');
 SupportInputTypes.add('float');