|
@@ -124,7 +124,7 @@ let contentOprObj = {
|
|
|
save: function (callback) {
|
|
|
let selectedNode = projectObj.mainController.tree.selected;
|
|
|
const setting = projectObj.project.property.addRule !== undefined ? projectObj.project.property.addRule : getAddRuleSetting();
|
|
|
- pageCCOprObj.setCharacterBySetting(contentOprObj, selectedNode, setting, callback);
|
|
|
+ pageCCOprObj.setCharacterBySetting(selectedNode, setting, callback, contentOprObj);
|
|
|
},
|
|
|
onEditEnded: function (sender, args) {
|
|
|
let me = contentOprObj;
|
|
@@ -498,7 +498,7 @@ let characterOprObj = {
|
|
|
save: function (callback) {
|
|
|
let selectedNode = projectObj.mainController.tree.selected;
|
|
|
const setting = projectObj.project.property.addRule !== undefined ? projectObj.project.property.addRule : getAddRuleSetting();
|
|
|
- pageCCOprObj.setCharacterBySetting(characterOprObj, selectedNode, setting, callback);
|
|
|
+ pageCCOprObj.setCharacterBySetting(selectedNode, setting, callback, characterOprObj);
|
|
|
},
|
|
|
onEditStart: function (sender, args) {
|
|
|
let me = characterOprObj;
|
|
@@ -822,9 +822,8 @@ let pageCCOprObj = {
|
|
|
* @param {Object} setting - 设置
|
|
|
* @return {void}
|
|
|
*/
|
|
|
- setCharacterBySetting: function(oprObj, node, setting, callback) {
|
|
|
+ setCharacterBySetting: function(node, setting, callback = null, oprObj = null) {
|
|
|
let self = this;
|
|
|
-
|
|
|
// 保存的条件数据
|
|
|
const findSet = { ID: node.data.ID, projectID: node.data.projectID };
|
|
|
const updateData = this.getCharacterUpdateData(setting, node);
|
|
@@ -843,7 +842,9 @@ let pageCCOprObj = {
|
|
|
node.data.name = updateData.name;
|
|
|
node.data.itemCharacterText = updateData.itemCharacterText;
|
|
|
node.data.jobContentText = updateData.jobContentText;
|
|
|
- pageCCOprObj.showData(oprObj.workBook.getSheet(0), oprObj.setting, oprObj.currentCache);//刷新特征及内容Spread
|
|
|
+ if (oprObj) {
|
|
|
+ pageCCOprObj.showData(oprObj.workBook.getSheet(0), oprObj.setting, oprObj.currentCache);//刷新特征及内容Spread
|
|
|
+ }
|
|
|
if(callback){
|
|
|
callback();
|
|
|
}
|