From 8a1a8b517e52a276b5f5d42a24ba16abc0156948 Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Thu, 4 Jun 2026 13:51:11 +0800 Subject: [PATCH 01/20] chore: migrate HAC plugin to net8 and add offline diagnostics Migrate the plugin project to SDK-style net8.0-windows so it can reference Forguncy v12 assemblies. Add offline form command diagnostics and a success alert showing the JSON payload used by OfflinePlusAddPattern_Async. --- AndroidPDACommand.csproj | 131 +++++++++++---------------------- JPushServerCommand.cs | 3 +- OfflinePlusAddPattern_Async.cs | 3 +- Resources/AndroidPDACommand.js | 40 +++++++--- 4 files changed, 76 insertions(+), 101 deletions(-) diff --git a/AndroidPDACommand.csproj b/AndroidPDACommand.csproj index c53bcc5..376c9ec 100644 --- a/AndroidPDACommand.csproj +++ b/AndroidPDACommand.csproj @@ -1,76 +1,38 @@ - - - + - Debug - AnyCPU - {8414FB54-B60D-4F9A-9505-B5E0B2D86C43} + net8.0-windows Library - Properties AndroidPDACommand AndroidPDACommand - v4.7.2 - 512 SAK SAK SAK SAK - true + true + true + true + false + false + false + false + bin\ true full false - bin\ DEBUG;TRACE prompt 4 - MinimumRecommendedRules.ruleset pdbonly true - bin\ TRACE prompt 4 - - - false - - - D:\ForguncyOtherVersion\8.0.6.0\Website\designerBin\Forguncy.Commands.dll - - - D:\ForguncyOtherVersion\8.0.6.0\Website\designerBin\Forguncy.Commands.Design.dll - - - D:\ForguncyOtherVersion\8.0.6.0\Website\designerBin\GrapeCity.Forguncy.Plugin.dll - - - False - D:\ForguncyOtherVersion\8.0.6.0\Website\bin\GrapeCity.Forguncy.ServerApi.dll - - - packages\Jiguang.JPush.1.2.5\lib\net45\Jiguang.JPush.dll - - - packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - - - - - - - - - - - - @@ -143,77 +105,68 @@ - + + + + + E:\forAgentA\forguncy\Forguncy.Server2\designerBin\Forguncy.Commands.dll + False + + + E:\forAgentA\forguncy\Forguncy.Server2\designerBin\Forguncy.Commands.Design.dll + False + + + E:\forAgentA\forguncy\Forguncy.Server2\designerBin\GrapeCity.Forguncy.Plugin.dll + False + + + E:\forAgentA\forguncy\Forguncy.Server2\bin\GrapeCity.Forguncy.ServerApi.dll + False + + + + + - + PreserveNewest - - - + PreserveNewest - - + Always - - - + PreserveNewest + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "D:\ForguncyCode\puglin\PluginTools\PluginPackageTool\bin\Release\PluginPackageTool.exe" "$(ProjectDir)\" "$(ConfigurationName)" - - \ No newline at end of file + + + + diff --git a/JPushServerCommand.cs b/JPushServerCommand.cs index 317c421..c6ff1b6 100644 --- a/JPushServerCommand.cs +++ b/JPushServerCommand.cs @@ -12,7 +12,6 @@ using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; using System.Windows.Markup; -using System.Xml.Serialization.Configuration; namespace AndroidPDACommand { @@ -66,7 +65,7 @@ namespace AndroidPDACommand if (!string.IsNullOrEmpty(url)) { - intentObj.Add("url", "intent:#Intent;action=com.huozige.lab.container.navigate;component=com.huozige.lab.container/com.huozige.lab.container.MainActivity;S.url=" + System.Web.HttpUtility.UrlEncode(url) + ";end"); + intentObj.Add("url", "intent:#Intent;action=com.huozige.lab.container.navigate;component=com.huozige.lab.container/com.huozige.lab.container.MainActivity;S.url=" + WebUtility.UrlEncode(url) + ";end"); } else { diff --git a/OfflinePlusAddPattern_Async.cs b/OfflinePlusAddPattern_Async.cs index dfbe591..1e6a3bc 100644 --- a/OfflinePlusAddPattern_Async.cs +++ b/OfflinePlusAddPattern_Async.cs @@ -5,6 +5,7 @@ using GrapeCity.Forguncy.Plugin; namespace AndroidPDACommand { + [Category("活字格安卓容器（HAC）")] public class OfflinePlusAddPattern_Async : BaseAsyncCommand { [FormulaProperty] @@ -26,7 +27,7 @@ namespace AndroidPDACommand public override string ToString() { - return "添加项目"; + return "添加离线表单项目"; } } diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index 795ce02..0eb19e1 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -1,10 +1,29 @@  var ERROR_NOT_RUN_IN_HAC = "当前APP不支持该命令，这通常是因为APP版本过低。您可以通过在葡萄城技术社区搜索“HAC”下载最新版APP。"; -var HAC_CallFunctionOutOfHAC = function () { - alert(ERROR_NOT_RUN_IN_HAC); +var HAC_CallFunctionOutOfHAC = function (debugInfo) { + var message = ERROR_NOT_RUN_IN_HAC; + if (debugInfo) { + message += "\r\n\r\n诊断信息：\r\n" + debugInfo; + } + alert(message); } +var HAC_GetOfflinePlusDebugInfo = function (commandName, stage) { + var offlinePlus = window.offlinePlus; + var hac = window.HAC; + return [ + "命令：" + commandName, + "阶段：" + stage, + "window.HAC：" + (hac ? typeof hac : "undefined"), + "window.HAC.registryCallback：" + (hac && hac.registryCallback ? typeof hac.registryCallback : "undefined"), + "window.offlinePlus：" + (offlinePlus ? typeof offlinePlus : "undefined"), + "window.offlinePlus.offlinePlusAddPatternAsync：" + (offlinePlus && offlinePlus.offlinePlusAddPatternAsync ? typeof offlinePlus.offlinePlusAddPatternAsync : "undefined"), + "window.offlinePlus.offlinePlusGetPatternsAsync：" + (offlinePlus && offlinePlus.offlinePlusGetPatternsAsync ? typeof offlinePlus.offlinePlusGetPatternsAsync : "undefined"), + "location：" + window.location.href + ].join("\r\n"); +}; + var HAC_GenerateCellInfo = function (context, formula) { var cellLocation = context.getCellLocation(formula); @@ -18,9 +37,9 @@ var HAC_GenerateCellInfo = function (context, formula) { return JSON.stringify(cellLocation); }; -var HAC_GenerateCallbackTicket = function (context, onSuccess) { +var HAC_GenerateCallbackTicket = function (context, onSuccess, debugInfo) { if (!window.HAC) { - HAC_CallFunctionOutOfHAC(); + HAC_CallFunctionOutOfHAC(debugInfo || "window.HAC is undefined."); } else { var ticket = { @@ -2573,8 +2592,10 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { let me = this; let params = this.CommandParam; + let patternParamJson = ""; let _ticket = HAC_GenerateCallbackTicket(me, function (payload, payload2) { + alert("离线表单项目设置成功\r\n\r\nJSON Schema：\r\n" + patternParamJson); me.CommandExecutor.excuteCommand(me.CommandParam.CommandList, { runTimePageName: me.CommandExecutingInfo.runTimePageName, commandID: new Date().valueOf().toString(), @@ -2584,7 +2605,7 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { }, locationString: "执行window.offlinePlus.offlinePlusAddPattern" }); - }); + }, HAC_GetOfflinePlusDebugInfo("添加离线表单项目", "生成回调ticket")); let patternParam = { ticket: _ticket, @@ -2594,12 +2615,13 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { formItems: params.FormItems }; + patternParamJson = JSON.stringify(patternParam, null, 2); console.log(patternParam); if (window.offlinePlus && window.offlinePlus.offlinePlusAddPatternAsync) { - window.offlinePlus.offlinePlusAddPatternAsync(JSON.stringify(patternParam)); + window.offlinePlus.offlinePlusAddPatternAsync(patternParamJson); } else { - HAC_CallFunctionOutOfHAC(); + HAC_CallFunctionOutOfHAC(HAC_GetOfflinePlusDebugInfo("添加离线表单项目", "调用offlinePlusAddPatternAsync")); } }; @@ -2630,12 +2652,12 @@ var OfflinePlusGetPatterns_Async_Command = (function (_super) { }, locationString: "执行window.offlinePlus.offlinePlusGetPatternsAsync" }); - }); + }, HAC_GetOfflinePlusDebugInfo("获取已保存项目", "生成回调ticket")); if (window.offlinePlus && window.offlinePlus.offlinePlusGetPatternsAsync) { window.offlinePlus.offlinePlusGetPatternsAsync(ticket); } else { - HAC_CallFunctionOutOfHAC(); + HAC_CallFunctionOutOfHAC(HAC_GetOfflinePlusDebugInfo("获取已保存项目", "调用offlinePlusGetPatternsAsync")); } }; -- Gitee From 5f3d38bbe9ef4268b49ac2a5b2f4c4c8bcf51cef Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Thu, 4 Jun 2026 16:31:13 +0800 Subject: [PATCH 02/20] feat: add SchemaVersion property to OfflinePlusAddPattern and update command to include it --- OfflinePlusAddPattern_Async.cs | 9 ++++++++- Resources/AndroidPDACommand.js | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/OfflinePlusAddPattern_Async.cs b/OfflinePlusAddPattern_Async.cs index 1e6a3bc..af41d9c 100644 --- a/OfflinePlusAddPattern_Async.cs +++ b/OfflinePlusAddPattern_Async.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.ComponentModel; +using System.ComponentModel.DataAnnotations; using GrapeCity.Forguncy.Commands; using GrapeCity.Forguncy.Plugin; @@ -21,6 +22,12 @@ namespace AndroidPDACommand [FormulaProperty] public object Description { get; set; } + [Required] + [FormulaProperty] + [DisplayName("版本号")] + [Description("同一项目编号下的表单定义版本，用于区分表单结构变更。")] + public string SchemaVersion { get; set; } = "1.0"; + [DisplayName("表单项")] [ObjectListProperty(ItemType = typeof(OfflineFormItem))] public List FormItems { get; set; } @@ -107,4 +114,4 @@ namespace AndroidPDACommand [DisplayName("显示文本")] public object Label { get; set; } } -} \ No newline at end of file +} diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index 0eb19e1..dd474d9 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2610,6 +2610,7 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { let patternParam = { ticket: _ticket, patternId: this.evaluateFormula(params.PatternId), + schemaVersion: this.evaluateFormula(params.SchemaVersion), title: this.evaluateFormula(params.Title), description: this.evaluateFormula(params.Description), formItems: params.FormItems -- Gitee From eabb098ab7c0b0240a71fc83672644afc50329b5 Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Mon, 8 Jun 2026 11:47:44 +0800 Subject: [PATCH 03/20] feat(offline): support stepped form schema Replace the flat offline FormItems command model with a Steps list so each offline pattern can describe multiple pages or tabs. Add tree-backed offline form nodes for step content. Nodes can represent collapsible groups, static text, or leaf field items; designer property visibility now follows the selected node type and field item type. Update the HAC command runtime serializer to emit the new steps JSON shape, evaluate nested formula-backed fields, serialize validation/options data, and keep field/text nodes as leaf output structures. --- OfflinePlusAddPattern_Async.cs | 81 ++++++++++++++++++++-- Resources/AndroidPDACommand.js | 121 ++++++++++++++++++++++++++++++++- 2 files changed, 195 insertions(+), 7 deletions(-) diff --git a/OfflinePlusAddPattern_Async.cs b/OfflinePlusAddPattern_Async.cs index af41d9c..9cbc110 100644 --- a/OfflinePlusAddPattern_Async.cs +++ b/OfflinePlusAddPattern_Async.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; +using System.Linq; using GrapeCity.Forguncy.Commands; using GrapeCity.Forguncy.Plugin; @@ -28,9 +29,9 @@ namespace AndroidPDACommand [Description("同一项目编号下的表单定义版本，用于区分表单结构变更。")] public string SchemaVersion { get; set; } = "1.0"; - [DisplayName("表单项")] - [ObjectListProperty(ItemType = typeof(OfflineFormItem))] - public List FormItems { get; set; } + [DisplayName("步骤")] + [ObjectListProperty(ItemType = typeof(OfflineFormStep))] + public List Steps { get; set; } public override string ToString() { @@ -38,10 +39,43 @@ namespace AndroidPDACommand } } - public class OfflineFormItem : ObjectPropertyBase, INamedObject + public class OfflineFormStep : ObjectPropertyBase, INamedObject { public string Name { get; set; } + [FormulaProperty] + [DisplayName("步骤编号")] + [Description("该步骤的唯一标识，同一个离线表单项目内必须唯一。")] + public object StepId { get; set; } + + [FormulaProperty] + [DisplayName("标题")] + public object Title { get; set; } + + [TreeProperty(NodeType = typeof(OfflineFormNode), DefaultNodeName = "节点")] + [DisplayName("页面内容")] + public List Items { get; set; } = new List(); + } + + public class OfflineFormNode : ObjectPropertyBase, ITreeNode + { + [DisplayName("节点名称")] + public string Text { get; set; } + + [Browsable(false)] + public IEnumerable Children { get; set; } = new List(); + + [DisplayName("节点类型")] + [ComboProperty(ValueList = "group|text|field", DisplayList = "分组|普通文本|表单项")] + public string NodeType { get; set; } = "group"; + + [FormulaProperty] + [DisplayName("说明内容")] + public object Content { get; set; } + + [DisplayName("默认折叠")] + public bool DefaultCollapsed { get; set; } + [FormulaProperty] [DisplayName("编号")] [Description("该表单项的唯一标识，全局唯一，无论是同一项目内，还是跨项目，都必须唯一，更建议使用项目编号作为前缀拼接；例如项目为Project01，则该表单项编号为Project01_Name")] @@ -77,16 +111,51 @@ namespace AndroidPDACommand public override bool GetDesignerPropertyVisible(string propertyName) { + var isField = NodeType == "field"; + var isText = NodeType == "text"; + var isGroup = NodeType == "group"; + switch (propertyName) { + case nameof(Content): + return isText; + case nameof(DefaultCollapsed): + return isGroup; + case nameof(ItemId): + case nameof(ItemType): + case nameof(Title): + case nameof(Hint): + case nameof(Required): + case nameof(Value): + return isField; case nameof(SelectOptionsList): - return ItemType == "selectItem"; + return isField && ItemType == "selectItem"; case nameof(CheckOptions): - return ItemType == "textItem" || ItemType == "passwordItem"; + return isField && (ItemType == "textItem" || ItemType == "passwordItem"); default: return base.GetDesignerPropertyVisible(propertyName); } } + + public override object Clone() + { + return new OfflineFormNode + { + Text = Text, + Children = Children == null ? new List() : Children.ToList(), + NodeType = NodeType, + Content = Content, + DefaultCollapsed = DefaultCollapsed, + ItemId = ItemId, + ItemType = ItemType, + Title = Title, + Hint = Hint, + Required = Required, + Value = Value, + CheckOptions = CheckOptions, + SelectOptionsList = SelectOptionsList + }; + } } public class CheckOptions : ObjectPropertyBase diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index dd474d9..96b794a 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2594,6 +2594,125 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { let params = this.CommandParam; let patternParamJson = ""; + function evaluate(value) { + if (value === undefined || value === null) { + return value; + } + return me.evaluateFormula(value); + } + + function getValue(obj, pascalName, camelName) { + if (!obj) { + return undefined; + } + if (obj[pascalName] !== undefined) { + return obj[pascalName]; + } + return obj[camelName]; + } + + function getList(value) { + return Array.isArray(value) ? value : []; + } + + function buildSelectOptions(options) { + return getList(options).map(function (option) { + return { + value: evaluate(getValue(option, "Value", "value")), + label: evaluate(getValue(option, "Label", "label")) + }; + }); + } + + function buildCheckOptions(options) { + if (!options) { + return undefined; + } + + var checkOptions = {}; + var minLength = evaluate(getValue(options, "MinLength", "minLength")); + var maxLength = evaluate(getValue(options, "MaxLength", "maxLength")); + var regexPattern = evaluate(getValue(options, "RegexPattern", "regexPattern")); + if (minLength !== undefined && minLength !== null && minLength !== "") { + checkOptions.minLength = minLength; + } + if (maxLength !== undefined && maxLength !== null && maxLength !== "") { + checkOptions.maxLength = maxLength; + } + if (regexPattern !== undefined && regexPattern !== null && regexPattern !== "") { + checkOptions.regexPattern = regexPattern; + } + return Object.keys(checkOptions).length > 0 ? checkOptions : undefined; + } + + function buildField(node) { + var field = { + itemId: evaluate(getValue(node, "ItemId", "itemId")), + itemType: getValue(node, "ItemType", "itemType"), + title: evaluate(getValue(node, "Title", "title")), + hint: evaluate(getValue(node, "Hint", "hint")), + required: !!getValue(node, "Required", "required") + }; + + var value = evaluate(getValue(node, "Value", "value")); + var checkOptions = buildCheckOptions(getValue(node, "CheckOptions", "checkOptions")); + var selectOptions = buildSelectOptions(getValue(node, "SelectOptionsList", "selectOptionsList")); + + if (value !== undefined && value !== null && value !== "") { + field.value = value; + } + if (checkOptions) { + field.checkOptions = checkOptions; + } + if (selectOptions.length > 0) { + field.options = selectOptions; + } + return field; + } + + function buildNodes(nodes) { + return getList(nodes).map(function (node) { + var nodeType = getValue(node, "NodeType", "nodeType") || "group"; + var children = getList(getValue(node, "Children", "children")); + + if (nodeType !== "group" && children.length > 0) { + console.warn("离线表单节点不是分组，但包含子节点。", node); + } + + if (nodeType === "field") { + return { + nodeType: "field", + field: buildField(node) + }; + } + + if (nodeType === "text") { + return { + nodeType: "text", + title: getValue(node, "Text", "text"), + content: evaluate(getValue(node, "Content", "content")) + }; + } + + return { + nodeType: "group", + title: getValue(node, "Text", "text"), + defaultCollapsed: !!getValue(node, "DefaultCollapsed", "defaultCollapsed"), + children: buildNodes(children) + }; + }); + } + + function buildSteps(steps) { + return getList(steps).map(function (step) { + return { + stepId: evaluate(getValue(step, "StepId", "stepId")), + title: evaluate(getValue(step, "Title", "title")), + items: buildNodes(getValue(step, "Items", "items")) + }; + }); + } + let _ticket = HAC_GenerateCallbackTicket(me, function (payload, payload2) { alert("离线表单项目设置成功\r\n\r\nJSON Schema：\r\n" + patternParamJson); me.CommandExecutor.excuteCommand(me.CommandParam.CommandList, { @@ -2613,7 +2732,7 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { schemaVersion: this.evaluateFormula(params.SchemaVersion), title: this.evaluateFormula(params.Title), description: this.evaluateFormula(params.Description), - formItems: params.FormItems + steps: buildSteps(params.Steps) }; patternParamJson = JSON.stringify(patternParam, null, 2); -- Gitee From 8631f8d7c29cca8e9b6828a1cdcd5faa681a1ecb Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Mon, 8 Jun 2026 15:18:23 +0800 Subject: [PATCH 04/20] refactor: simplify value retrieval in OfflinePlusAddPattern_Async_Command --- Resources/AndroidPDACommand.js | 70 +++++++++++++++------------------- 1 file changed, 30 insertions(+), 40 deletions(-) diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index 96b794a..802d9ca 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2366,7 +2366,7 @@ var GenericBroadcast_Stop_Command = (function (_super) { var params = this.CommandParam; var uuid = this.evaluateFormula(params.HandlerID); - + if (window.broadcast && window.broadcast.stopReceiving) { window.broadcast.stopReceiving(uuid); @@ -2447,14 +2447,14 @@ var OnKeyDown_Listen_Start_Async_Command = (function (_super) { locationString: "执行window.onKeyDownListen.startOnKeyDownListenAsync的回调" }); }); - + if (window.onKeyDownListen && window.onKeyDownListen.startOnKeyDownListenAsync) { window.onKeyDownListen.startOnKeyDownListenAsync(ticket, theKey, isCover); } else { HAC_CallFunctionOutOfHAC(); } } - + return OnKeyDown_Listen_Start_Async_Command; }(Forguncy.CommandBase)); @@ -2470,14 +2470,14 @@ var OnKeyDown_Listen_Stop_Command = (function (_super) { var params = this.CommandParam; var theKey = this.evaluateFormula(params.TheKey); - + if (window.onKeyDownListen && window.onKeyDownListen.stopOnKeyDownListen) { window.onKeyDownListen.stopOnKeyDownListen(theKey); } else { HAC_CallFunctionOutOfHAC(); } }; - + return OnKeyDown_Listen_Stop_Command; }(Forguncy.CommandBase)); @@ -2601,16 +2601,6 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { return me.evaluateFormula(value); } - function getValue(obj, pascalName, camelName) { - if (!obj) { - return undefined; - } - if (obj[pascalName] !== undefined) { - return obj[pascalName]; - } - return obj[camelName]; - } - function getList(value) { return Array.isArray(value) ? value : []; } @@ -2618,8 +2608,8 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { function buildSelectOptions(options) { return getList(options).map(function (option) { return { - value: evaluate(getValue(option, "Value", "value")), - label: evaluate(getValue(option, "Label", "label")) + value: evaluate(option.Value), + label: evaluate(option.Label) }; }); } @@ -2630,9 +2620,9 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { } var checkOptions = {}; - var minLength = evaluate(getValue(options, "MinLength", "minLength")); - var maxLength = evaluate(getValue(options, "MaxLength", "maxLength")); - var regexPattern = evaluate(getValue(options, "RegexPattern", "regexPattern")); + var minLength = evaluate(options.MinLength); + var maxLength = evaluate(options.MaxLength); + var regexPattern = evaluate(options.RegexPattern); if (minLength !== undefined && minLength !== null && minLength !== "") { checkOptions.minLength = minLength; } @@ -2647,16 +2637,16 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { function buildField(node) { var field = { - itemId: evaluate(getValue(node, "ItemId", "itemId")), - itemType: getValue(node, "ItemType", "itemType"), - title: evaluate(getValue(node, "Title", "title")), - hint: evaluate(getValue(node, "Hint", "hint")), - required: !!getValue(node, "Required", "required") + itemId: evaluate(node.ItemId), + itemType: node.ItemType, + title: evaluate(node.Title), + hint: evaluate(node.Hint), + required: !!node.Required }; - var value = evaluate(getValue(node, "Value", "value")); - var checkOptions = buildCheckOptions(getValue(node, "CheckOptions", "checkOptions")); - var selectOptions = buildSelectOptions(getValue(node, "SelectOptionsList", "selectOptionsList")); + var value = evaluate(node.Value); + var checkOptions = buildCheckOptions(node.CheckOptions); + var selectOptions = buildSelectOptions(node.SelectOptionsList); if (value !== undefined && value !== null && value !== "") { field.value = value; @@ -2672,8 +2662,8 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { function buildNodes(nodes) { return getList(nodes).map(function (node) { - var nodeType = getValue(node, "NodeType", "nodeType") || "group"; - var children = getList(getValue(node, "Children", "children")); + var nodeType = node.NodeType || "group"; + var children = getList(node.Children); if (nodeType !== "group" && children.length > 0) { console.warn("离线表单节点不是分组，但包含子节点。", node); @@ -2689,15 +2679,15 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { if (nodeType === "text") { return { nodeType: "text", - title: getValue(node, "Text", "text"), - content: evaluate(getValue(node, "Content", "content")) + title: node.Text, + content: evaluate(node.Content) }; } return { nodeType: "group", - title: getValue(node, "Text", "text"), - defaultCollapsed: !!getValue(node, "DefaultCollapsed", "defaultCollapsed"), + title: node.Text, + defaultCollapsed: !!node.DefaultCollapsed, children: buildNodes(children) }; }); @@ -2706,9 +2696,9 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { function buildSteps(steps) { return getList(steps).map(function (step) { return { - stepId: evaluate(getValue(step, "StepId", "stepId")), - title: evaluate(getValue(step, "Title", "title")), - items: buildNodes(getValue(step, "Items", "items")) + stepId: evaluate(step.StepId), + title: evaluate(step.Title), + items: buildNodes(step.Items) }; }); } @@ -2725,20 +2715,20 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { locationString: "执行window.offlinePlus.offlinePlusAddPattern" }); }, HAC_GetOfflinePlusDebugInfo("添加离线表单项目", "生成回调ticket")); - + const steps = buildSteps(params.Steps); let patternParam = { ticket: _ticket, patternId: this.evaluateFormula(params.PatternId), schemaVersion: this.evaluateFormula(params.SchemaVersion), title: this.evaluateFormula(params.Title), description: this.evaluateFormula(params.Description), - steps: buildSteps(params.Steps) + steps: steps }; patternParamJson = JSON.stringify(patternParam, null, 2); console.log(patternParam); if (window.offlinePlus && window.offlinePlus.offlinePlusAddPatternAsync) { - + window.offlinePlus.offlinePlusAddPatternAsync(patternParamJson); } else { HAC_CallFunctionOutOfHAC(HAC_GetOfflinePlusDebugInfo("添加离线表单项目", "调用offlinePlusAddPatternAsync")); -- Gitee From 20c8c8e95d3d892f205abf5dbc488bde7b0d36f3 Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Thu, 11 Jun 2026 10:37:57 +0800 Subject: [PATCH 05/20] =?UTF-8?q?feat(offline-form):=20=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=97=B6=E9=97=B4=E5=9B=BE=E7=89=87=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E9=A1=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 本次提交补齐离线填报新增表单项在活字格插件侧的配置生成能力，使命令设计器能够产出 Android 端已支持的 datePicker、timePicker 和 imageItem schema。 OfflinePlusAddPattern_Async.cs：扩展离线表单项类型下拉选项，新增 datePicker、timePicker、imageItem；为 imageItem 增加最大图片数量和压缩参数配置；按表单项类型控制属性面板显示，避免选择框、校验项、图片配置在不适用的类型上暴露。 Resources/AndroidPDACommand.js：生成离线表单 JSON 时按 itemType 输出类型专属字段；textItem/passwordItem 只输出 checkOptions，selectItem 只输出 options，imageItem 输出 maxCount 与 compression，并保持 Android 端需要的小驼峰字段名。 验证：已执行 git diff --check；已执行 node --check Resources\\AndroidPDACommand.js；已执行 dotnet build AndroidPDACommand.sln --no-restore，结果 0 Warning(s)、0 Error(s)。 --- OfflinePlusAddPattern_Async.cs | 40 +++++++++++++++++++++++++++++++--- Resources/AndroidPDACommand.js | 37 +++++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 5 deletions(-) diff --git a/OfflinePlusAddPattern_Async.cs b/OfflinePlusAddPattern_Async.cs index 9cbc110..a196909 100644 --- a/OfflinePlusAddPattern_Async.cs +++ b/OfflinePlusAddPattern_Async.cs @@ -82,7 +82,7 @@ namespace AndroidPDACommand public object ItemId { get; set; } [DisplayName("类型")] - [ComboProperty(ValueList = "textItem|passwordItem|selectItem", DisplayList = "文本框|密码框|选择框")] + [ComboProperty(ValueList = "textItem|passwordItem|selectItem|datePicker|timePicker|imageItem", DisplayList = "文本框|密码框|选择框|日期选择|时间选择|图片列表")] public string ItemType { get; set; } = "textItem"; [FormulaProperty] @@ -109,6 +109,14 @@ namespace AndroidPDACommand [DisplayName("选则项")] public List SelectOptionsList { get; set; } + [FormulaProperty] + [DisplayName("图片最大数量")] + public object MaxCount { get; set; } = 9; + + [ObjectProperty(ObjType = typeof(ImageCompressionOptions))] + [DisplayName("图片压缩设置")] + public ImageCompressionOptions CompressionOptions { get; set; } = new ImageCompressionOptions(); + public override bool GetDesignerPropertyVisible(string propertyName) { var isField = NodeType == "field"; @@ -126,12 +134,16 @@ namespace AndroidPDACommand case nameof(Title): case nameof(Hint): case nameof(Required): - case nameof(Value): return isField; + case nameof(Value): + return isField && ItemType != "imageItem"; case nameof(SelectOptionsList): return isField && ItemType == "selectItem"; case nameof(CheckOptions): return isField && (ItemType == "textItem" || ItemType == "passwordItem"); + case nameof(MaxCount): + case nameof(CompressionOptions): + return isField && ItemType == "imageItem"; default: return base.GetDesignerPropertyVisible(propertyName); } @@ -153,7 +165,9 @@ namespace AndroidPDACommand Required = Required, Value = Value, CheckOptions = CheckOptions, - SelectOptionsList = SelectOptionsList + SelectOptionsList = SelectOptionsList, + MaxCount = MaxCount, + CompressionOptions = CompressionOptions }; } } @@ -183,4 +197,24 @@ namespace AndroidPDACommand [DisplayName("显示文本")] public object Label { get; set; } } + + public class ImageCompressionOptions : ObjectPropertyBase + { + [FormulaProperty] + [DisplayName("最长边像素")] + public object MaxLongEdge { get; set; } = 1600; + + [FormulaProperty] + [DisplayName("JPEG质量")] + public object JpegQuality { get; set; } = 80; + + [FormulaProperty] + [DisplayName("目标大小KB")] + [Description("0表示不按文件大小继续压缩。")] + public object MaxFileSizeKb { get; set; } = 0; + + [FormulaProperty] + [DisplayName("最低JPEG质量")] + public object MinQuality { get; set; } = 60; + } } diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index 802d9ca..59ae86b 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2635,6 +2635,31 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { return Object.keys(checkOptions).length > 0 ? checkOptions : undefined; } + function buildImageCompression(options) { + if (!options) { + return undefined; + } + + var compression = {}; + var maxLongEdge = evaluate(options.MaxLongEdge); + var jpegQuality = evaluate(options.JpegQuality); + var maxFileSizeKb = evaluate(options.MaxFileSizeKb); + var minQuality = evaluate(options.MinQuality); + if (maxLongEdge !== undefined && maxLongEdge !== null && maxLongEdge !== "") { + compression.maxLongEdge = maxLongEdge; + } + if (jpegQuality !== undefined && jpegQuality !== null && jpegQuality !== "") { + compression.jpegQuality = jpegQuality; + } + if (maxFileSizeKb !== undefined && maxFileSizeKb !== null && maxFileSizeKb !== "") { + compression.maxFileSizeKb = maxFileSizeKb; + } + if (minQuality !== undefined && minQuality !== null && minQuality !== "") { + compression.minQuality = minQuality; + } + return Object.keys(compression).length > 0 ? compression : undefined; + } + function buildField(node) { var field = { itemId: evaluate(node.ItemId), @@ -2645,8 +2670,10 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { }; var value = evaluate(node.Value); - var checkOptions = buildCheckOptions(node.CheckOptions); - var selectOptions = buildSelectOptions(node.SelectOptionsList); + var checkOptions = node.ItemType === "textItem" || node.ItemType === "passwordItem" ? buildCheckOptions(node.CheckOptions) : undefined; + var selectOptions = node.ItemType === "selectItem" ? buildSelectOptions(node.SelectOptionsList) : []; + var maxCount = node.ItemType === "imageItem" ? evaluate(node.MaxCount) : undefined; + var compression = node.ItemType === "imageItem" ? buildImageCompression(node.CompressionOptions) : undefined; if (value !== undefined && value !== null && value !== "") { field.value = value; @@ -2657,6 +2684,12 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { if (selectOptions.length > 0) { field.options = selectOptions; } + if (maxCount !== undefined && maxCount !== null && maxCount !== "") { + field.maxCount = maxCount; + } + if (compression) { + field.compression = compression; + } return field; } -- Gitee From 831ac11ec1501de6815ddab4a1c189a6a002b443 Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Thu, 11 Jun 2026 15:25:18 +0800 Subject: [PATCH 06/20] feat(offline): add title property to field node in OfflinePlusAddPattern_Async_Command --- Resources/AndroidPDACommand.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index 59ae86b..44b0882 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2705,6 +2705,7 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { if (nodeType === "field") { return { nodeType: "field", + title: node.Text, field: buildField(node) }; } -- Gitee From 0d491fdb985041384a0b4ea7020cc421f86d57bf Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Thu, 11 Jun 2026 16:31:23 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E7=A7=92?= =?UTF-8?q?=E6=95=B0=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OfflinePlusAddPattern_Async.cs：在时间选择字段上增加包含秒配置，并用字段类型到属性集合的映射统一控制各表单类型可见属性，减少 AndroidPDACommand.js 与设计器属性可见性之间继续堆 if/else 的成本，同时保持 OfflineFormNode 属性平铺。 Resources/AndroidPDACommand.js：用 fieldTypeSpecs 按表单类型集中生成专属 JSON 属性，让 timePicker 仅在启用包含秒时输出 includeSeconds，同时保留文本、密码、选择和图片字段原有配置输出规则。 --- OfflinePlusAddPattern_Async.cs | 73 +++++++++++++++++++++++++++------- Resources/AndroidPDACommand.js | 71 +++++++++++++++++++++++++-------- 2 files changed, 112 insertions(+), 32 deletions(-) diff --git a/OfflinePlusAddPattern_Async.cs b/OfflinePlusAddPattern_Async.cs index a196909..87c9cfc 100644 --- a/OfflinePlusAddPattern_Async.cs +++ b/OfflinePlusAddPattern_Async.cs @@ -59,6 +59,35 @@ namespace AndroidPDACommand public class OfflineFormNode : ObjectPropertyBase, ITreeNode { + private static readonly string[] CommonFieldVisibleProperties = + { + nameof(ItemId), + nameof(ItemType), + nameof(Title), + nameof(Hint), + nameof(Required) + }; + + private static readonly HashSet FieldTypeControlledProperties = new HashSet(CommonFieldVisibleProperties) + { + nameof(Value), + nameof(CheckOptions), + nameof(SelectOptionsList), + nameof(IncludeSeconds), + nameof(MaxCount), + nameof(CompressionOptions) + }; + + private static readonly Dictionary> FieldVisiblePropertiesByType = new Dictionary> + { + { "textItem", CreateFieldVisibleProperties(nameof(Value), nameof(CheckOptions)) }, + { "passwordItem", CreateFieldVisibleProperties(nameof(Value), nameof(CheckOptions)) }, + { "selectItem", CreateFieldVisibleProperties(nameof(Value), nameof(SelectOptionsList)) }, + { "datePicker", CreateFieldVisibleProperties(nameof(Value)) }, + { "timePicker", CreateFieldVisibleProperties(nameof(Value), nameof(IncludeSeconds)) }, + { "imageItem", CreateFieldVisibleProperties(nameof(MaxCount), nameof(CompressionOptions)) } + }; + [DisplayName("节点名称")] public string Text { get; set; } @@ -99,6 +128,10 @@ namespace AndroidPDACommand [FormulaProperty] [DisplayName("默认值")] public object Value { get; set; } + + [DisplayName("包含秒")] + [Description("仅时间选择类型生效。启用后可选择时分秒；关闭时使用系统原生时分选择器。")] + public bool IncludeSeconds { get; set; } [ObjectProperty(ObjType = typeof(CheckOptions))] @@ -129,22 +162,11 @@ namespace AndroidPDACommand return isText; case nameof(DefaultCollapsed): return isGroup; - case nameof(ItemId): - case nameof(ItemType): - case nameof(Title): - case nameof(Hint): - case nameof(Required): - return isField; - case nameof(Value): - return isField && ItemType != "imageItem"; - case nameof(SelectOptionsList): - return isField && ItemType == "selectItem"; - case nameof(CheckOptions): - return isField && (ItemType == "textItem" || ItemType == "passwordItem"); - case nameof(MaxCount): - case nameof(CompressionOptions): - return isField && ItemType == "imageItem"; default: + if (isField && FieldTypeControlledProperties.Contains(propertyName)) + { + return IsFieldPropertyVisible(ItemType, propertyName); + } return base.GetDesignerPropertyVisible(propertyName); } } @@ -164,12 +186,33 @@ namespace AndroidPDACommand Hint = Hint, Required = Required, Value = Value, + IncludeSeconds = IncludeSeconds, CheckOptions = CheckOptions, SelectOptionsList = SelectOptionsList, MaxCount = MaxCount, CompressionOptions = CompressionOptions }; } + + private static HashSet CreateFieldVisibleProperties(params string[] propertyNames) + { + var visibleProperties = new HashSet(CommonFieldVisibleProperties); + foreach (var propertyName in propertyNames) + { + visibleProperties.Add(propertyName); + } + return visibleProperties; + } + + private static bool IsFieldPropertyVisible(string itemType, string propertyName) + { + HashSet visibleProperties; + if (!FieldVisiblePropertiesByType.TryGetValue(itemType ?? "textItem", out visibleProperties)) + { + visibleProperties = FieldVisiblePropertiesByType["textItem"]; + } + return visibleProperties.Contains(propertyName); + } } public class CheckOptions : ObjectPropertyBase diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index 44b0882..64321d4 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2660,6 +2660,59 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { return Object.keys(compression).length > 0 ? compression : undefined; } + var fieldTypeSpecs = { + textItem: { + apply: function (field, node) { + var checkOptions = buildCheckOptions(node.CheckOptions); + if (checkOptions) { + field.checkOptions = checkOptions; + } + } + }, + passwordItem: { + apply: function (field, node) { + var checkOptions = buildCheckOptions(node.CheckOptions); + if (checkOptions) { + field.checkOptions = checkOptions; + } + } + }, + selectItem: { + apply: function (field, node) { + var selectOptions = buildSelectOptions(node.SelectOptionsList); + if (selectOptions.length > 0) { + field.options = selectOptions; + } + } + }, + timePicker: { + apply: function (field, node) { + if (node.IncludeSeconds) { + field.includeSeconds = true; + } + } + }, + imageItem: { + apply: function (field, node) { + var maxCount = evaluate(node.MaxCount); + var compression = buildImageCompression(node.CompressionOptions); + if (maxCount !== undefined && maxCount !== null && maxCount !== "") { + field.maxCount = maxCount; + } + if (compression) { + field.compression = compression; + } + } + } + }; + + function applyFieldTypeSpec(field, node) { + var spec = fieldTypeSpecs[node.ItemType]; + if (spec && spec.apply) { + spec.apply(field, node); + } + } + function buildField(node) { var field = { itemId: evaluate(node.ItemId), @@ -2670,26 +2723,10 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { }; var value = evaluate(node.Value); - var checkOptions = node.ItemType === "textItem" || node.ItemType === "passwordItem" ? buildCheckOptions(node.CheckOptions) : undefined; - var selectOptions = node.ItemType === "selectItem" ? buildSelectOptions(node.SelectOptionsList) : []; - var maxCount = node.ItemType === "imageItem" ? evaluate(node.MaxCount) : undefined; - var compression = node.ItemType === "imageItem" ? buildImageCompression(node.CompressionOptions) : undefined; - if (value !== undefined && value !== null && value !== "") { field.value = value; } - if (checkOptions) { - field.checkOptions = checkOptions; - } - if (selectOptions.length > 0) { - field.options = selectOptions; - } - if (maxCount !== undefined && maxCount !== null && maxCount !== "") { - field.maxCount = maxCount; - } - if (compression) { - field.compression = compression; - } + applyFieldTypeSpec(field, node); return field; } -- Gitee From 28672e4cdf76f72b6b14114b736e38ee8859437d Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Fri, 12 Jun 2026 11:39:12 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=88=97=E8=A1=A8=E8=AE=BE=E8=AE=A1=E6=97=B6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OfflinePlusAddPattern_Async.cs：在图片列表表单项中补充允许图片上传、图片压缩开关和拍照水印配置，使设计器能够按图片项展示这些配置；新增拍照水印配置对象和自定义字段列表，默认提供用户名、姓名两个字段，并把这些属性纳入克隆逻辑，避免设计器复制节点时丢失配置。 Resources/AndroidPDACommand.js：在生成离线表单 JSON 时输出 allowImageUpload、compression.enableCompression 和 watermark 配置；watermark 使用 enableTimestamp 与 key/value 字段列表，供 Android 端后续按字段顺序用横线拼接生成拍照水印。 --- OfflinePlusAddPattern_Async.cs | 46 +++++++++++++++++++++++++++++++--- Resources/AndroidPDACommand.js | 32 +++++++++++++++++++++++ 2 files changed, 75 insertions(+), 3 deletions(-) diff --git a/OfflinePlusAddPattern_Async.cs b/OfflinePlusAddPattern_Async.cs index 87c9cfc..f0e9034 100644 --- a/OfflinePlusAddPattern_Async.cs +++ b/OfflinePlusAddPattern_Async.cs @@ -75,7 +75,9 @@ namespace AndroidPDACommand nameof(SelectOptionsList), nameof(IncludeSeconds), nameof(MaxCount), - nameof(CompressionOptions) + nameof(AllowImageUpload), + nameof(CompressionOptions), + nameof(WatermarkOptions) }; private static readonly Dictionary> FieldVisiblePropertiesByType = new Dictionary> @@ -85,7 +87,7 @@ namespace AndroidPDACommand { "selectItem", CreateFieldVisibleProperties(nameof(Value), nameof(SelectOptionsList)) }, { "datePicker", CreateFieldVisibleProperties(nameof(Value)) }, { "timePicker", CreateFieldVisibleProperties(nameof(Value), nameof(IncludeSeconds)) }, - { "imageItem", CreateFieldVisibleProperties(nameof(MaxCount), nameof(CompressionOptions)) } + { "imageItem", CreateFieldVisibleProperties(nameof(MaxCount), nameof(AllowImageUpload), nameof(CompressionOptions), nameof(WatermarkOptions)) } }; [DisplayName("节点名称")] @@ -146,10 +148,18 @@ namespace AndroidPDACommand [DisplayName("图片最大数量")] public object MaxCount { get; set; } = 9; + [DisplayName("允许图片上传")] + [Description("仅图片列表类型生效。启用后填报时除拍照外还可以从本地选择图片。")] + public bool AllowImageUpload { get; set; } + [ObjectProperty(ObjType = typeof(ImageCompressionOptions))] [DisplayName("图片压缩设置")] public ImageCompressionOptions CompressionOptions { get; set; } = new ImageCompressionOptions(); + [ObjectProperty(ObjType = typeof(ImageWatermarkOptions))] + [DisplayName("拍照水印配置")] + public ImageWatermarkOptions WatermarkOptions { get; set; } = new ImageWatermarkOptions(); + public override bool GetDesignerPropertyVisible(string propertyName) { var isField = NodeType == "field"; @@ -190,7 +200,9 @@ namespace AndroidPDACommand CheckOptions = CheckOptions, SelectOptionsList = SelectOptionsList, MaxCount = MaxCount, - CompressionOptions = CompressionOptions + AllowImageUpload = AllowImageUpload, + CompressionOptions = CompressionOptions, + WatermarkOptions = WatermarkOptions }; } @@ -243,6 +255,10 @@ namespace AndroidPDACommand public class ImageCompressionOptions : ObjectPropertyBase { + [DisplayName("启用压缩")] + [Description("默认关闭，关闭时按原图保存。启用后才使用下面的压缩参数。")] + public bool EnableCompression { get; set; } + [FormulaProperty] [DisplayName("最长边像素")] public object MaxLongEdge { get; set; } = 1600; @@ -260,4 +276,28 @@ namespace AndroidPDACommand [DisplayName("最低JPEG质量")] public object MinQuality { get; set; } = 60; } + + public class ImageWatermarkOptions : ObjectPropertyBase + { + [DisplayName("时间戳水印")] + public bool EnableTimestamp { get; set; } = true; + + [ListProperty] + [DisplayName("自定义字段")] + public List Fields { get; set; } = new List + { + new ImageWatermarkField { Key = "用户名", Value = "用户名" }, + new ImageWatermarkField { Key = "姓名", Value = "姓名" } + }; + } + + public class ImageWatermarkField : ObjectPropertyBase + { + [DisplayName("Key")] + public string Key { get; set; } + + [FormulaProperty] + [DisplayName("Value")] + public object Value { get; set; } + } } diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index 64321d4..330ecbb 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2645,6 +2645,7 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { var jpegQuality = evaluate(options.JpegQuality); var maxFileSizeKb = evaluate(options.MaxFileSizeKb); var minQuality = evaluate(options.MinQuality); + compression.enableCompression = !!options.EnableCompression; if (maxLongEdge !== undefined && maxLongEdge !== null && maxLongEdge !== "") { compression.maxLongEdge = maxLongEdge; } @@ -2660,6 +2661,30 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { return Object.keys(compression).length > 0 ? compression : undefined; } + function buildImageWatermark(options) { + if (!options) { + return undefined; + } + + var watermark = {}; + var items = getList(options.Fields).map(function (field) { + return { + key: field.Key, + value: evaluate(field.Value) + }; + }).filter(function (field) { + return field.value !== undefined && field.value !== null && field.value !== ""; + }); + + if (options.EnableTimestamp) { + watermark.enableTimestamp = true; + } + if (items.length > 0) { + watermark.items = items; + } + return Object.keys(watermark).length > 0 ? watermark : undefined; + } + var fieldTypeSpecs = { textItem: { apply: function (field, node) { @@ -2696,12 +2721,19 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { apply: function (field, node) { var maxCount = evaluate(node.MaxCount); var compression = buildImageCompression(node.CompressionOptions); + var watermark = buildImageWatermark(node.WatermarkOptions); if (maxCount !== undefined && maxCount !== null && maxCount !== "") { field.maxCount = maxCount; } + if (node.AllowImageUpload) { + field.allowImageUpload = true; + } if (compression) { field.compression = compression; } + if (watermark) { + field.watermark = watermark; + } } } }; -- Gitee From 76a8c8f3f2e738fcb398df38c556c10882ea74f4 Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Fri, 12 Jun 2026 12:05:23 +0800 Subject: [PATCH 09/20] feat(watermark): disable timestamp by default and update field handling logic --- OfflinePlusAddPattern_Async.cs | 4 +--- Resources/AndroidPDACommand.js | 9 ++++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/OfflinePlusAddPattern_Async.cs b/OfflinePlusAddPattern_Async.cs index f0e9034..08b1ee2 100644 --- a/OfflinePlusAddPattern_Async.cs +++ b/OfflinePlusAddPattern_Async.cs @@ -280,14 +280,12 @@ namespace AndroidPDACommand public class ImageWatermarkOptions : ObjectPropertyBase { [DisplayName("时间戳水印")] - public bool EnableTimestamp { get; set; } = true; + public bool EnableTimestamp { get; set; } = false; [ListProperty] [DisplayName("自定义字段")] public List Fields { get; set; } = new List { - new ImageWatermarkField { Key = "用户名", Value = "用户名" }, - new ImageWatermarkField { Key = "姓名", Value = "姓名" } }; } diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index 330ecbb..762e79e 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2666,14 +2666,17 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { return undefined; } + var fields = getList(options.Fields); + if (!options.EnableTimestamp && fields.length === 0) { + return undefined; + } + var watermark = {}; - var items = getList(options.Fields).map(function (field) { + var items = fields.map(function (field) { return { key: field.Key, value: evaluate(field.Value) }; - }).filter(function (field) { - return field.value !== undefined && field.value !== null && field.value !== ""; }); if (options.EnableTimestamp) { -- Gitee From fa1641062a7419d6a3bd46e8d9cef45ae2dda5d2 Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Fri, 12 Jun 2026 17:45:19 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E8=AE=BE=E8=AE=A1=E6=97=B6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OfflinePlusAddPattern_Async.cs：在离线表单节点类型中增加 fileItem，并新增 FileItemConfig 配置对象，让设计时可以配置最大数量、允许扩展名和单文件大小限制；同时把文件上传配置纳入字段类型属性可见性控制，只在 fileItem 类型下显示。 Resources/AndroidPDACommand.js：为 fileItem 增加运行时 JSON 输出逻辑，将设计时 FileItemConfig 转换成 field.fileItemConfig；扩展名字符串按用户输入原样输出，Android 运行时再根据扩展名做选择器 MIME 推断和保存前校验。 --- OfflinePlusAddPattern_Async.cs | 33 +++++++++++++++++++++++++++++---- Resources/AndroidPDACommand.js | 29 +++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 4 deletions(-) diff --git a/OfflinePlusAddPattern_Async.cs b/OfflinePlusAddPattern_Async.cs index 08b1ee2..f791b8b 100644 --- a/OfflinePlusAddPattern_Async.cs +++ b/OfflinePlusAddPattern_Async.cs @@ -77,7 +77,8 @@ namespace AndroidPDACommand nameof(MaxCount), nameof(AllowImageUpload), nameof(CompressionOptions), - nameof(WatermarkOptions) + nameof(WatermarkOptions), + nameof(FileItemConfig) }; private static readonly Dictionary> FieldVisiblePropertiesByType = new Dictionary> @@ -87,7 +88,8 @@ namespace AndroidPDACommand { "selectItem", CreateFieldVisibleProperties(nameof(Value), nameof(SelectOptionsList)) }, { "datePicker", CreateFieldVisibleProperties(nameof(Value)) }, { "timePicker", CreateFieldVisibleProperties(nameof(Value), nameof(IncludeSeconds)) }, - { "imageItem", CreateFieldVisibleProperties(nameof(MaxCount), nameof(AllowImageUpload), nameof(CompressionOptions), nameof(WatermarkOptions)) } + { "imageItem", CreateFieldVisibleProperties(nameof(MaxCount), nameof(AllowImageUpload), nameof(CompressionOptions), nameof(WatermarkOptions)) }, + { "fileItem", CreateFieldVisibleProperties(nameof(FileItemConfig)) } }; [DisplayName("节点名称")] @@ -113,7 +115,7 @@ namespace AndroidPDACommand public object ItemId { get; set; } [DisplayName("类型")] - [ComboProperty(ValueList = "textItem|passwordItem|selectItem|datePicker|timePicker|imageItem", DisplayList = "文本框|密码框|选择框|日期选择|时间选择|图片列表")] + [ComboProperty(ValueList = "textItem|passwordItem|selectItem|datePicker|timePicker|imageItem|fileItem", DisplayList = "文本框|密码框|选择框|日期选择|时间选择|图片列表|文件上传")] public string ItemType { get; set; } = "textItem"; [FormulaProperty] @@ -160,6 +162,10 @@ namespace AndroidPDACommand [DisplayName("拍照水印配置")] public ImageWatermarkOptions WatermarkOptions { get; set; } = new ImageWatermarkOptions(); + [ObjectProperty(ObjType = typeof(FileItemConfig))] + [DisplayName("文件上传配置")] + public FileItemConfig FileItemConfig { get; set; } = new FileItemConfig(); + public override bool GetDesignerPropertyVisible(string propertyName) { var isField = NodeType == "field"; @@ -202,7 +208,8 @@ namespace AndroidPDACommand MaxCount = MaxCount, AllowImageUpload = AllowImageUpload, CompressionOptions = CompressionOptions, - WatermarkOptions = WatermarkOptions + WatermarkOptions = WatermarkOptions, + FileItemConfig = FileItemConfig }; } @@ -298,4 +305,22 @@ namespace AndroidPDACommand [DisplayName("Value")] public object Value { get; set; } } + + public class FileItemConfig : ObjectPropertyBase + { + [FormulaProperty] + [DisplayName("最大数量")] + [Description("0表示不限制上传文件数量。")] + public object MaxCount { get; set; } = 0; + + [FormulaProperty] + [DisplayName("允许扩展名")] + [Description("逗号分隔，每个扩展名前带点；留空表示不限制，例如：.pdf,.doc,.docx。")] + public object AllowedExtensions { get; set; } + + [FormulaProperty] + [DisplayName("单文件最大大小KB")] + [Description("0表示不限制单文件大小。")] + public object MaxFileSizeKb { get; set; } = 0; + } } diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index 762e79e..1d82cad 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2688,6 +2688,27 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { return Object.keys(watermark).length > 0 ? watermark : undefined; } + function buildFileItemConfig(options) { + if (!options) { + return undefined; + } + + var config = {}; + var maxCount = evaluate(options.MaxCount); + var allowedExtensions = evaluate(options.AllowedExtensions); + var maxFileSizeKb = evaluate(options.MaxFileSizeKb); + if (maxCount !== undefined && maxCount !== null && maxCount !== "") { + config.maxCount = maxCount; + } + if (allowedExtensions !== undefined && allowedExtensions !== null && allowedExtensions !== "") { + config.allowedExtensions = allowedExtensions; + } + if (maxFileSizeKb !== undefined && maxFileSizeKb !== null && maxFileSizeKb !== "") { + config.maxFileSizeKb = maxFileSizeKb; + } + return Object.keys(config).length > 0 ? config : undefined; + } + var fieldTypeSpecs = { textItem: { apply: function (field, node) { @@ -2738,6 +2759,14 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { field.watermark = watermark; } } + }, + fileItem: { + apply: function (field, node) { + var config = buildFileItemConfig(node.FileItemConfig); + if (config) { + field.fileItemConfig = config; + } + } } }; -- Gitee From fc5e4d7b95280df450abff481eaf62ef8626333c Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Sat, 13 Jun 2026 11:56:04 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=89=8B=E5=86=8C=E4=B8=8E=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=E8=AE=BE=E8=AE=A1=E6=97=B6=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OfflinePlusAddPattern_Async.cs：新增手册附件单元格配置，让设计人员可以指定保存 PDF 手册附件的单元格，后续下载离线表单时可把手册随表单传给安卓端保存。新增员工签名单元格配置，用于接收签名单元格直接产出的 Base64 字符串，使员工签名能跟随离线表单一起下发到离线设备。 Resources/AndroidPDACommand.js：将添加离线表单项目命令改为 async 执行，以便在提交表单定义前先通过手册附件单元格生成下载地址并读取 PDF Base64。保留表单定义 JSON 本身不包含手册和签名内容，改为调用 offlinePlusAddPatternAsync 时把手册 Base64 作为第二个参数、签名 Base64 作为第三个参数传给安卓端，避免把大附件内容拼进 definition JSON。 --- OfflinePlusAddPattern_Async.cs | 10 +++++++ Resources/AndroidPDACommand.js | 53 ++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/OfflinePlusAddPattern_Async.cs b/OfflinePlusAddPattern_Async.cs index f791b8b..16a2886 100644 --- a/OfflinePlusAddPattern_Async.cs +++ b/OfflinePlusAddPattern_Async.cs @@ -29,6 +29,16 @@ namespace AndroidPDACommand [Description("同一项目编号下的表单定义版本，用于区分表单结构变更。")] public string SchemaVersion { get; set; } = "1.0"; + [FormulaProperty] + [DisplayName("手册附件单元格")] + [Description("选择保存 PDF 手册附件的单元格。下载离线表单时会把 PDF 手册随表单一起保存到离线设备。")] + public object ManualAttachmentCell { get; set; } + + [FormulaProperty] + [DisplayName("员工签名单元格")] + [Description("选择保存员工签名附件的单元格。下载离线表单时会把签名文件随表单一起保存到离线设备。")] + public object SignatureAttachmentCell { get; set; } + [DisplayName("步骤")] [ObjectListProperty(ItemType = typeof(OfflineFormStep))] public List Steps { get; set; } diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index 1d82cad..14f71b4 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2588,7 +2588,7 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { return _super !== null && _super.apply(this, arguments) || this; } - OfflinePlusAddPattern_Async_Command.prototype.execute = function () { + OfflinePlusAddPattern_Async_Command.prototype.execute = async function () { let me = this; let params = this.CommandParam; @@ -2838,6 +2838,47 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { }); } + function readBlobAsBase64(blob) { + return new Promise(function (resolve, reject) { + var reader = new FileReader(); + reader.onload = function () { + var dataUrl = reader.result || ""; + var commaIndex = dataUrl.indexOf(","); + resolve(commaIndex >= 0 ? dataUrl.substring(commaIndex + 1) : dataUrl); + }; + reader.onerror = reject; + reader.readAsDataURL(blob); + }); + } + + async function loadManualPdfBase64() { + if (params.ManualAttachmentCell === undefined || params.ManualAttachmentCell === null || params.ManualAttachmentCell === "") { + return undefined; + } + + var manualValue = evaluate(params.ManualAttachmentCell); + if (!manualValue) { + return undefined; + } + + var fileId = (manualValue + "").split("|")[0]; + if (!fileId) { + console.warn("手册附件单元格没有文件标识。", manualValue); + return undefined; + } + + var manualDownloadUrl = Forguncy.Helper.SpecialPath.getFileDownloadUrl(fileId); + var response = await fetch(manualDownloadUrl); + if (!response.ok) { + throw new Error("下载手册 PDF 失败：" + response.status); + } + + var blob = await response.blob(); + var base64 = await readBlobAsBase64(blob); + console.log("Manual PDF Base64", base64); + return base64; + } + let _ticket = HAC_GenerateCallbackTicket(me, function (payload, payload2) { alert("离线表单项目设置成功\r\n\r\nJSON Schema：\r\n" + patternParamJson); me.CommandExecutor.excuteCommand(me.CommandParam.CommandList, { @@ -2859,12 +2900,18 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { description: this.evaluateFormula(params.Description), steps: steps }; + const signatureBase64 = this.evaluateFormula(params.SignatureAttachmentCell); + var manualPdfBase64; + try { + manualPdfBase64 = await loadManualPdfBase64(); + } catch (error) { + console.error("读取手册 PDF Base64 失败：", error); + } patternParamJson = JSON.stringify(patternParam, null, 2); console.log(patternParam); if (window.offlinePlus && window.offlinePlus.offlinePlusAddPatternAsync) { - - window.offlinePlus.offlinePlusAddPatternAsync(patternParamJson); + window.offlinePlus.offlinePlusAddPatternAsync(patternParamJson, manualPdfBase64, signatureBase64); } else { HAC_CallFunctionOutOfHAC(HAC_GetOfflinePlusDebugInfo("添加离线表单项目", "调用offlinePlusAddPatternAsync")); } -- Gitee From 7af7e61a13f00474603d3516c31d1ba7fdd5e934 Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Sat, 13 Jun 2026 12:31:43 +0800 Subject: [PATCH 12/20] refactor(offline-plus): simplify manual PDF handling and improve URL retrieval --- Resources/AndroidPDACommand.js | 39 ++++++---------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index 14f71b4..c7c9dc8 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2838,20 +2838,7 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { }); } - function readBlobAsBase64(blob) { - return new Promise(function (resolve, reject) { - var reader = new FileReader(); - reader.onload = function () { - var dataUrl = reader.result || ""; - var commaIndex = dataUrl.indexOf(","); - resolve(commaIndex >= 0 ? dataUrl.substring(commaIndex + 1) : dataUrl); - }; - reader.onerror = reject; - reader.readAsDataURL(blob); - }); - } - - async function loadManualPdfBase64() { + function getManualPdfUrl() { if (params.ManualAttachmentCell === undefined || params.ManualAttachmentCell === null || params.ManualAttachmentCell === "") { return undefined; } @@ -2867,16 +2854,7 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { return undefined; } - var manualDownloadUrl = Forguncy.Helper.SpecialPath.getFileDownloadUrl(fileId); - var response = await fetch(manualDownloadUrl); - if (!response.ok) { - throw new Error("下载手册 PDF 失败：" + response.status); - } - - var blob = await response.blob(); - var base64 = await readBlobAsBase64(blob); - console.log("Manual PDF Base64", base64); - return base64; + return Forguncy.Helper.SpecialPath.getFileDownloadUrl(fileId); } let _ticket = HAC_GenerateCallbackTicket(me, function (payload, payload2) { @@ -2900,18 +2878,15 @@ var OfflinePlusAddPattern_Async_Command = (function (_super) { description: this.evaluateFormula(params.Description), steps: steps }; - const signatureBase64 = this.evaluateFormula(params.SignatureAttachmentCell); - var manualPdfBase64; - try { - manualPdfBase64 = await loadManualPdfBase64(); - } catch (error) { - console.error("读取手册 PDF Base64 失败：", error); - } + const signatureBase64 = params.SignatureAttachmentCell === undefined || params.SignatureAttachmentCell === null || params.SignatureAttachmentCell === "" + ? "" + : this.evaluateFormula(params.SignatureAttachmentCell); + var manualPdfUrl = getManualPdfUrl(); patternParamJson = JSON.stringify(patternParam, null, 2); console.log(patternParam); if (window.offlinePlus && window.offlinePlus.offlinePlusAddPatternAsync) { - window.offlinePlus.offlinePlusAddPatternAsync(patternParamJson, manualPdfBase64, signatureBase64); + window.offlinePlus.offlinePlusAddPatternAsync(patternParamJson, manualPdfUrl || "", signatureBase64 || ""); } else { HAC_CallFunctionOutOfHAC(HAC_GetOfflinePlusDebugInfo("添加离线表单项目", "调用offlinePlusAddPatternAsync")); } -- Gitee From 2b0f5ca487e7a35a457a1f2cd85a80eacb25846f Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Sat, 13 Jun 2026 15:24:45 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E5=AE=8C=E6=95=B4=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E5=91=BD?= =?UTF-8?q?=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Device_Info_Json.cs：新增读取设备信息命令，作为旧 Device_Info 唯一标识命令的并列新命令，避免改变现有命令的行为和兼容性。 Device_Info_Json.cs：命令结果属性 DeviceInfoJson 使用 ResultToProperty 返回完整设备信息 JSON，设计器显示文案明确包含唯一标识、品牌、型号、Android 版本、APP 版本和 WebView 版本。 Resources/AndroidPDACommand.js：注册 AndroidPDACommand.Device_Info_Json 命令，并按 C# 属性名直接读取 DeviceInfoJson，运行时调用 window.device.getDeviceInfo()，HAC 外环境仍按现有模式返回空字符串。 AndroidPDACommand.csproj：加入 Device_Info_Json.cs 编译项，确保新命令随插件工程一起编译和安装。 --- AndroidPDACommand.csproj | 1 + Device_Info_Json.cs | 27 +++++++++++++++++++++++++++ Resources/AndroidPDACommand.js | 25 +++++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 Device_Info_Json.cs diff --git a/AndroidPDACommand.csproj b/AndroidPDACommand.csproj index 376c9ec..6892606 100644 --- a/AndroidPDACommand.csproj +++ b/AndroidPDACommand.csproj @@ -81,6 +81,7 @@ + diff --git a/Device_Info_Json.cs b/Device_Info_Json.cs new file mode 100644 index 0000000..2c3c05a --- /dev/null +++ b/Device_Info_Json.cs @@ -0,0 +1,27 @@ +using GrapeCity.Forguncy.Commands; +using GrapeCity.Forguncy.Plugin; +using System.ComponentModel; + +namespace AndroidPDACommand +{ + [Icon("pack://application:,,,/AndroidPDACommand;component/Resources/Icon_Phone.png")] + [Category("活字格安卓容器（HAC）")] + [OrderWeight(903)] + public class Device_Info_Json : BaseCommand + { + [DisplayName("将设备信息JSON返回到变量")] + [Description("读取设备唯一标识、品牌、型号、Android版本、APP版本、WebView版本等基础信息。")] + [SearchableProperty] + [ResultToProperty] + public string DeviceInfoJson { get; set; } + + public override string ToString() + { + if (string.IsNullOrEmpty(DeviceInfoJson)) + { + return "读取设备信息"; + } + return "读取设备信息：" + DeviceInfoJson; + } + } +} diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index c7c9dc8..e7f0bbd 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -1405,6 +1405,31 @@ var Device_Info_Command = (function (_super) { Forguncy.CommandFactory.registerCommand("AndroidPDACommand.Device_Info, AndroidPDACommand", Device_Info_Command); +var Device_Info_Json_Command = (function (_super) { + __extends(Device_Info_Json_Command, _super); + function Device_Info_Json_Command() { + return _super !== null && _super.apply(this, arguments) || this; + } + + Device_Info_Json_Command.prototype.execute = function () { + var params = this.CommandParam; + var pName = params.DeviceInfoJson; + + if (window.device && window.device.getDeviceInfo) { + var value = window.device.getDeviceInfo(); + + HAC_ReturnToParam(pName, value); + } else { + HAC_CallFunctionOutOfHAC(); + HAC_ReturnToParam(pName, ""); + } + }; + + return Device_Info_Json_Command; +}(Forguncy.CommandBase)); + +Forguncy.CommandFactory.registerCommand("AndroidPDACommand.Device_Info_Json, AndroidPDACommand", Device_Info_Json_Command); + var BLE_Scan_Command = (function (_super) { __extends(BLE_Scan_Command, _super); function BLE_Scan_Command() { -- Gitee From 501db334a3e7c85ffc1b929ce935098142a710a3 Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Sat, 13 Jun 2026 16:46:40 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=B8=8A=E4=BC=A0=E4=B8=8B=E8=BD=BD=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OfflinePlusAddPattern_Async.cs：仅调整设计器展示名称为“下载离线表单”，保留原 OfflinePlusAddPattern_Async 类名和运行时注册名，使下载动作与上传动作在设计器中形成对应关系。 OfflinePlusGetPatterns_Async.cs：保留原类名作为上传命令入口，将展示名称改为“上传离线表单”；新增动作属性，当前只提供“获取设备上的离线表单项目编号列表”，为后续上传数据、删除记录等 action 预留同一命令入口。 OfflinePlusGetPatterns_Async.cs：将 ProjectsResult 改为设计器可见的结果变量配置，确保项目编号列表 JSON 能由活字格开发人员明确指定返回变量。 Resources/AndroidPDACommand.js：在原 OfflinePlusGetPatterns_Async_Command 内部直接增加 action 判断，不新增额外 helper，不改变原 JS 构造函数名和命令注册名；Android 回调后同时写入 ProjectsResult 变量并保留子命令 initParams。 Resources/AndroidPDACommand.js：调用 window.offlinePlus.offlinePlusGetPatternsAsync(ticket)，与 Android bridge 方法名保持一致，并将诊断文案调整为上传离线表单。 AndroidPDACommand.csproj：新增下载/上传两个离线表单图标资源的嵌入配置，保证设计器命令图标可加载。 Resources/Icon_OfflineDownload.png、Resources/Icon_OfflineUpload.png：新增一组方向相反的离线表单图标，用于表达下载离线表单和上传离线表单的对应关系。 --- AndroidPDACommand.csproj | 2 ++ OfflinePlusAddPattern_Async.cs | 3 ++- OfflinePlusGetPatterns_Async.cs | 18 ++++++++++++------ Resources/AndroidPDACommand.js | 14 ++++++++++---- Resources/Icon_OfflineDownload.png | Bin 0 -> 290 bytes Resources/Icon_OfflineUpload.png | Bin 0 -> 279 bytes 6 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 Resources/Icon_OfflineDownload.png create mode 100644 Resources/Icon_OfflineUpload.png diff --git a/AndroidPDACommand.csproj b/AndroidPDACommand.csproj index 6892606..13b436e 100644 --- a/AndroidPDACommand.csproj +++ b/AndroidPDACommand.csproj @@ -166,6 +166,8 @@ + + diff --git a/OfflinePlusAddPattern_Async.cs b/OfflinePlusAddPattern_Async.cs index 16a2886..308192d 100644 --- a/OfflinePlusAddPattern_Async.cs +++ b/OfflinePlusAddPattern_Async.cs @@ -7,6 +7,7 @@ using GrapeCity.Forguncy.Plugin; namespace AndroidPDACommand { + [Icon("pack://application:,,,/AndroidPDACommand;component/Resources/Icon_OfflineDownload.png")] [Category("活字格安卓容器（HAC）")] public class OfflinePlusAddPattern_Async : BaseAsyncCommand { @@ -45,7 +46,7 @@ namespace AndroidPDACommand public override string ToString() { - return "添加离线表单项目"; + return "下载离线表单"; } } diff --git a/OfflinePlusGetPatterns_Async.cs b/OfflinePlusGetPatterns_Async.cs index b3257de..cc1b509 100644 --- a/OfflinePlusGetPatterns_Async.cs +++ b/OfflinePlusGetPatterns_Async.cs @@ -1,18 +1,24 @@ using System.ComponentModel; using GrapeCity.Forguncy.Commands; +using GrapeCity.Forguncy.Plugin; namespace AndroidPDACommand { + [Icon("pack://application:,,,/AndroidPDACommand;component/Resources/Icon_OfflineUpload.png")] + [Category("活字格安卓容器（HAC）")] public class OfflinePlusGetPatterns_Async : BaseAsyncCommand { - - [Browsable(false)] + [DisplayName("动作")] + [ComboProperty(ValueList = "GetPatterns", DisplayList = "获取设备上的离线表单项目编号列表")] + public string Action { get; set; } = "GetPatterns"; + + [DisplayName("将离线表单项目编号列表返回到变量")] [ResultToProperty] - public string ProjectsResult { get; set; } = "projects"; - + public string ProjectsResult { get; set; } + public override string ToString() { - return "获取已保存项目"; + return "上传离线表单"; } } -} \ No newline at end of file +} diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index e7f0bbd..40ff061 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2930,10 +2930,18 @@ var OfflinePlusGetPatterns_Async_Command = (function (_super) { } OfflinePlusGetPatterns_Async_Command.prototype.execute = function () { + var params = this.CommandParam; + var action = params.Action || "GetPatterns"; + + if (action !== "GetPatterns") { + alert("不支持的离线表单上传动作：" + action); + return; + } let me = this; let ticket = HAC_GenerateCallbackTicket(me, function (payload, payload2) { + HAC_ReturnToParam(params.ProjectsResult, payload); me.CommandExecutor.excuteCommand(me.CommandParam.CommandList, { runTimePageName: me.CommandExecutingInfo.runTimePageName, commandID: new Date().valueOf().toString(), @@ -2944,17 +2952,15 @@ var OfflinePlusGetPatterns_Async_Command = (function (_super) { }, locationString: "执行window.offlinePlus.offlinePlusGetPatternsAsync" }); - }, HAC_GetOfflinePlusDebugInfo("获取已保存项目", "生成回调ticket")); + }, HAC_GetOfflinePlusDebugInfo("上传离线表单", "生成回调ticket")); if (window.offlinePlus && window.offlinePlus.offlinePlusGetPatternsAsync) { window.offlinePlus.offlinePlusGetPatternsAsync(ticket); } else { - HAC_CallFunctionOutOfHAC(HAC_GetOfflinePlusDebugInfo("获取已保存项目", "调用offlinePlusGetPatternsAsync")); + HAC_CallFunctionOutOfHAC(HAC_GetOfflinePlusDebugInfo("上传离线表单", "调用offlinePlusGetPatternsAsync")); } - }; - return OfflinePlusGetPatterns_Async_Command; }(Forguncy.CommandBase)); diff --git a/Resources/Icon_OfflineDownload.png b/Resources/Icon_OfflineDownload.png new file mode 100644 index 0000000000000000000000000000000000000000..1295a66c444353576d3580da122e425f19b457b9 GIT binary patch literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!R?+djv*HQ$q5oy9QN4Va@=IMi_vBAX+c(p zS*p@W|C%#OEO`=yuNU05*z(BUDD3p9U;IW4Kn0Cg7E3S){rUBnpDXYFX0{xL4!7yd zE01R#xZQvMzkS_T&YsuX^w^~t79}PrRNj(uFxEeiqn2^tqV@IzQVuuL!<26@2;AM1 zta?K=UGCoDd*#ZQ#1h+ZS|H`Di)2F%$F8(BY%^R#YS}m!C7-=w!(%AG gw$k0OA%=lL^u#J-k=mV=Krb+Oy85}Sb4q9e01!22OaK4? literal 0 HcmV?d00001 diff --git a/Resources/Icon_OfflineUpload.png b/Resources/Icon_OfflineUpload.png new file mode 100644 index 0000000000000000000000000000000000000000..cb7876aa0535f3281c9228c20470eeb39031e1e6 GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!8M*Pjv*HQ$q5TgZ@kZ6*P!QSa^rFSybbyX z{@8c8O;_efn3XtVfudO<@Ah72?SIV$RRv5j%0_IRhp#kTSuDXI^yk;(^Z)(x@BiPw zGet~d{<>2v*(?_g3@6xl$a>g@G2g5E^Y8!1)&2=JiSI%-Fe*r?u}xaOmhptdlavWS zUM$~o#vL&Xn`eGw3wXnt^5@Z=%nfM*y?X9b7=IYFF{TNI&Ub7&k~E=8g!u$3!xpDA V52S>6s(|ih@O1TaS?83{1OO1XWwZbQ literal 0 HcmV?d00001 -- Gitee From db356877e20c1ed86c0b40f1fc964da871785d1f Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Sat, 13 Jun 2026 17:33:03 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8A=A8=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OfflinePlusGetPatterns_Async.cs：在保留原 OfflinePlusGetPatterns_Async 类名和命令注册名的前提下，为上传离线表单命令新增 ExportRecords 动作，设计器显示为“导出离线表单数据”。 OfflinePlusGetPatterns_Async.cs：新增 ProjectId 输入和 ExportResult 输出，只在 ExportRecords 动作下显示；ProjectsResult 继续只在 GetPatterns 动作下显示，避免两个 action 的参数混在一起误用。 Resources/AndroidPDACommand.js：在原 OfflinePlusGetPatterns_Async_Command 内直接增加 ExportRecords 分支，使用 HAC_GenerateCallbackTicket 生成回调并调用 window.offlinePlus.offlinePlusExportRecordsAsync(projectId, ticket)。 Resources/AndroidPDACommand.js：导出回调返回后写入 ExportResult 变量，并继续通过子命令 initParams 传递 ExportResult、IsSuccess 和 Error，保持与现有异步命令执行模式一致。 --- OfflinePlusGetPatterns_Async.cs | 23 ++++++++++++++++++++++- Resources/AndroidPDACommand.js | 25 +++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/OfflinePlusGetPatterns_Async.cs b/OfflinePlusGetPatterns_Async.cs index cc1b509..0dd3b6f 100644 --- a/OfflinePlusGetPatterns_Async.cs +++ b/OfflinePlusGetPatterns_Async.cs @@ -9,16 +9,37 @@ namespace AndroidPDACommand public class OfflinePlusGetPatterns_Async : BaseAsyncCommand { [DisplayName("动作")] - [ComboProperty(ValueList = "GetPatterns", DisplayList = "获取设备上的离线表单项目编号列表")] + [ComboProperty(ValueList = "GetPatterns|ExportRecords", DisplayList = "获取设备上的离线表单项目编号列表|导出离线表单数据")] public string Action { get; set; } = "GetPatterns"; + [FormulaProperty] + [DisplayName("项目编号")] + public object ProjectId { get; set; } + [DisplayName("将离线表单项目编号列表返回到变量")] [ResultToProperty] public string ProjectsResult { get; set; } + [DisplayName("将离线表单数据返回到变量")] + [ResultToProperty] + public string ExportResult { get; set; } + public override string ToString() { return "上传离线表单"; } + + public override bool GetDesignerPropertyVisible(string propertyName, CommandScope commandScope) + { + if (propertyName == nameof(ProjectId) || propertyName == nameof(ExportResult)) + { + return Action == "ExportRecords"; + } + if (propertyName == nameof(ProjectsResult)) + { + return Action == "GetPatterns"; + } + return base.GetDesignerPropertyVisible(propertyName, commandScope); + } } } diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index 40ff061..eecd4d7 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2933,6 +2933,31 @@ var OfflinePlusGetPatterns_Async_Command = (function (_super) { var params = this.CommandParam; var action = params.Action || "GetPatterns"; + if (action === "ExportRecords") { + var projectId = this.evaluateFormula(params.ProjectId); + let me = this; + let ticket = HAC_GenerateCallbackTicket(me, function (payload, payload2) { + HAC_ReturnToParam(params.ExportResult, payload); + me.CommandExecutor.excuteCommand(me.CommandParam.CommandList, { + runTimePageName: me.CommandExecutingInfo.runTimePageName, + commandID: new Date().valueOf().toString(), + initParams: { + "ExportResult": payload, + "IsSuccess": true, + "Error": "" + }, + locationString: "执行window.offlinePlus.offlinePlusExportRecordsAsync" + }); + }, HAC_GetOfflinePlusDebugInfo("上传离线表单", "生成导出数据回调ticket")); + + if (window.offlinePlus && window.offlinePlus.offlinePlusExportRecordsAsync) { + window.offlinePlus.offlinePlusExportRecordsAsync(projectId, ticket); + } else { + HAC_CallFunctionOutOfHAC(HAC_GetOfflinePlusDebugInfo("上传离线表单", "调用offlinePlusExportRecordsAsync")); + } + return; + } + if (action !== "GetPatterns") { alert("不支持的离线表单上传动作：" + action); return; -- Gitee From 4e662aba3c50fca81764bac1e71254d66dae50cf Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Sat, 13 Jun 2026 17:48:29 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=94=AF=E6=8C=81=E6=A0=87=E8=AE=B0=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=B7=B2=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OfflinePlusGetPatterns_Async.cs：在上传离线表单命令中新增“标记离线记录已导出”动作，增加项目编号、记录编号和操作结果的设计时可见性控制；记录编号参数改为 RecordIds，并补充“多个记录编号用英文逗号分隔”的设计时备注，明确运行时输入格式。Resources/AndroidPDACommand.js：为 MarkRecordExported 动作生成 HAC 异步回调 ticket，调用 window.offlinePlus.offlinePlusMarkRecordExportedAsync(projectId, recordIds, ticket)，并将安卓端返回的操作结果写回 OperationResult；JS 只传递逗号分隔字符串，不在前端拆分，保持拆分和逐条标记逻辑在安卓端完成。 --- OfflinePlusGetPatterns_Async.cs | 21 +++++++++++++++++++-- Resources/AndroidPDACommand.js | 26 ++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 2 deletions(-) diff --git a/OfflinePlusGetPatterns_Async.cs b/OfflinePlusGetPatterns_Async.cs index 0dd3b6f..4584c67 100644 --- a/OfflinePlusGetPatterns_Async.cs +++ b/OfflinePlusGetPatterns_Async.cs @@ -9,13 +9,18 @@ namespace AndroidPDACommand public class OfflinePlusGetPatterns_Async : BaseAsyncCommand { [DisplayName("动作")] - [ComboProperty(ValueList = "GetPatterns|ExportRecords", DisplayList = "获取设备上的离线表单项目编号列表|导出离线表单数据")] + [ComboProperty(ValueList = "GetPatterns|ExportRecords|MarkRecordExported", DisplayList = "获取设备上的离线表单项目编号列表|导出离线表单数据|标记离线记录已导出")] public string Action { get; set; } = "GetPatterns"; [FormulaProperty] [DisplayName("项目编号")] public object ProjectId { get; set; } + [FormulaProperty] + [DisplayName("记录编号")] + [Description("多个记录编号用英文逗号分隔。")] + public object RecordIds { get; set; } + [DisplayName("将离线表单项目编号列表返回到变量")] [ResultToProperty] public string ProjectsResult { get; set; } @@ -24,6 +29,10 @@ namespace AndroidPDACommand [ResultToProperty] public string ExportResult { get; set; } + [DisplayName("将操作结果返回到变量")] + [ResultToProperty] + public string OperationResult { get; set; } + public override string ToString() { return "上传离线表单"; @@ -31,7 +40,15 @@ namespace AndroidPDACommand public override bool GetDesignerPropertyVisible(string propertyName, CommandScope commandScope) { - if (propertyName == nameof(ProjectId) || propertyName == nameof(ExportResult)) + if (propertyName == nameof(ProjectId)) + { + return Action == "ExportRecords" || Action == "MarkRecordExported"; + } + if (propertyName == nameof(RecordIds) || propertyName == nameof(OperationResult)) + { + return Action == "MarkRecordExported"; + } + if (propertyName == nameof(ExportResult)) { return Action == "ExportRecords"; } diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index eecd4d7..cadb2cd 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2958,6 +2958,32 @@ var OfflinePlusGetPatterns_Async_Command = (function (_super) { return; } + if (action === "MarkRecordExported") { + var projectId = this.evaluateFormula(params.ProjectId); + var recordIds = this.evaluateFormula(params.RecordIds); + let me = this; + let ticket = HAC_GenerateCallbackTicket(me, function (payload, payload2) { + HAC_ReturnToParam(params.OperationResult, payload); + me.CommandExecutor.excuteCommand(me.CommandParam.CommandList, { + runTimePageName: me.CommandExecutingInfo.runTimePageName, + commandID: new Date().valueOf().toString(), + initParams: { + "OperationResult": payload, + "IsSuccess": true, + "Error": "" + }, + locationString: "执行window.offlinePlus.offlinePlusMarkRecordExportedAsync" + }); + }, HAC_GetOfflinePlusDebugInfo("上传离线表单", "生成标记导出回调ticket")); + + if (window.offlinePlus && window.offlinePlus.offlinePlusMarkRecordExportedAsync) { + window.offlinePlus.offlinePlusMarkRecordExportedAsync(projectId, recordIds, ticket); + } else { + HAC_CallFunctionOutOfHAC(HAC_GetOfflinePlusDebugInfo("上传离线表单", "调用offlinePlusMarkRecordExportedAsync")); + } + return; + } + if (action !== "GetPatterns") { alert("不支持的离线表单上传动作：" + action); return; -- Gitee From a926e1e0f366ea04e76f72f4d4ca3b48af031983 Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Sat, 13 Jun 2026 18:06:01 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=94=AF=E6=8C=81=E5=88=A0=E9=99=A4=E5=B7=B2?= =?UTF-8?q?=E8=AF=BB=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OfflinePlusGetPatterns_Async.cs：在上传离线表单命令中新增“删除已读离线记录”动作，复用项目编号、记录编号和操作结果参数；记录编号备注说明多个值用英文逗号分隔，并明确不填时删除项目下所有已读记录，方便设计时理解参数语义。Resources/AndroidPDACommand.js：新增 DeleteReadRecords action，使用 HAC_GenerateCallbackTicket 调用 window.offlinePlus.offlinePlusDeleteReadRecordsAsync(projectId, recordIds, ticket)，并把安卓端返回结果写回 OperationResult；JS 仅传递 recordIds 字符串，不在前端拆分，保持拆分和删除逻辑在安卓端完成。 --- OfflinePlusGetPatterns_Async.cs | 8 ++++---- Resources/AndroidPDACommand.js | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/OfflinePlusGetPatterns_Async.cs b/OfflinePlusGetPatterns_Async.cs index 4584c67..4652452 100644 --- a/OfflinePlusGetPatterns_Async.cs +++ b/OfflinePlusGetPatterns_Async.cs @@ -9,7 +9,7 @@ namespace AndroidPDACommand public class OfflinePlusGetPatterns_Async : BaseAsyncCommand { [DisplayName("动作")] - [ComboProperty(ValueList = "GetPatterns|ExportRecords|MarkRecordExported", DisplayList = "获取设备上的离线表单项目编号列表|导出离线表单数据|标记离线记录已导出")] + [ComboProperty(ValueList = "GetPatterns|ExportRecords|MarkRecordExported|DeleteReadRecords", DisplayList = "获取设备上的离线表单项目编号列表|导出离线表单数据|标记离线记录已导出|删除已读离线记录")] public string Action { get; set; } = "GetPatterns"; [FormulaProperty] @@ -18,7 +18,7 @@ namespace AndroidPDACommand [FormulaProperty] [DisplayName("记录编号")] - [Description("多个记录编号用英文逗号分隔。")] + [Description("多个记录编号用英文逗号分隔。删除已读离线记录时不填，则删除项目下所有已读记录。")] public object RecordIds { get; set; } [DisplayName("将离线表单项目编号列表返回到变量")] @@ -42,11 +42,11 @@ namespace AndroidPDACommand { if (propertyName == nameof(ProjectId)) { - return Action == "ExportRecords" || Action == "MarkRecordExported"; + return Action == "ExportRecords" || Action == "MarkRecordExported" || Action == "DeleteReadRecords"; } if (propertyName == nameof(RecordIds) || propertyName == nameof(OperationResult)) { - return Action == "MarkRecordExported"; + return Action == "MarkRecordExported" || Action == "DeleteReadRecords"; } if (propertyName == nameof(ExportResult)) { diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index cadb2cd..fbec884 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -2984,6 +2984,32 @@ var OfflinePlusGetPatterns_Async_Command = (function (_super) { return; } + if (action === "DeleteReadRecords") { + var projectId = this.evaluateFormula(params.ProjectId); + var recordIds = this.evaluateFormula(params.RecordIds); + let me = this; + let ticket = HAC_GenerateCallbackTicket(me, function (payload, payload2) { + HAC_ReturnToParam(params.OperationResult, payload); + me.CommandExecutor.excuteCommand(me.CommandParam.CommandList, { + runTimePageName: me.CommandExecutingInfo.runTimePageName, + commandID: new Date().valueOf().toString(), + initParams: { + "OperationResult": payload, + "IsSuccess": true, + "Error": "" + }, + locationString: "执行window.offlinePlus.offlinePlusDeleteReadRecordsAsync" + }); + }, HAC_GetOfflinePlusDebugInfo("上传离线表单", "生成删除已读记录回调ticket")); + + if (window.offlinePlus && window.offlinePlus.offlinePlusDeleteReadRecordsAsync) { + window.offlinePlus.offlinePlusDeleteReadRecordsAsync(projectId, recordIds, ticket); + } else { + HAC_CallFunctionOutOfHAC(HAC_GetOfflinePlusDebugInfo("上传离线表单", "调用offlinePlusDeleteReadRecordsAsync")); + } + return; + } + if (action !== "GetPatterns") { alert("不支持的离线表单上传动作：" + action); return; -- Gitee From a8b7381a62a63f971aa5a022b083f7bed593c4d2 Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Sat, 13 Jun 2026 18:12:58 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=A6=BB=E7=BA=BF?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=94=AF=E6=8C=81=E5=88=A0=E9=99=A4=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OfflinePlusGetPatterns_Async.cs：在上传离线表单命令中新增“删除离线表单项目”动作，并将设计时可见参数限制为项目编号和操作结果，避免展示无关的记录编号参数。Resources/AndroidPDACommand.js：新增 DeleteProject action，使用 HAC_GenerateCallbackTicket 调用 window.offlinePlus.offlinePlusDeleteProjectAsync(projectId, ticket)，并将安卓端返回结果写回 OperationResult，保持删除项目流程与其它上传离线表单动作一致。 --- OfflinePlusGetPatterns_Async.cs | 10 +++++++--- Resources/AndroidPDACommand.js | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/OfflinePlusGetPatterns_Async.cs b/OfflinePlusGetPatterns_Async.cs index 4652452..1a597ef 100644 --- a/OfflinePlusGetPatterns_Async.cs +++ b/OfflinePlusGetPatterns_Async.cs @@ -9,7 +9,7 @@ namespace AndroidPDACommand public class OfflinePlusGetPatterns_Async : BaseAsyncCommand { [DisplayName("动作")] - [ComboProperty(ValueList = "GetPatterns|ExportRecords|MarkRecordExported|DeleteReadRecords", DisplayList = "获取设备上的离线表单项目编号列表|导出离线表单数据|标记离线记录已导出|删除已读离线记录")] + [ComboProperty(ValueList = "GetPatterns|ExportRecords|MarkRecordExported|DeleteReadRecords|DeleteProject", DisplayList = "获取设备上的离线表单项目编号列表|导出离线表单数据|标记离线记录已导出|删除已读离线记录|删除离线表单项目")] public string Action { get; set; } = "GetPatterns"; [FormulaProperty] @@ -42,12 +42,16 @@ namespace AndroidPDACommand { if (propertyName == nameof(ProjectId)) { - return Action == "ExportRecords" || Action == "MarkRecordExported" || Action == "DeleteReadRecords"; + return Action == "ExportRecords" || Action == "MarkRecordExported" || Action == "DeleteReadRecords" || Action == "DeleteProject"; } - if (propertyName == nameof(RecordIds) || propertyName == nameof(OperationResult)) + if (propertyName == nameof(RecordIds)) { return Action == "MarkRecordExported" || Action == "DeleteReadRecords"; } + if (propertyName == nameof(OperationResult)) + { + return Action == "MarkRecordExported" || Action == "DeleteReadRecords" || Action == "DeleteProject"; + } if (propertyName == nameof(ExportResult)) { return Action == "ExportRecords"; diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index fbec884..6d0d91b 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -3010,6 +3010,31 @@ var OfflinePlusGetPatterns_Async_Command = (function (_super) { return; } + if (action === "DeleteProject") { + var projectId = this.evaluateFormula(params.ProjectId); + let me = this; + let ticket = HAC_GenerateCallbackTicket(me, function (payload, payload2) { + HAC_ReturnToParam(params.OperationResult, payload); + me.CommandExecutor.excuteCommand(me.CommandParam.CommandList, { + runTimePageName: me.CommandExecutingInfo.runTimePageName, + commandID: new Date().valueOf().toString(), + initParams: { + "OperationResult": payload, + "IsSuccess": true, + "Error": "" + }, + locationString: "执行window.offlinePlus.offlinePlusDeleteProjectAsync" + }); + }, HAC_GetOfflinePlusDebugInfo("上传离线表单", "生成删除离线表单项目回调ticket")); + + if (window.offlinePlus && window.offlinePlus.offlinePlusDeleteProjectAsync) { + window.offlinePlus.offlinePlusDeleteProjectAsync(projectId, ticket); + } else { + HAC_CallFunctionOutOfHAC(HAC_GetOfflinePlusDebugInfo("上传离线表单", "调用offlinePlusDeleteProjectAsync")); + } + return; + } + if (action !== "GetPatterns") { alert("不支持的离线表单上传动作：" + action); return; -- Gitee From 70cdf7ba70f00914ea0edc78cf271c8dbf29389b Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Mon, 15 Jun 2026 09:53:51 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E8=A1=A8=E5=8D=95=E8=AE=B0=E5=BD=95=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OfflinePlusGetPatterns_Async.cs：修正 RecordIds 参数的设计时备注，明确该参数在“标记离线记录已导出”动作下必填，在“删除已读离线记录”动作下可不填并表示删除项目下所有已读记录，避免设计时误解参数是否可选。 --- OfflinePlusGetPatterns_Async.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OfflinePlusGetPatterns_Async.cs b/OfflinePlusGetPatterns_Async.cs index 1a597ef..01dbc68 100644 --- a/OfflinePlusGetPatterns_Async.cs +++ b/OfflinePlusGetPatterns_Async.cs @@ -18,7 +18,7 @@ namespace AndroidPDACommand [FormulaProperty] [DisplayName("记录编号")] - [Description("多个记录编号用英文逗号分隔。删除已读离线记录时不填，则删除项目下所有已读记录。")] + [Description("多个记录编号用英文逗号分隔。标记离线记录已导出时必填；删除已读离线记录时不填，则删除项目下所有已读记录。")] public object RecordIds { get; set; } [DisplayName("将离线表单项目编号列表返回到变量")] -- Gitee From 86b41cb9f28130db7ee2cae0302cf81112131843 Mon Sep 17 00:00:00 2001 From: Rex Lei Date: Mon, 15 Jun 2026 12:04:28 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E8=A1=A8=E5=8D=95=E9=99=84=E4=BB=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OfflinePlusGetPatterns_Async.cs：为上传离线表单命令增加隐藏的 FileUploadLimit 服务端属性，让运行时 JS 可以通过 ServerPropertiesId.FileUploadLimit 拿到文件上传限制 ID，并复用本体临时文件上传能力。 Resources/AndroidPDACommand.js：导出离线表单数据时解析 Android 返回的 attachments，逐个从 HAC 读取离线本地文件并上传到 Forguncy 临时目录，再把 records 中对应图片/附件字段替换为竖线分隔的临时文件名字符串；增加上传进度遮罩，显示文件数量、MB 进度和上传速度。空图片/附件占位值已改由 Android 导出阶段处理，因此删除前端 "[]"/"{}" 兜底归一化代码，避免两端职责重复。 --- OfflinePlusGetPatterns_Async.cs | 36 +++++ Resources/AndroidPDACommand.js | 236 ++++++++++++++++++++++++++++++-- 2 files changed, 260 insertions(+), 12 deletions(-) diff --git a/OfflinePlusGetPatterns_Async.cs b/OfflinePlusGetPatterns_Async.cs index 01dbc68..6b82b0c 100644 --- a/OfflinePlusGetPatterns_Async.cs +++ b/OfflinePlusGetPatterns_Async.cs @@ -1,4 +1,5 @@ using System.ComponentModel; +using System; using GrapeCity.Forguncy.Commands; using GrapeCity.Forguncy.Plugin; @@ -29,6 +30,12 @@ namespace AndroidPDACommand [ResultToProperty] public string ExportResult { get; set; } + [ServerProperty] + [Browsable(false)] + [PageMetadataJsonIgnore] + [SaveJsonIgnore] + public UploadLimit FileUploadLimit { get; set; } = new UploadLimit(); + [DisplayName("将操作结果返回到变量")] [ResultToProperty] public string OperationResult { get; set; } @@ -63,4 +70,33 @@ namespace AndroidPDACommand return base.GetDesignerPropertyVisible(propertyName, commandScope); } } + + public class UploadLimit : ICloneable, IUploadLimit, ISupportDeclareObjectEmpty + { + public UploadLimit() + { + ExtensionFilter = ""; + SizeLimit = 0; + MaxUploadFileCount = 0; + } + + [DefaultValue("")] + public string ExtensionFilter { get; set; } + + [DefaultValue(0d)] + public double SizeLimit { get; set; } + + [DefaultValue(0)] + public int MaxUploadFileCount { get; set; } + + public object Clone() + { + return MemberwiseClone(); + } + + public bool IsObjectEmpty() + { + return SizeLimit == 0 && MaxUploadFileCount == 0 && ExtensionFilter == ""; + } + } } diff --git a/Resources/AndroidPDACommand.js b/Resources/AndroidPDACommand.js index 6d0d91b..c38aa82 100644 --- a/Resources/AndroidPDACommand.js +++ b/Resources/AndroidPDACommand.js @@ -74,6 +74,197 @@ var HAC_ReturnToParam = function (OutParamaterName, data) { } }; +var HAC_DataUrlToFile = function (dataUrl, fileName) { + var parts = (dataUrl || "").split(","); + if (parts.length < 2) { + return null; + } + var header = parts[0]; + var mimeMatch = header.match(/data:([^;]+);base64/i); + var mimeType = mimeMatch ? mimeMatch[1] : "application/octet-stream"; + var binary = atob(parts.slice(1).join(",")); + var bytes = new Uint8Array(binary.length); + for (var i = 0; i < binary.length; i++) { + bytes[i] = binary.charCodeAt(i); + } + return new File([bytes], fileName || "offlineAttachment", { type: mimeType }); +}; + +var HAC_FormatBytesAsMb = function (bytes) { + return (bytes / 1024 / 1024).toFixed(2) + " MB"; +}; + +var HAC_OfflineUploadProgress = { + element: null, + fill: null, + title: null, + detail: null, + speed: null, + ensure: function () { + if (this.element) { + return; + } + var root = document.createElement("div"); + root.style.cssText = "position:fixed;left:0;top:0;right:0;bottom:0;z-index:2147483647;background:rgba(0,0,0,.28);display:flex;align-items:center;justify-content:center;font-family:Arial,'Microsoft YaHei',sans-serif;"; + root.innerHTML = "
" + + "
正在上传离线附件
" + + "
" + + "
" + + "
" + + "
"; + document.body.appendChild(root); + this.element = root; + this.fill = root.querySelector("[data-role='fill']"); + this.title = root.querySelector("[data-role='title']"); + this.detail = root.querySelector("[data-role='detail']"); + this.speed = root.querySelector("[data-role='speed']"); + }, + update: function (options) { + this.ensure(); + var percent = Math.max(0, Math.min(100, options.percent || 0)); + this.fill.style.width = percent.toFixed(1) + "%"; + this.title.textContent = options.title || "正在上传离线附件"; + this.detail.textContent = options.detail || ""; + this.speed.textContent = options.speed || ""; + }, + close: function () { + if (this.element && this.element.parentNode) { + this.element.parentNode.removeChild(this.element); + } + this.element = null; + this.fill = null; + this.title = null; + this.detail = null; + this.speed = null; + } +}; + +var HAC_UploadFileToTemp = function (file, uploadLimitId, onProgress) { + return new Promise(function (resolve, reject) { + var formData = new FormData(); + formData.append("file", file); + formData.append("uploadLimitId", uploadLimitId); + formData.append("uploadFolder", ""); + + var startTime = new Date().valueOf(); + var xhr = new XMLHttpRequest(); + xhr.open("POST", Forguncy.Common.uploadUrl, true); + xhr.setRequestHeader("Accept", "application/json"); + xhr.upload.onprogress = function (event) { + if (onProgress && event.lengthComputable) { + var elapsedSeconds = Math.max((new Date().valueOf() - startTime) / 1000, 0.1); + onProgress(event.loaded, event.total, event.loaded / elapsedSeconds); + } + }; + xhr.onload = function () { + if (xhr.status >= 200 && xhr.status < 300) { + resolve(xhr.responseText); + } else { + reject(xhr.responseText || xhr.statusText || "上传离线附件失败。"); + } + }; + xhr.onerror = function () { + reject("上传离线附件失败。"); + }; + xhr.send(formData); + }); +}; + +var HAC_ParseJsonValue = function (value, fallback) { + if (value === undefined || value === null || value === "") { + return fallback; + } + try { + return JSON.parse(value); + } catch (e) { + return fallback; + } +}; + +var HAC_FindOfflineRecord = function (records, recordId) { + for (var i = 0; i < records.length; i++) { + if (records[i] && records[i].recordId === recordId) { + return records[i]; + } + } + return null; +}; + +var HAC_ApplyUploadedAttachmentValue = function (record, attachment, attachmentValue, uploadedValues) { + if (!record || !record.values || !attachment || !attachment.path || attachment.path.length < 3) { + return; + } + + var fieldId = attachment.path[1]; + var key = attachment.path[0] + "|" + fieldId; + if (!uploadedValues[key]) { + uploadedValues[key] = []; + } + uploadedValues[key].push(attachmentValue); + record.values[fieldId] = uploadedValues[key].join("|"); +}; + +var HAC_ProcessOfflineExportAttachments = async function (projectId, exportData, uploadLimitId) { + if (!exportData) { + return exportData; + } + var records = exportData.records || []; + if (!exportData.attachments || exportData.attachments.length === 0) { + delete exportData.attachments; + return exportData; + } + if (!uploadLimitId) { + throw "请设置文件上传限制ID。"; + } + if (!window.offlinePlus || !window.offlinePlus.offlinePlusLoadAttachment) { + HAC_CallFunctionOutOfHAC(HAC_GetOfflinePlusDebugInfo("上传离线表单", "调用offlinePlusLoadAttachment")); + throw "当前APP不支持读取离线附件。"; + } + + var uploadedValues = {}; + HAC_OfflineUploadProgress.update({ + percent: 0, + detail: "准备上传 " + exportData.attachments.length + " 个离线附件", + speed: "" + }); + for (var i = 0; i < exportData.attachments.length; i++) { + var attachment = exportData.attachments[i]; + if (!attachment || !attachment.localName || !attachment.path || attachment.path.length < 3) { + continue; + } + + var fileIndexText = (i + 1) + " / " + exportData.attachments.length; + HAC_OfflineUploadProgress.update({ + percent: exportData.attachments.length === 0 ? 0 : i / exportData.attachments.length * 100, + detail: "正在读取离线文件：" + fileIndexText + " " + attachment.localName, + speed: "" + }); + var dataUrl = window.offlinePlus.offlinePlusLoadAttachment(projectId, attachment.localName); + var fileName = attachment.type === "image" ? attachment.localName : attachment.path[2]; + var file = HAC_DataUrlToFile(dataUrl, fileName); + if (!file) { + throw "读取离线附件失败：" + attachment.localName; + } + + var attachmentValue = await HAC_UploadFileToTemp(file, uploadLimitId, function (loaded, total, bytesPerSecond) { + HAC_OfflineUploadProgress.update({ + percent: (i + (total > 0 ? loaded / total : 0)) / exportData.attachments.length * 100, + detail: "正在上传：" + fileIndexText + " " + file.name + "，" + HAC_FormatBytesAsMb(loaded) + " / " + HAC_FormatBytesAsMb(total), + speed: "速度：" + HAC_FormatBytesAsMb(bytesPerSecond) + "/s" + }); + }); + var record = HAC_FindOfflineRecord(records, attachment.path[0]); + HAC_ApplyUploadedAttachmentValue(record, attachment, attachmentValue, uploadedValues); + } + HAC_OfflineUploadProgress.update({ + percent: 100, + detail: "正在生成导出数据", + speed: "" + }); + delete exportData.attachments; + return exportData; +}; + var HAC_DothanPrinterOp = function (callback) { if (window.dothanPrinter) { var status = window.dothanPrinter.getStatus(); @@ -2935,19 +3126,40 @@ var OfflinePlusGetPatterns_Async_Command = (function (_super) { if (action === "ExportRecords") { var projectId = this.evaluateFormula(params.ProjectId); + var fileUploadLimit = (params.ServerPropertiesId && params.ServerPropertiesId.FileUploadLimit) || ""; let me = this; - let ticket = HAC_GenerateCallbackTicket(me, function (payload, payload2) { - HAC_ReturnToParam(params.ExportResult, payload); - me.CommandExecutor.excuteCommand(me.CommandParam.CommandList, { - runTimePageName: me.CommandExecutingInfo.runTimePageName, - commandID: new Date().valueOf().toString(), - initParams: { - "ExportResult": payload, - "IsSuccess": true, - "Error": "" - }, - locationString: "执行window.offlinePlus.offlinePlusExportRecordsAsync" - }); + let ticket = HAC_GenerateCallbackTicket(me, async function (payload, payload2) { + try { + var exportData = HAC_ParseJsonValue(payload, null); + if (exportData) { + exportData = await HAC_ProcessOfflineExportAttachments(projectId, exportData, fileUploadLimit); + payload = JSON.stringify(exportData); + } + HAC_ReturnToParam(params.ExportResult, payload); + me.CommandExecutor.excuteCommand(me.CommandParam.CommandList, { + runTimePageName: me.CommandExecutingInfo.runTimePageName, + commandID: new Date().valueOf().toString(), + initParams: { + "ExportResult": payload, + "IsSuccess": true, + "Error": "" + }, + locationString: "执行window.offlinePlus.offlinePlusExportRecordsAsync" + }); + } catch (e) { + me.CommandExecutor.excuteCommand(me.CommandParam.CommandList, { + runTimePageName: me.CommandExecutingInfo.runTimePageName, + commandID: new Date().valueOf().toString(), + initParams: { + "ExportResult": payload, + "IsSuccess": false, + "Error": e ? e.toString() : "导出离线附件失败。" + }, + locationString: "处理离线附件上传时出错" + }); + } finally { + HAC_OfflineUploadProgress.close(); + } }, HAC_GetOfflinePlusDebugInfo("上传离线表单", "生成导出数据回调ticket")); if (window.offlinePlus && window.offlinePlus.offlinePlusExportRecordsAsync) { -- Gitee