SVN r490

SVN-Revision: r490

插件库/Lskj.PubBill/BillModule.cs

@@ -2065,6 +2065,7 @@ namespace Lskj.PubBill
                     DataView dataView = dt.AsDataView();
                     dataView.Sort = this.BillModel.DetailOrderField;
                     dt = dataView.ToTable();
+                    dt.AcceptChanges();
                 }
 
                 if (this.BillModel.DetailTreeTable)
@@ -8079,4 +8080,34 @@ namespace Lskj.PubBill
         /// </summary>
         /// <param name="cond">The cond.</param>
         /// <param name="dataRow">The data row.</param>
-        /// <returns><c>true</c> if X
+        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise.</returns>
+        private bool ValidateCond(string cond, DataRow dataRow)
+        {
+            bool result = false;
+            string condition = cond;
+            try
+            {
+                if (string.IsNullOrWhiteSpace(cond)) return true;//如果值是空格或者空行，默认正确
+                cond = ReplaceHelper.ReplaceRowParam(dataRow, cond);
+                if (cond.StartsWith("@") || cond.StartsWith("!"))
+                {
+                    result = "1".Equals(BaseImpl.GetDefaultValue(cond));
+                }
+                else if (dataRow == null)
+                {
+                    result = ReplaceHelper.EvalCond(cond);
+                }
+                else
+                {
+                    result = ReplaceHelper.ReplaceRowParamCond(dataRow, cond);
+                }
+                return result;
+            }
+            catch (Exception ex)
+            {
+
+            }
+            return result;
+        }
+    }
+}