ZK-4969: dropupload supports accept file type

zkdoc/release-note

@@ -25,6 +25,7 @@ ZK 10.0.0
   ZK-5119: Integrate Font Awesome 6 free icons
   ZK-5541: Move widget restriction check to Client MVVM
   ZK-5354: Update animation implementation to avoid iframe reloading
+  ZK-4969: dropupload supports accept file type
 
 * Bugs
   ZK-5089: AfterSizeEvent doesn't return a correct size of a Window component
@@ -90,6 +91,8 @@ ZK 10.0.0
   + Upgrade gson to 2.10.1 for fixing vulnerabilities
   + Upgrade jackson-databind to 2.15.2 for fixing vulnerabilities
   + Upgrade Font Awesome version from 4.7.0 to 6.4.2, and previous iconSclass syntax will continue to be supported
+  + Dropupload now can use `accept` to set the acceptable file types with MIME format, use `accept` attribute in zul file,
+  and use `setAccept()` in Java API.
 
    --------
 ZK 9.6.4

zktest/src/main/webapp/test2/F100-ZK-4969.zul

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+F100-ZK-4969.zul
+
+        Purpose:
+
+        Description:
+
+        History:
+                Thu Sep 07 18:24:03 CST 2023, Created by jamson
+
+Copyright (C) 2023 Potix Corporation. All Rights Reserved.
+-->
+<zk>
+	<dropupload accept="audio/*, .png, .txt"/>
+</zk>

zktest/src/main/webapp/test2/config.properties

@@ -3781,6 +3781,7 @@ F86-ZK-4235.zul=A,E,datefmt,library-property
 ##manually##F100-ZK-5119-2.zul=A,E,FontAwesome6,fa6
 ##zats##F100-ZK-5354.zul=A,E,Iframe,Animation,reload
 ##zats##F100-ZK-5354-2.zul=A,E,Ckeditor,Animation,reload
+##manually##F100-ZK-4969.zul=A,E,Dropupload,accept,type
 
 # Complex Test Case
 #

zul/src/main/java/org/zkoss/zul/impl/Utils.java

@@ -277,6 +277,8 @@ public static final String outLocaleJavaScript() {
 
 		addLocaleJS(sb, "UPLOAD_ERROR_EXCEED_MAXSIZE", MZul.UPLOAD_ERROR_EXCEED_MAXSIZE);
 
+		addLocaleJS(sb, "UPLOAD_ERROR_UNACCEPTED_FILE_TYPE", MZul.UPLOAD_ERROR_UNACCEPTED_FILE_TYPE);
+
 		addLocaleJS(sb, "COLORBOX_PALETTE_BUTTON_LABEL", MZul.COLORBOX_PALETTE_BUTTON_LABEL);
 		addLocaleJS(sb, "COLORBOX_PICKER_BUTTON_LABEL", MZul.COLORBOX_PICKER_BUTTON_LABEL);
 		addLocaleJS(sb, "COLORBOX_COLOR_PALETTE", MZul.COLORBOX_COLOR_PALETTE);

zul/src/main/java/org/zkoss/zul/mesg/MZul.java

@@ -38,6 +38,7 @@ public interface MZul extends org.zkoss.mesg.MessageConst {
 	static final int UPLOAD_SUBMIT = 0x2103 + MESSAGE_ID;
 	static final int UPLOAD_BROWSE = 0x2104 + MESSAGE_ID;
 	static final int UPLOAD_ERROR_EXCEED_MAXSIZE = 0x2105 + MESSAGE_ID;
+	static final int UPLOAD_ERROR_UNACCEPTED_FILE_TYPE = 0x2106 + MESSAGE_ID;
 	static final int OK = 0x2200 + MESSAGE_ID;
 	static final int CANCEL = 0x2201 + MESSAGE_ID;
 	static final int YES = 0x2220 + MESSAGE_ID;

zul/src/main/resources/metainfo/mesg/msgzul.properties

@@ -75,6 +75,8 @@ Too many characters are entered. At most {0} characters are allowed.
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_ar.properties

@@ -74,6 +74,8 @@
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_bg.properties

@@ -75,6 +75,8 @@
 2104=Избери...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_ca.properties

@@ -78,6 +78,8 @@ Heu introduït massa caràcters. El màxim permès és {0}.
 2104=Explora...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=La sol·licitud ha estat rebutjada perquè la mida del fitxer ({0}) supera el màxim configurat ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_cs.properties

@@ -74,6 +74,8 @@ Příliš mnoho znakům maximum je {0} znaků
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_da.properties

@@ -75,6 +75,8 @@ For mange tegn er indtastet. Maksimalt {0} tegn er tilladt.
 2104=Gennemse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_de.properties

@@ -78,6 +78,8 @@ Zu viele Zeichen eingeben. Maximal {0} Zeichen sind zulässig.
 2104=Durchsuchen...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=Upload fehlgeschlagen: Dateigröße ({0}) übersteigt das erlaubte Limit ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_es.properties

@@ -78,6 +78,8 @@ Too many characters are entered. At most {0} characters are allowed.
 2104=Explorer...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_fr.properties

@@ -78,6 +78,8 @@ Trop de caractères sont saisis. {0} caractère(s) sont autorisé(s) au maximum.
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=la requete à été refusée car sa taille ({0}) dépasse le maximum configuré ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_hu.properties

@@ -76,6 +76,8 @@ Túl hosszú szöveg! Csak {0} vagy kevesebb karakter engedélyezett.
 2104=Tallózás...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_id.properties

@@ -78,6 +78,8 @@ Terlalu banyak karakter yang dimasukkan. Paling banyak {0} karater yang diijinka
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_it.properties

@@ -75,6 +75,8 @@ Troppi caratteri. Sono consentiti al massimo {0} caratteri.
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_ja.properties

@@ -77,6 +77,8 @@
 2104=參照...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=このリクエストが拒否されました。ファイルサイズ({0})が最大値({1})を越えています。
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_ko.properties

@@ -76,6 +76,8 @@
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_nl.properties

@@ -71,6 +71,8 @@ Alleen spaties zijn ook niet toegestaan
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_pl.properties

@@ -75,6 +75,8 @@ Wprowadzono zbyt dużo znaków, dozwolone co najwyżej {0}.
 2104=Przeglądaj...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_pt.properties

@@ -78,6 +78,8 @@ Muitos caracteres foram inseridos. Permitido no máximo {0} caracteres.
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_pt_BR.properties

@@ -78,6 +78,8 @@ Muitos caracteres foram inseridos. Permitido no máximo {0} caracteres.
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_ro.properties

@@ -78,6 +78,8 @@ Prea multe caractere sunt introduse. Cel mult {0} caractere sunt permise.
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_ru.properties

@@ -70,6 +70,8 @@
 2104=Обзор...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=Запрос на загрузку файла отклонен, поскольку его размер ({0}) превышает установленное ограничение ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_sk.properties

@@ -74,6 +74,8 @@ Príliš veľa znakov. Maximum je {0} znakov
 2104=Prehliadať...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_sl.properties

@@ -75,6 +75,8 @@ Too many characters are entered. At most {0} characters are allowed.
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_sv.properties

@@ -78,6 +78,8 @@ För många tecken inmatade. Högst {0} tecken tillåtna.
 2104=Bläddra...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_tr.properties

@@ -78,6 +78,8 @@ Aralık aşılıyor ({0}).
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_uk.properties

@@ -75,6 +75,8 @@
 2104=Browse...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_vi.properties

@@ -75,6 +75,8 @@ Bạn nhập nội dung quá dài, Độ dài cho phép {0} ký tự.
 2104=Chọn...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=The request was rejected because the file size ({0}) exceeds the configured maximum ({1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_zh.properties

@@ -73,6 +73,8 @@
 2104=瀏覽...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=上傳有誤，檔案大小（{0}）超過配置的最大值（{1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_zh_CN.properties

@@ -71,6 +71,8 @@
 2104=浏览...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=上传有误，档案大小（{0}）超过配置的最大值（{1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_zh_SG.properties

@@ -72,6 +72,8 @@
 2104=浏览...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=上传有误，档案大小（{0}）超过配置的最大值（{1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/mesg/msgzul_zh_TW.properties

@@ -73,6 +73,8 @@
 2104=瀏覽...
 #-=UPLOAD_ERROR_EXCEED_MAXSIZE Auto:{0},{1} Byte:{2},{3} KB:{4},{5} MB:{6},{7}
 2105=上傳有誤，檔案大小（{0}）超過配置的最大值（{1})
+#-=UPLOAD_ERROR_UNACCEPTED_FILE_TYPE
+2106=The request was rejected because the file type is unacceptable
 
 #
 # Messagebox #

zul/src/main/resources/metainfo/xml/zul.xsd

@@ -1756,6 +1756,7 @@
 		<xs:attribute name="maxFileCount" type="intType" use="optional" />
 		<xs:attribute name="suppressedErrors" type="xs:string" use="optional" />
 		<xs:attribute name="onMaxFileCountExceed" type="xs:string" use="optional" />
+		<xs:attribute name="accept" type="xs:string" use="optional" />
 	</xs:complexType>
 	<!-- east -->
 	<xs:element name="east" type="layoutRegionType" />

zul/src/main/resources/web/js/zul/global.d.ts

@@ -84,6 +84,7 @@ declare global {
 	| 'UNKNOWN_TYPE'
 	| 'UPLOAD_CANCEL' // zul/fud/FileuploadDig
 	| 'UPLOAD_ERROR_EXCEED_MAXSIZE' // zul/Upload
+	| 'UPLOAD_ERROR_UNACCEPTED_FILE_TYPE' // zkmax/wgt/Dropupload
 	| 'VALUE_NOT_MATCHED' // zul/inp/Combobox
 	| 'WS_HOME' // zul/WScroll
 	| 'WS_PREV' // zul/WScroll