浏览代码

修复bug

olym 7 年之前
父节点
当前提交
58d21ae47a

+ 6 - 2
web/building_saas/main/js/views/character_content_view.js

@@ -123,7 +123,7 @@ let contentOprObj = {
     },
     save: function (callback) {
         let selectedNode = projectObj.mainController.tree.selected;
-        const setting = projectObj.project.property.addRule !== undefined ? projectObj.project.property.addRule : null;
+        const setting = projectObj.project.property.addRule !== undefined ? projectObj.project.property.addRule : getAddRuleSetting();
         pageCCOprObj.setCharacterBySetting(selectedNode, setting, callback);
     },
     onEditEnded: function (sender, args) {
@@ -497,7 +497,7 @@ let characterOprObj = {
     },
     save: function (callback) {
         let selectedNode = projectObj.mainController.tree.selected;
-        const setting = projectObj.project.property.addRule !== undefined ? projectObj.project.property.addRule : null;
+        const setting = projectObj.project.property.addRule !== undefined ? projectObj.project.property.addRule : getAddRuleSetting();
         pageCCOprObj.setCharacterBySetting(selectedNode, setting, callback);
     },
     onEditStart: function (sender, args) {
@@ -985,6 +985,10 @@ let pageCCOprObj = {
      * @return {Object} - 返回更新的数据
      */
     getCharacterUpdateData: function(setting, node) {
+        // 获取原名称
+        const name = node.data.name.split("\n");
+        this.nameCache = name[0] !== undefined ? name[0] : "";
+
         let updateData = {
             itemCharacterText: '',
             jobContentText: '',

+ 0 - 7
web/building_saas/main/js/views/sub_view.js

@@ -129,9 +129,6 @@ $("#use-to-current").click(function() {
     const self = $(this);
     self.attr('disabled', 'disabled');
     let selectedNode = projectObj.mainController.tree.selected;
-    // 获取原名称
-    const name = selectedNode.data.name.split("\n");
-    pageCCOprObj.nameCache = name[0] !== undefined ? name[0] : "";
     // 操作内容
     pageCCOprObj.setCharacterBySetting(selectedNode, setting);
 
@@ -154,10 +151,6 @@ $("#use-to-all").click(function() {
             item.data.itemCharacter === undefined || item.data.itemCharacter.length <= 0 || item.data.code === undefined) {
             continue;
         }
-        // 获取原名称
-        const name = item.data.name.split("\n");
-        pageCCOprObj.nameCache = name[0] !== undefined ? name[0] : "";
-
         pageCCOprObj.setCharacterBySetting(item, setting);
     }
 });