clickgo 3.2.4 → 3.2.5

package/dist/app/demo/res/txt.svg

@@ -1 +1,21 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1617186237499" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="871" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M704.77913 82.365217H288.50087c-31.610435 0-57.433043 25.822609-57.433044 57.433044v744.403478c0 31.610435 25.822609 57.433043 57.433044 57.433044h545.391304c31.610435 0 57.433043-25.822609 57.433043-57.433044V268.911304l-186.546087-186.546087z" fill="#EFEFEF" p-id="872"></path><path d="M704.77913 211.478261c0 31.610435 25.822609 57.433043 57.433044 57.433043h129.113043l-186.546087-186.546087v129.113044zM341.481739 216.375652h272.473044v38.288696H341.481739zM341.481739 300.966957h272.473044v38.288695H341.481739zM341.481739 385.558261h363.742609v38.288696H341.481739zM341.481739 469.704348h444.772174v38.288695H341.481739z" fill="#D8D8D8" p-id="873"></path><path d="M501.76 833.892174H164.285217c-17.363478 0-31.610435-13.356522-31.610434-29.829565V658.921739c0-16.473043 14.246957-29.829565 31.610434-29.829565h337.029566c17.363478 0 31.610435 13.356522 31.610434 29.829565v144.695652c0.445217 16.918261-13.801739 30.274783-31.165217 30.274783z" fill="#A3A3A3" p-id="874"></path><path d="M249.321739 767.554783v30.274782h-28.048696v-30.274782H249.321739zM298.295652 660.257391v19.144348h9.794783v19.144348H298.295652v65.001739c0 8.013913 0.445217 12.466087 1.335652 13.356522s4.452174 1.335652 10.24 1.335652v19.589565h-14.692174c-8.45913 0-14.246957-0.445217-17.808695-0.890435s-6.678261-2.226087-9.349565-4.897391-4.452174-5.342609-4.897392-8.45913-0.890435-11.130435-0.890435-23.151305V698.991304h-8.013913v-19.144347h8.013913v-19.144348H298.295652zM389.565217 676.730435l-14.692174 57.878261 17.808696 63.220869h-36.062609c-3.561739-16.027826-6.233043-29.829565-8.013913-41.405217-2.671304 14.246957-5.342609 28.048696-8.013913 41.405217h-30.72l16.027826-63.220869-16.027826-57.878261h30.72c4.897391 24.932174 7.568696 38.733913 8.013913 42.295652 3.561739-20.48 6.233043-34.726957 8.013913-42.295652h32.946087zM436.313043 660.257391v19.144348h9.794783v19.144348H436.313043v65.001739c0 8.013913 0.445217 12.466087 1.335653 13.356522s4.452174 1.335652 10.24 1.335652v19.589565h-14.692174c-8.45913 0-14.246957-0.445217-17.808696-0.890435s-6.678261-2.226087-9.349565-4.897391-4.452174-5.342609-4.897391-8.45913-0.890435-11.130435-0.890435-23.151305V698.991304h-8.013913v-19.144347h8.013913v-19.144348H436.313043z" fill="#FFFFFF" p-id="875"></path></svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 512 512" xml:space="preserve">
+<path style="fill:#E2E5E7;" d="M128,0c-17.6,0-32,14.4-32,32v448c0,17.6,14.4,32,32,32h320c17.6,0,32-14.4,32-32V128L352,0H128z"/>
+<path style="fill:#B0B7BD;" d="M384,128h96L352,0v96C352,113.6,366.4,128,384,128z"/>
+<polygon style="fill:#CAD1D8;" points="480,224 384,128 480,128 "/>
+<path style="fill:#576D7E;" d="M416,416c0,8.8-7.2,16-16,16H48c-8.8,0-16-7.2-16-16V256c0-8.8,7.2-16,16-16h352c8.8,0,16,7.2,16,16
+	V416z"/>
+<g>
+	<path style="fill:#FFFFFF;" d="M132.784,311.472H110.4c-11.136,0-11.136-16.368,0-16.368h60.512c11.392,0,11.392,16.368,0,16.368
+		h-21.248v64.592c0,11.12-16.896,11.392-16.896,0v-64.592H132.784z"/>
+	<path style="fill:#FFFFFF;" d="M224.416,326.176l22.272-27.888c6.656-8.688,19.568,2.432,12.288,10.752
+		c-7.68,9.088-15.728,18.944-23.424,29.024l26.112,32.496c7.024,9.6-7.04,18.816-13.952,9.344l-23.536-30.192l-23.152,30.832
+		c-6.528,9.328-20.992-1.152-13.68-9.856l25.696-32.624c-8.048-10.096-15.856-19.936-23.664-29.024
+		c-8.064-9.6,6.912-19.44,12.784-10.48L224.416,326.176z"/>
+	<path style="fill:#FFFFFF;" d="M298.288,311.472H275.92c-11.136,0-11.136-16.368,0-16.368h60.496c11.392,0,11.392,16.368,0,16.368
+		h-21.232v64.592c0,11.12-16.896,11.392-16.896,0V311.472z"/>
+</g>
+<path style="fill:#CAD1D8;" d="M400,432H96v16h304c8.8,0,16-7.2,16-16v-16C416,424.8,408.8,432,400,432z"/>
+</svg>

package/dist/app/demo/res/zip.svg

@@ -1 +1,21 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1617186287788" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1153" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M704.77913 82.365217H288.50087c-31.610435 0-57.433043 25.822609-57.433044 57.433044v744.403478c0 31.610435 25.822609 57.433043 57.433044 57.433044h545.391304c31.610435 0 57.433043-25.822609 57.433043-57.433044V268.911304l-186.546087-186.546087z" fill="#E4F5F9" p-id="1154"></path><path d="M704.77913 211.478261c0 31.610435 25.822609 57.433043 57.433044 57.433043h129.113043l-186.546087-186.546087v129.113044z" fill="#58CFF9" p-id="1155"></path><path d="M501.76 833.892174H164.285217c-17.363478 0-31.610435-13.356522-31.610434-29.829565V658.921739c0-16.473043 14.246957-29.829565 31.610434-29.829565h337.029566c17.363478 0 31.610435 13.356522 31.610434 29.829565v144.695652c0.445217 16.918261-13.801739 30.274783-31.165217 30.274783z" fill="#21B7F9" p-id="1156"></path><path d="M239.972174 767.554783v30.274782h-28.048696v-30.274782h28.048696zM307.2 676.730435v26.713043l-27.158261 69.899131H307.2v24.486956H244.424348v-25.377391l27.603478-71.68h-24.932174V676.730435H307.2zM353.502609 650.017391v19.144348h-37.843479V650.017391h37.843479z m0 26.713044v121.09913h-37.843479V676.730435h37.843479zM404.257391 676.730435l-0.445217 10.685217c3.116522-4.452174 7.123478-7.568696 10.685217-9.794782 4.006957-2.226087 8.45913-3.116522 12.911305-3.116522 5.787826 0 10.685217 1.335652 14.692174 4.452174s6.678261 6.678261 8.013913 10.685217 1.335652 10.685217 1.335652 20.48V761.321739c0 11.130435-0.445217 18.69913-1.78087 23.596522s-4.006957 8.45913-8.013913 11.130435-8.904348 4.006957-14.692174 4.006956c-4.452174 0-8.904348-0.890435-12.911304-3.116522s-7.568696-5.342609-10.685217-9.349565v27.603478h-36.953044V676.730435h37.843478z m10.24 35.172174c0-7.568696-0.445217-12.02087-0.890434-13.801739s-2.226087-2.226087-4.452174-2.226087-4.006957 0.890435-4.897392 2.671304-0.890435 6.233043-0.890434 13.356522v50.309565c0 7.123478 0.445217 12.02087 0.890434 13.801739s2.226087 2.671304 4.897392 2.671304c2.226087 0 4.006957-0.890435 4.452174-2.671304s0.890435-5.787826 0.890434-12.02087v-52.090434z" fill="#FFFFFF" p-id="1157"></path><path d="M428.29913 463.026087h29.829566v29.829565h-29.829566V463.026087z m44.966957-44.966957H413.161739v89.933913h60.104348V418.05913zM473.266087 283.158261h-30.274783v29.829565h30.274783v30.274783h-30.274783v29.829565h30.274783v30.274783h-30.274783v-30.274783h-29.829565v-29.829565h29.829565v-30.274783h-29.829565v-29.829565h29.829565v-29.829565h-29.829565v-30.274783h29.829565v30.274783h30.274783z" fill="#58CFF9" p-id="1158"></path></svg>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 512 512" xml:space="preserve">
+<path style="fill:#E2E5E7;" d="M128,0c-17.6,0-32,14.4-32,32v448c0,17.6,14.4,32,32,32h320c17.6,0,32-14.4,32-32V128L352,0H128z"/>
+<path style="fill:#B0B7BD;" d="M384,128h96L352,0v96C352,113.6,366.4,128,384,128z"/>
+<polygon style="fill:#CAD1D8;" points="480,224 384,128 480,128 "/>
+<path style="fill:#84BD5A;" d="M416,416c0,8.8-7.2,16-16,16H48c-8.8,0-16-7.2-16-16V256c0-8.8,7.2-16,16-16h352c8.8,0,16,7.2,16,16
+	V416z"/>
+<g>
+	<path style="fill:#FFFFFF;" d="M132.64,384c-8.064,0-11.264-7.792-6.656-13.296l45.552-60.512h-37.76
+		c-11.12,0-10.224-15.712,0-15.712h51.568c9.712,0,12.528,9.184,5.632,16.624l-43.632,56.656h41.584
+		c10.24,0,11.52,16.256-1.008,16.256h-55.28V384z"/>
+	<path style="fill:#FFFFFF;" d="M212.048,303.152c0-10.496,16.896-10.88,16.896,0v73.04c0,10.608-16.896,10.88-16.896,0V303.152z"/>
+	<path style="fill:#FFFFFF;" d="M251.616,303.152c0-4.224,3.328-8.832,8.704-8.832h29.552c16.64,0,31.616,11.136,31.616,32.48
+		c0,20.224-14.976,31.488-31.616,31.488h-21.36v16.896c0,5.632-3.584,8.816-8.192,8.816c-4.224,0-8.704-3.184-8.704-8.816
+		L251.616,303.152L251.616,303.152z M268.496,310.432v31.872h21.36c8.576,0,15.36-7.568,15.36-15.504
+		c0-8.944-6.784-16.368-15.36-16.368H268.496z"/>
+</g>
+<path style="fill:#CAD1D8;" d="M400,432H96v16h304c8.8,0,16-7.2,16-16v-16C416,424.8,408.8,432,400,432z"/>
+</svg>

package/dist/clickgo.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.zip = exports.tool = exports.theme = exports.task = exports.native = exports.fs = exports.form = exports.dom = exports.core = exports.control = exports.vue = exports.hasFrame = exports.isImmersion = exports.getPlatform = exports.isNative = exports.getVersion = void 0;
-const version = '3.2.4';
+const version = '3.2.5';
 function getVersion() {
     return version;
 }

package/dist/clickgo.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const version = '3.2.4';
+const version = '3.2.5';
 export function getVersion(): string {
     return version;
 }

package/dist/lib/dom.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fullscreen = exports.siblingsData = exports.siblings = exports.findParentByClass = exports.findParentByData = exports.bindResize = exports.bindMove = exports.is = exports.bindDrag = exports.bindLong = exports.allowEvent = exports.bindGesture = exports.bindDown = exports.bindClick = exports.getWatchInfo = exports.clearWatchProperty = exports.isWatchProperty = exports.watchProperty = exports.clearWatchStyle = exports.isWatchStyle = exports.watchStyle = exports.clearWatch = exports.isWatch = exports.unwatch = exports.watch = exports.getWatchCount = exports.clearWatchSize = exports.isWatchSize = exports.unwatchSize = exports.watchSize = exports.getWatchSizeCount = exports.getStyleCount = exports.removeStyle = exports.pushStyle = exports.removeFromStyleList = exports.createToStyleList = exports.hasTouchButMouse = exports.setGlobalCursor = exports.inPage = void 0;
+exports.fullscreen = exports.siblingsData = exports.siblings = exports.findParentByClass = exports.findParentByData = exports.bindResize = exports.bindMove = exports.is = exports.bindDrag = exports.setDragData = exports.bindLong = exports.allowEvent = exports.bindGesture = exports.bindDown = exports.bindDblClick = exports.bindClick = exports.getWatchInfo = exports.clearWatchProperty = exports.isWatchProperty = exports.watchProperty = exports.clearWatchStyle = exports.isWatchStyle = exports.watchStyle = exports.clearWatch = exports.isWatch = exports.unwatch = exports.watch = exports.getWatchCount = exports.clearWatchSize = exports.isWatchSize = exports.unwatchSize = exports.watchSize = exports.getWatchSizeCount = exports.getStyleCount = exports.removeStyle = exports.pushStyle = exports.removeFromStyleList = exports.createToStyleList = exports.hasTouchButMouse = exports.setGlobalCursor = exports.inPage = void 0;
 const clickgo = __importStar(require("../clickgo"));
 const form = __importStar(require("./form"));
 const core = __importStar(require("./core"));
@@ -732,19 +732,51 @@ const watchTimerHandler = function () {
 };
 watchTimerHandler();
 function bindClick(e, handler) {
+    if ((e instanceof MouseEvent) && (e.button > 0)) {
+        return;
+    }
     const x = e instanceof MouseEvent ? e.clientX : e.touches[0].clientX;
     const y = e instanceof MouseEvent ? e.clientY : e.touches[0].clientY;
+    const time = Date.now();
     bindDown(e, {
         up: (ne) => {
-            const nx = ne instanceof MouseEvent ? ne.clientX : ne.touches[0].clientX;
-            const ny = ne instanceof MouseEvent ? ne.clientY : ne.touches[0].clientY;
+            if (Date.now() - time >= 250) {
+                return;
+            }
+            const nx = ne instanceof MouseEvent ? ne.clientX : ne.changedTouches[0].clientX;
+            const ny = ne instanceof MouseEvent ? ne.clientY : ne.changedTouches[0].clientY;
             if (nx === x && ny === y) {
-                handler();
+                handler(ne, nx, ny);
             }
         }
     });
 }
 exports.bindClick = bindClick;
+const lastDblClickData = {
+    'time': 0,
+    'x': 0,
+    'y': 0
+};
+function bindDblClick(e, handler) {
+    bindClick(e, (ne, x, y) => {
+        const now = Date.now();
+        if (now - lastDblClickData.time <= 300) {
+            const xx = Math.abs(x - lastDblClickData.x);
+            const xy = Math.abs(y - lastDblClickData.y);
+            if (xx < 10 && xy < 10) {
+                handler(ne, x, y);
+                lastDblClickData.time = 0;
+                lastDblClickData.x = 0;
+                lastDblClickData.y = 0;
+                return;
+            }
+        }
+        lastDblClickData.time = now;
+        lastDblClickData.x = x;
+        lastDblClickData.y = y;
+    });
+}
+exports.bindDblClick = bindDblClick;
 function bindDown(oe, opt) {
     var _a;
     if (hasTouchButMouse(oe)) {
@@ -1204,13 +1236,20 @@ function bindLong(e, long) {
     });
 }
 exports.bindLong = bindLong;
+let bindDragData = undefined;
+function setDragData(data) {
+    bindDragData = data;
+}
+exports.setDragData = setDragData;
 function bindDrag(e, opt) {
+    bindDragData = opt.data;
     let otop = 0;
     let oleft = 0;
     let nel = null;
     bindMove(e, {
         'object': opt.el,
-        'start': function () {
+        'start': function (x, y) {
+            var _a;
             const rect = opt.el.getBoundingClientRect();
             form.showDrag();
             form.moveDrag({
@@ -1222,8 +1261,10 @@ function bindDrag(e, opt) {
             });
             otop = rect.top;
             oleft = rect.left;
+            (_a = opt.start) === null || _a === void 0 ? void 0 : _a.call(opt, x, y);
         },
         'move': function (e, o) {
+            var _a;
             const ntop = otop + o.oy;
             const nleft = oleft + o.ox;
             form.moveDrag({
@@ -1248,7 +1289,7 @@ function bindDrag(e, opt) {
                     nel.removeAttribute('data-cg-hover');
                     nel.dispatchEvent(new CustomEvent('dragleave', {
                         'detail': {
-                            'value': opt.data
+                            'value': bindDragData
                         }
                     }));
                 }
@@ -1256,7 +1297,7 @@ function bindDrag(e, opt) {
                 nel = el;
                 nel.dispatchEvent(new CustomEvent('dragenter', {
                     'detail': {
-                        'value': opt.data
+                        'value': bindDragData
                     }
                 }));
                 return;
@@ -1270,12 +1311,14 @@ function bindDrag(e, opt) {
             nel.removeAttribute('data-cg-hover');
             nel.dispatchEvent(new CustomEvent('dragleave', {
                 'detail': {
-                    'value': opt.data
+                    'value': bindDragData
                 }
             }));
             nel = null;
+            (_a = opt.move) === null || _a === void 0 ? void 0 : _a.call(opt, e, o);
         },
-        'end': function () {
+        'end': function (moveTimes, e) {
+            var _a;
             form.hideDrag();
             if (nel === null) {
                 return;
@@ -1283,9 +1326,11 @@ function bindDrag(e, opt) {
             nel.removeAttribute('data-cg-hover');
             nel.dispatchEvent(new CustomEvent('drop', {
                 'detail': {
-                    'value': opt.data
+                    'value': bindDragData
                 }
             }));
+            (_a = opt.end) === null || _a === void 0 ? void 0 : _a.call(opt, moveTimes, e);
+            bindDragData = undefined;
         }
     });
 }

package/dist/lib/dom.ts

@@ -991,17 +991,64 @@ watchTimerHandler();
  * @param e 事件对象
  * @param handler 回调
  */
-export function bindClick(e: MouseEvent | TouchEvent, handler: () => void): void {
+export function bindClick(
+    e: MouseEvent | TouchEvent,
+    handler: (e: MouseEvent | TouchEvent, x: number, y: number) => void
+): void {
+    if ((e instanceof MouseEvent) && (e.button > 0)) {
+        return;
+    }
     const x = e instanceof MouseEvent ? e.clientX : e.touches[0].clientX;
     const y = e instanceof MouseEvent ? e.clientY : e.touches[0].clientY;
+    const time = Date.now();
     bindDown(e, {
         up: (ne) => {
-            const nx = ne instanceof MouseEvent ? ne.clientX : ne.touches[0].clientX;
-            const ny = ne instanceof MouseEvent ? ne.clientY : ne.touches[0].clientY;
+            if (Date.now() - time >= 250) {
+                return;
+            }
+            const nx = ne instanceof MouseEvent ? ne.clientX : ne.changedTouches[0].clientX;
+            const ny = ne instanceof MouseEvent ? ne.clientY : ne.changedTouches[0].clientY;
             if (nx === x && ny === y) {
-                handler();
+                handler(ne, nx, ny);
+            }
+        }
+    });
+}
+
+/** --- 双击事件中，最后一次单击的数据 --- */
+const lastDblClickData = {
+    'time': 0,
+    'x': 0,
+    'y': 0
+};
+
+/**
+ * --- 相当于鼠标/手指两次 click 的效果，并且两次位置差别不太大，dblclick 才生效 ---
+ * @param e 事件对象
+ * @param handler 回调
+ */
+export function bindDblClick(
+    e: MouseEvent | TouchEvent,
+    handler: (e: MouseEvent | TouchEvent, x: number, y: number) => void | Promise<void>
+): void {
+    bindClick(e, (ne, x, y) => {
+        // --- 判断当前第几次点击 ---
+        const now = Date.now();
+        if (now - lastDblClickData.time <= 300) {
+            const xx = Math.abs(x - lastDblClickData.x);
+            const xy = Math.abs(y - lastDblClickData.y);
+            if (xx < 10 && xy < 10) {
+                // --- 响应双击 ---
+                handler(ne, x, y) as any;
+                lastDblClickData.time = 0;
+                lastDblClickData.x = 0;
+                lastDblClickData.y = 0;
+                return;
             }
         }
+        lastDblClickData.time = now;
+        lastDblClickData.x = x;
+        lastDblClickData.y = y;
     });
 }
 
@@ -1536,18 +1583,37 @@ export function bindLong(e: MouseEvent | TouchEvent, long: (e: MouseEvent | Touc
     });
 }
 
+/** --- 要传输的 drag data 数据 --- */
+let bindDragData: any = undefined;
+
+/**
+ * --- 重新绑定 drag 数据 ---
+ * @param data 要绑定的数据
+ */
+export function setDragData(data?: string | number | boolean | Record<string, any>): void {
+    bindDragData = data;
+}
+
 /**
  * --- 绑定拖动 ---
  * @param e 鼠标事件
  * @param opt 参数
  */
-export function bindDrag(e: MouseEvent | TouchEvent, opt: { 'el': HTMLElement; 'data'?: any; }): void {
+export function bindDrag(e: MouseEvent | TouchEvent, opt: {
+    'el': HTMLElement;
+    'data'?: any;
+
+    'start'?: (x: number, y: number) => any;
+    'move'?: (e: MouseEvent | TouchEvent, opt: types.IBindMoveMoveOptions) => void;
+    'end'?: (moveTimes: Array<{ 'time': number; 'ox': number; 'oy': number; }>, e: MouseEvent | TouchEvent) => void;
+}): void {
+    bindDragData = opt.data;
     let otop = 0;
     let oleft = 0;
     let nel: HTMLElement | null = null;
     bindMove(e, {
         'object': opt.el,
-        'start': function() {
+        'start': function(x, y) {
             const rect = opt.el.getBoundingClientRect();
             form.showDrag();
             form.moveDrag({
@@ -1559,6 +1625,7 @@ export function bindDrag(e: MouseEvent | TouchEvent, opt: { 'el': HTMLElement; '
             });
             otop = rect.top;
             oleft = rect.left;
+            opt.start?.(x, y);
         },
         'move': function(e, o) {
             const ntop = otop + o.oy;
@@ -1587,7 +1654,7 @@ export function bindDrag(e: MouseEvent | TouchEvent, opt: { 'el': HTMLElement; '
                     nel.removeAttribute('data-cg-hover');
                     nel.dispatchEvent(new CustomEvent('dragleave', {
                         'detail': {
-                            'value': opt.data
+                            'value': bindDragData
                         }
                     }));
                 }
@@ -1595,7 +1662,7 @@ export function bindDrag(e: MouseEvent | TouchEvent, opt: { 'el': HTMLElement; '
                 nel = el;
                 nel.dispatchEvent(new CustomEvent('dragenter', {
                     'detail': {
-                        'value': opt.data
+                        'value': bindDragData
                     }
                 }));
                 return;
@@ -1610,12 +1677,13 @@ export function bindDrag(e: MouseEvent | TouchEvent, opt: { 'el': HTMLElement; '
             nel.removeAttribute('data-cg-hover');
             nel.dispatchEvent(new CustomEvent('dragleave', {
                 'detail': {
-                    'value': opt.data
+                    'value': bindDragData
                 }
             }));
             nel = null;
+            opt.move?.(e, o);
         },
-        'end': function() {
+        'end': function(moveTimes, e) {
             form.hideDrag();
             if (nel === null) {
                 return;
@@ -1623,9 +1691,11 @@ export function bindDrag(e: MouseEvent | TouchEvent, opt: { 'el': HTMLElement; '
             nel.removeAttribute('data-cg-hover');
             nel.dispatchEvent(new CustomEvent('drop', {
                 'detail': {
-                    'value': opt.data
+                    'value': bindDragData
                 }
             }));
+            opt.end?.(moveTimes, e);
+            bindDragData = undefined;
         }
     });
 }

package/dist/lib/form.js

@@ -48,6 +48,13 @@ const info = {
     'lastZIndex': 999,
     'topLastZIndex': 9999999,
     'locale': {
+        'en': {
+            'ok': 'OK',
+            'yes': 'Yes',
+            'no': 'No',
+            'cancel': 'Cancel',
+            'search': 'Search'
+        },
         'sc': {
             'ok': '好',
             'yes': '是',
@@ -62,19 +69,68 @@ const info = {
             'cancel': '取消',
             'search': '檢索'
         },
-        'en': {
-            'ok': 'OK',
-            'yes': 'Yes',
-            'no': 'No',
-            'cancel': 'Cancel',
-            'search': 'Search'
-        },
         'ja': {
             'ok': '好',
             'yes': 'はい',
             'no': 'いいえ',
             'cancel': 'キャンセル',
             'search': '検索'
+        },
+        'ko': {
+            'ok': '확인',
+            'yes': '예',
+            'no': '아니오',
+            'cancel': '취소',
+            'search': '검색'
+        },
+        'th': {
+            'ok': 'ตกลง',
+            'yes': 'ใช่',
+            'no': 'ไม่',
+            'cancel': 'ยกเลิก',
+            'search': 'ค้นหา'
+        },
+        'es': {
+            'ok': 'Aceptar',
+            'yes': 'Sí',
+            'no': 'No',
+            'cancel': 'Cancelar',
+            'search': 'Buscar'
+        },
+        'de': {
+            'ok': 'OK',
+            'yes': 'Ja',
+            'no': 'Nein',
+            'cancel': 'Abbrechen',
+            'search': 'Suchen'
+        },
+        'fr': {
+            'ok': 'OK',
+            'yes': 'Oui',
+            'no': 'Non',
+            'cancel': 'Annuler',
+            'search': 'Rechercher'
+        },
+        'pt': {
+            'ok': 'OK',
+            'yes': 'Sim',
+            'no': 'Não',
+            'cancel': 'Cancelar',
+            'search': 'Buscar'
+        },
+        'ru': {
+            'ok': 'OK',
+            'yes': 'Да',
+            'no': 'Нет',
+            'cancel': 'Отмена',
+            'search': 'Поиск'
+        },
+        'vi': {
+            'ok': 'OK',
+            'yes': 'Có',
+            'no': 'Không',
+            'cancel': 'Hủy bỏ',
+            'search': 'Tìm kiếm'
         }
     }
 };

package/dist/lib/form.ts

@@ -50,6 +50,13 @@ const info: {
     'lastZIndex': 999,
     'topLastZIndex': 9999999,
     'locale': {
+        'en': {
+            'ok': 'OK',
+            'yes': 'Yes',
+            'no': 'No',
+            'cancel': 'Cancel',
+            'search': 'Search'
+        },
         'sc': {
             'ok': '好',
             'yes': '是',
@@ -64,19 +71,68 @@ const info: {
             'cancel': '取消',
             'search': '檢索'
         },
-        'en': {
-            'ok': 'OK',
-            'yes': 'Yes',
-            'no': 'No',
-            'cancel': 'Cancel',
-            'search': 'Search'
-        },
         'ja': {
             'ok': '好',
             'yes': 'はい',
             'no': 'いいえ',
             'cancel': 'キャンセル',
             'search': '検索'
+        },
+        'ko': {
+            'ok': '확인',
+            'yes': '예',
+            'no': '아니오',
+            'cancel': '취소',
+            'search': '검색'
+        },
+        'th': {
+            'ok': 'ตกลง',
+            'yes': 'ใช่',
+            'no': 'ไม่',
+            'cancel': 'ยกเลิก',
+            'search': 'ค้นหา'
+        },
+        'es': {
+            'ok': 'Aceptar',
+            'yes': 'Sí',
+            'no': 'No',
+            'cancel': 'Cancelar',
+            'search': 'Buscar'
+        },
+        'de': {
+            'ok': 'OK',
+            'yes': 'Ja',
+            'no': 'Nein',
+            'cancel': 'Abbrechen',
+            'search': 'Suchen'
+        },
+        'fr': {
+            'ok': 'OK',
+            'yes': 'Oui',
+            'no': 'Non',
+            'cancel': 'Annuler',
+            'search': 'Rechercher'
+        },
+        'pt': {
+            'ok': 'OK',
+            'yes': 'Sim',
+            'no': 'Não',
+            'cancel': 'Cancelar',
+            'search': 'Buscar'
+        },
+        'ru': {
+            'ok': 'OK',
+            'yes': 'Да',
+            'no': 'Нет',
+            'cancel': 'Отмена',
+            'search': 'Поиск'
+        },
+        'vi': {
+            'ok': 'OK',
+            'yes': 'Có',
+            'no': 'Không',
+            'cancel': 'Hủy bỏ',
+            'search': 'Tìm kiếm'
         }
     }
 };