SVN r717

SVN-Revision: r717

插件库/Lskj.PubBill/BillModule.cs

@@ -2881,7 +2881,7 @@ namespace Lskj.PubBill
                                     //    return;
                                     //}
                                     DataRow addRow = dataTable.NewRow();
-                                    addRow[afterBomFieldName] = fileNameWithoutExtension;
+                                    addRow[afterBomFieldName] = Path.GetFileName(fileName);
                                     addRow["BomFieldNameDir"] = fileName;
                                     addRow["BomFieldNamePath"] = Path.GetFileName(fileName);
                                     addRow["BomMxMainProduct"] = mxProductId;
@@ -4836,6 +4836,7 @@ namespace Lskj.PubBill
                         menu.ApplyBefore += new CommonToolApplyEventHandler(OnMenuApplyBefore);
                         menu.DynamicLinkAfter += new CommonToolAfterDynamicLinkEventHandler(OnDynamicLinkAfter);
                         StaticControl.RightMenuGridView = gcMain.GridView;
+                        StaticControl.RightMenuMyControl = ControlObj;
                         menu.Apply(menuRow);
                         if (!menu.issuccess)
                         {
@@ -8484,34 +8485,4 @@ namespace Lskj.PubBill
         /// </summary>
         /// <param name="cond">The cond.</param>
         /// <param name="dataRow">The data row.</param>
-        /// <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;
-        }
-    }
-}
+        /// <returns><c>true</c> if X