提交当前本机最新程序

2026-07-16 16:05:38 +08:00
parent 43ae774164
commit 6be6607a40
47 changed files with 7895 additions and 811 deletions
@@ -42,6 +42,14 @@ namespace Lskj.Control.Model
        {
            int[] mSelectRows = this._gridView.GetSelectedRows();
            if (mSelectRows == null || mSelectRows.Length == 0) return;
+
+            DataRow[] dataRows = new DataRow[mSelectRows.Length];
+            for (int i = 0; i < mSelectRows.Length; i++)
+            {
+                dataRows[i] = this._gridView.GetDataRow(mSelectRows[i]);
+            }
+
+
            DataRow mSelectRow = this._gridView.GetDataRow(mSelectRows[0]);
            this._gridView.UpdateCurrentRow();
            this._gridView.ShowEditor();
@@ -127,6 +135,13 @@ namespace Lskj.Control.Model
                                    cond = _control.ReplaceParentControlValue(model.MenuCond);
                                }
                                cond = ReplaceHelper.ReplaceRowParam(selectRow, model.MenuCond);
+
+                                if (model.Mergeexec&& cond.StartsWith("@"))
+                                {
+                                    //替换[],替换的是多选行中的数据
+                                    cond = ReplaceHelper.ReplaceRowParam(dataRows, cond.Replace("[", "{").Replace("]", "}"), "", "");
+                                }
+
                                if (this._gridView != null)
                                {
                                    if (cells != null && cells.Length > 0 && cond.Contains("{COLUMN_"))