From 9ee7d3bd9c58a204b1efe38e6be61155bbb15c16 Mon Sep 17 00:00:00 2001
From: chr <chr@chr.com>
Date: 星期三, 21 八月 2024 19:16:22 +0800
Subject: [PATCH] Merge branch 'master' of http://10.10.28.13:8080/r/PDM/PdmSwPlugin2
---
PdmSwPlugin.PropertySetting/Panel/JgjModulePanel.xaml.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/PdmSwPlugin.PropertySetting/Panel/JgjModulePanel.xaml.cs b/PdmSwPlugin.PropertySetting/Panel/JgjModulePanel.xaml.cs
index 4b3681f..a69952b 100644
--- a/PdmSwPlugin.PropertySetting/Panel/JgjModulePanel.xaml.cs
+++ b/PdmSwPlugin.PropertySetting/Panel/JgjModulePanel.xaml.cs
@@ -1,7 +1,7 @@
锘縰sing System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
-using System.Reflection;
+using System.IO;
using System.Runtime.CompilerServices;
using System.Windows.Controls;
using PdmSwPlugin.Common.CustomHandler;
@@ -119,7 +119,7 @@
#region UI灞炴��
private string _materialCode;
- [PropertySettingAttr(Name = NameConstant.materialCode)]
+ [PropertySettingAttr(Name = NameConstant.materialCode, defaultValue = "$PRP:\"SW-File Name\"")]
public string materialCode
{
get => _materialCode;
@@ -221,13 +221,20 @@
[PropertySettingAttr(Name = NameConstant.weight, NeedSave = false)]
public string weight
{
- get => _weight;
+ get => CustomPropertyUtil.GetMass(doc);
set
{
- RaiseAndSetIfChanged(ref _weight, value);
+ ccc(ref _weight, value);
}
}
+ [PropertySettingAttr(Name = NameConstant.weight, NeedInit = false)]
+ public string weightEval
+ {
+ get => doc == null ? null : $"\"SW-璐ㄩ噺@{Path.GetFileName(doc.GetPathName())}\"";
+ set { }
+ }
+
private string _designer = "";
[PropertySettingAttr(Name = NameConstant.designer)]
public string designer
--
Gitblit v1.9.1