Przeglądaj źródła

fix:修复富文本链接问题,更新图标

ruhuxu 2 dni temu
rodzic
commit
3a71f6ac70

+ 1 - 1
js/vue/ss-components.js

@@ -4259,7 +4259,7 @@ import { EVEN_VAR } from "./EventBus.js";
           h("input", {
             type: "hidden",
             name: "ueditorpath",
-            value: "mswj",
+            value:  props.name.replace(/wj$/, "") + "wj",
           }),
           h("textarea", { id: uniqueId }),
         ]);

+ 2 - 2
page/env/addSure.jsp

@@ -107,7 +107,7 @@
 			</script>
 		</table> --%>
 	</div>
-	<div class="" style="width: 100%;height:65px;border-top: 1px solid rgb(210, 210, 210);">
+	<%-- <div class="" style="width: 100%;height:65px;border-top: 1px solid rgb(210, 210, 210);">
 		<input type='hidden' name='ynrid' value='' />
 		<div id='ynrEdit' data-shid="${shid}" style="height: 63px;"></div>
 		<script type="text/javascript" charset="utf-8" src="/ss/js/edit.js"></script>
@@ -139,7 +139,7 @@
 			}
 			var inputterfjJson={"fj":{"key":"fjid","value":"","name":null,"jlztm":null}};
 		</script>
-	</div>
+	</div> --%>
 	<div class="bottom-div" style="border: none; display:flex;flex-direction: column;position: absolute;">
 		<input type="button" id="sureSubmitButton" value="确定" class="bottom-button" onclick="wd.display.submitToTopTab(this);" style="display:none;"/>
 		<div class="bottom-div-button" style="width: 100%;display:flex;justify-content: flex-end; gap:10px;padding-bottom: 10px;padding-top: 10px;">

+ 14 - 1
page/env/cobjList.jsp

@@ -1520,8 +1520,21 @@ dataType:"${dataType}",	// 增加,传递给 searchCobjByA()。Lin
                                 }).filter(Boolean);
                             } catch (e) {
                             }
+                            // 功能说明:二级对象卡片按钮:优先使用 chgRootFuncList,否则回退到单个 chg by xu 20250403
                             card.buttons = [];
-                            if (raw && raw.chg) {
+                            if (raw && Array.isArray(raw.chgRootFuncList) && raw.chgRootFuncList.length > 0) {
+                                raw.chgRootFuncList.forEach(function (btn) {
+                                    card.buttons.push({
+                                        id: btn.id || "",
+                                        titlexxx: btn.title || "",
+                                        class: "cart-list-setting",
+                                        title: btn.desc || btn.title || "",
+                                        onclick: function () {
+                                            self.openServiceDialog(btn);
+                                        },
+                                    });
+                                });
+                            } else if (raw && raw.chg) {
                                 card.buttons.push({
                                     id: "change",
                                     class: "cart-list-setting",

+ 8 - 0
skin/easy/css/icon-biz/iconfont.css

@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-obj-grfw:before {
+  content: "\e68e";
+}
+
+.icon-obj-xyJz:before {
+  content: "\e68d";
+}
+
 .icon-obj-ka:before {
   content: "\e68b";
 }

BIN
skin/easy/fonts/icon-biz/iconfont.ttf


BIN
skin/easy/fonts/icon-biz/iconfont.woff


BIN
skin/easy/fonts/icon-biz/iconfont.woff2