Skip to content

Commit

Permalink
fix 确认框 BUG
Browse files Browse the repository at this point in the history
  • Loading branch information
@nullice
nullice committed May 12, 2017
1 parent 42a7395 commit 47e6fdc
Show file tree
Hide file tree
Showing 7 changed files with 196 additions and 136 deletions.
293 changes: 179 additions & 114 deletions DVE/.idea/workspace.xml
View file

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions DVE/Caryon/dataCaryon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var DataCaryon = function ()
set: function (x)
{

var oldId = this._nowDoucmentId
var oldId = this._nowDoucmentId
if (x != undefined)
{
if (this._layers[x] == undefined)
Expand All @@ -54,19 +54,16 @@ var DataCaryon = function ()
}


if(this._vars[oldId] == undefined)
{
this._vars[oldId] = _.cloneDeep(varSystem.vars)
}
this._vars[oldId] = _.cloneDeep(varSystem.vars)

if (this._vars[x] == undefined)
{
this._doc[x] = {}
varSystem.loadVarsFromObject( this._vars[x])
varSystem.loadVarsFromObject(this._vars[x])

} else
{
varSystem.loadVarsFromObject( this._vars[x])
varSystem.loadVarsFromObject(this._vars[x])
}


Expand Down
3 changes: 0 additions & 3 deletions DVE/Caryon/renderCaryon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,13 +552,11 @@ RenderCaryon.prototype.renderDocument = async function (varUpdateMode, varUpdate
{
await _asDo(assignment, [x])
}

async function _asDo(object, names)
{
// console.info("_asDo4 - names:", names, object)
var assignmentValue = OBJ.getObjectValueByNames(object, names);
// console.info("assignmentValue:", assignmentValue)

try
{
if (TYP.type(assignmentValue) == "object")
Expand All @@ -570,7 +568,6 @@ RenderCaryon.prototype.renderDocument = async function (varUpdateMode, varUpdate
await _asDo(object, names.concat(_x))
}
}

} else
{
var enable = OBJ.getObjectValueByNames(enableAssigns, names);
Expand Down
11 changes: 5 additions & 6 deletions DVE/bin/JS/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10828,9 +10828,7 @@ var DataCaryon = function DataCaryon() {
this.doc = this._doc[x];
}

if (this._vars[oldId] == undefined) {
this._vars[oldId] = _.cloneDeep(varSystem.vars);
}
this._vars[oldId] = _.cloneDeep(varSystem.vars);

if (this._vars[x] == undefined) {
this._doc[x] = {};
Expand Down Expand Up @@ -25473,7 +25471,8 @@ exports.default = {

var self = this;

var data = [{ name: "", type: "notetext", html: Lang.from("是否真的要清空变量列表?") }];
var data = [{ name: "", type: "textnote", html: Lang.from("是否真的要清空变量列表?") }];

UI_action.show_message_input("layer_selector", "确认", data, ok_func);

function ok_func(data, doneFunc) {
Expand Down Expand Up @@ -32823,7 +32822,7 @@ module.exports = "\n<div class=\"message-box-bubbble animated fadeInDown messag
/* 527 */
/***/ (function(module, exports) {

module.exports = "\n\n\n<div class=\"message-box-input message-color-{{msg_color}}\">\n\n <!--animated zoomIn-->\n <div class=\"message-window-input \">\n <h2 class=\"message-title\">{{msg_title}}</h2>\n <div class=\"message-msg\">{{{msg}}}</div>\n <bubble-box v-if=\"o_msg_bubble.input_box.show\"\n v-bind:msg=\"o_msg_bubble.input_box.msg\"\n v-bind:msg_title=\"o_msg_bubble.input_box.title\"\n v-bind:msg_color=\"o_msg_bubble.input_box.color\"\n ></bubble-box>\n <div class=\"input_item\" v-for=\"item in msg_input_data\"\n v-bind:class=\"{'textarea-big':item.type=='textareaBig'}\">\n <span v-if=\"item.type!='checkbox'\">{{item.name}}</span>\n <input v-if=\"item.type=='text'\" type=\"text\" class=\"exmo_input_text\"\n placeholder=\"{{item.placeholder||''}}\"\n v-model=\"item.value\"\n v-on:change=\"change_verify(item.varify, item.value, $event)\">\n <!--v-on:change=\"(item.verify!=undefined)?item.verify(item.value,$event):null-->\n\n\n <select v-if=\"item.type=='select'\" name=\"select\" class=\"exmo_select\" v-model=\"item.select\">\n <option v-for=\"option in item.options\" v-bind:value=\"option.value\">\n {{ option.text }}\n </option>\n </select>\n <label v-if=\"item.type=='checkbox'\" class=\"exmo_checkbox\">\n <input type=\"checkbox\" v-model=\"item.checked\">\n <div class=\"exmo_checkbox_shadow\"></div>\n {{item.name}}\n </label>\n\n <div class=\"notetext\" v-if=\"(item.type=='note')&&msg_input_data[item.value].checked\">\n {{item.note}}{{{item.html}}}\n </div>\n\n <div class=\"user-seletc-files-but\" v-if=\"(item.type=='addfiles') \">\n <button title=\"打开填充模板文件夹\" class=\"exmo_button_icon mini\"\n v-on:click=\"addFiles(item.dataIndex)\">\n <i class=\"icon-layer-group-collapsed\"></i>\n </button>\n\n </div>\n\n\n <div class=\"value_input_textarea_box\">\n\n <textarea\n v-if=\"item.type=='textarea'||item.type=='textareaBig'\"\n v-model=\"item.value\"\n class=\"exmo_inbox value_input_box\"\n v-bind:cows=\"item.cows||2\"\n ></textarea>\n </div>\n\n\n </div>\n\n <div class=\"button_bar\">\n <button class=\"exmo_button\" v-on:click=\"ok\">{{\"确定\" || lang}}</button>\n <button class=\"exmo_button\" v-on:click=\"cancel\">{{\"返回\" || lang}}</button>\n </div>\n </div>\n</div>\n";
module.exports = "\n\n\n<div class=\"message-box-input message-color-{{msg_color}}\">\n\n <!--animated zoomIn-->\n <div class=\"message-window-input \">\n <h2 class=\"message-title\">{{msg_title}}</h2>\n <div class=\"message-msg\">{{{msg}}}</div>\n <bubble-box v-if=\"o_msg_bubble.input_box.show\"\n v-bind:msg=\"o_msg_bubble.input_box.msg\"\n v-bind:msg_title=\"o_msg_bubble.input_box.title\"\n v-bind:msg_color=\"o_msg_bubble.input_box.color\"\n ></bubble-box>\n <div class=\"input_item\" v-for=\"item in msg_input_data\"\n v-bind:class=\"{'textarea-big':item.type=='textareaBig'}\">\n <span v-if=\"item.type!='checkbox'\">{{item.name}}</span>\n <input v-if=\"item.type=='text'\" type=\"text\" class=\"exmo_input_text\"\n placeholder=\"{{item.placeholder||''}}\"\n v-model=\"item.value\"\n v-on:change=\"change_verify(item.varify, item.value, $event)\">\n <!--v-on:change=\"(item.verify!=undefined)?item.verify(item.value,$event):null-->\n\n\n <select v-if=\"item.type=='select'\" name=\"select\" class=\"exmo_select\" v-model=\"item.select\">\n <option v-for=\"option in item.options\" v-bind:value=\"option.value\">\n {{ option.text }}\n </option>\n </select>\n <label v-if=\"item.type=='checkbox'\" class=\"exmo_checkbox\">\n <input type=\"checkbox\" v-model=\"item.checked\">\n <div class=\"exmo_checkbox_shadow\"></div>\n {{item.name}}\n </label>\n\n <div class=\"notetext\" v-if=\"(item.type=='note')&&msg_input_data[item.value].checked\">\n {{item.note}} {{{item.html}}}\n </div>\n\n <div class=\"notetext\" v-if=\"(item.type=='textnote')\">\n {{item.note}} {{{item.html}}}\n </div>\n\n\n <div class=\"user-seletc-files-but\" v-if=\"(item.type=='addfiles') \">\n <button title=\"打开填充模板文件夹\" class=\"exmo_button_icon mini\"\n v-on:click=\"addFiles(item.dataIndex)\">\n <i class=\"icon-layer-group-collapsed\"></i>\n </button>\n\n </div>\n\n\n <div class=\"value_input_textarea_box\">\n\n <textarea\n v-if=\"item.type=='textarea'||item.type=='textareaBig'\"\n v-model=\"item.value\"\n class=\"exmo_inbox value_input_box\"\n v-bind:cows=\"item.cows||2\"\n ></textarea>\n </div>\n\n\n </div>\n\n <div class=\"button_bar\">\n <button class=\"exmo_button\" v-on:click=\"ok\">{{\"确定\" || lang}}</button>\n <button class=\"exmo_button\" v-on:click=\"cancel\">{{\"返回\" || lang}}</button>\n </div>\n </div>\n</div>\n";

/***/ }),
/* 528 */
Expand Down Expand Up @@ -32877,7 +32876,7 @@ module.exports = "\n\n<a-area area_title=\"设置\" area_id=\"setting_set_panel\
/* 536 */
/***/ (function(module, exports) {

module.exports = "\n\n\n<input-box\n v-if=\"o_msg_input.var_panel.show\"\n v-bind:msg_title=\"o_msg_input.var_panel.title\"\n v-bind:msg_input_data=\"o_msg_input.var_panel.data\"\n v-bind:msg_callback=\"o_msg_input.var_panel.callback\"\n v-bind:msg_mode=\"o_msg_input.var_panel\"\n v-bind:msg=\"o_msg_input.var_panel.msg\"\n>\n</input-box>\n\n\n<input-box\n v-if=\"o_msg_input.var_edit.show\"\n v-bind:msg_title=\"o_msg_input.var_edit.title\"\n v-bind:msg_input_data=\"o_msg_input.var_edit.data\"\n v-bind:msg_callback=\"o_msg_input.var_edit.callback\"\n v-bind:msg_mode=\"o_msg_input.var_edit\"\n v-bind:msg=\"o_msg_input.var_edit.msg\"\n>\n</input-box>\n\n\n<a-area area_title=\"变量列表\" area_id=\"var_panel\"\n v-bind:area_suspend=\"true\"\n v-bind:area_disable_fixbut=\"true\"\n v-bind:area_disable_fixbut_max=\"true\"\n\n>\n\n <var-option-menu>\n </var-option-menu>\n\n\n\n\n\n <bubble-box v-if=\"o_msg_bubble.var_panel.show\"\n v-bind:msg=\"o_msg_bubble.var_panel.msg\"\n v-bind:msg_title=\"o_msg_bubble.var_panel.title\"\n v-bind:msg_color=\"o_msg_bubble.var_panel.color\"\n ></bubble-box>\n\n\n <div class=\"var_tool\">\n <button v-on:click=\"add_new_var\" class=\"exmo_button_icon mini\"><i class=\"icon-add-new\"></i></button>\n </div>\n\n\n <div class=\"var_list_filter\">\n <span class=\"icon\" title=\"{{'过滤名称'|lang}}\"><i class=\"icon-filter\"></i></span>\n <input type=\"text\" title=\"{{'过滤名称'|lang}}\" class=\"exmo_input_text \" v-model=\"o_filter_key\">\n </div>\n <div class=\"var_list\">\n <!--todo:计划增加拼音、假名过滤支持-->\n <div class=\"var_item\" v-for=\"a_var in vars | filterBy o_filter_key in 'name'\">\n <edit-text-label\n v-bind:in_value.sync=\"$key\"\n display_class=\"var_name cell\"\n edit_class=\"var_name cell\"\n v-bind:edit_set_func=\"o_set_func_name\"\n ></edit-text-label>\n\n\n <edit-text-label\n v-bind:class_switch_1=\"a_var.isFormula ? 'formula' :''\"\n v-bind:in_value.sync=\"a_var.value\"\n display_class=\"var_value cell\"\n edit_class=\"var_value cell\"\n v-bind:var_name=\"$key\"\n ></edit-text-label>\n\n <button v-on:click=\"delete_a_var($key)\" class=\"exmo_button_icon mini var_delete\"><i\n class=\"icon-close\"></i></button>\n </div>\n </div>\n\n</a-area>\n";
module.exports = "\n\n\n<input-box\n v-if=\"o_msg_input.var_panel.show\"\n v-bind:msg_title=\"o_msg_input.var_panel.title\"\n v-bind:msg_input_data=\"o_msg_input.var_panel.data\"\n v-bind:msg_callback=\"o_msg_input.var_panel.callback\"\n v-bind:msg_mode=\"o_msg_input.var_panel\"\n v-bind:msg=\"o_msg_input.var_panel.msg\"\n>\n</input-box>\n\n\n<input-box\n v-if=\"o_msg_input.var_edit.show\"\n v-bind:msg_title=\"o_msg_input.var_edit.title\"\n v-bind:msg_input_data=\"o_msg_input.var_edit.data\"\n v-bind:msg_callback=\"o_msg_input.var_edit.callback\"\n v-bind:msg_mode=\"o_msg_input.var_edit\"\n v-bind:msg=\"o_msg_input.var_edit.msg\"\n>\n</input-box>\n\n\n<a-area area_title=\"变量列表\" area_id=\"var_panel\"\n v-bind:area_suspend=\"true\"\n v-bind:area_disable_fixbut=\"true\"\n v-bind:area_disable_fixbut_max=\"true\"\n\n>\n\n <var-option-menu>\n </var-option-menu>\n\n <bubble-box v-if=\"o_msg_bubble.var_panel.show\"\n v-bind:msg=\"o_msg_bubble.var_panel.msg\"\n v-bind:msg_title=\"o_msg_bubble.var_panel.title\"\n v-bind:msg_color=\"o_msg_bubble.var_panel.color\"\n ></bubble-box>\n\n\n <div class=\"var_tool\">\n <button v-on:click=\"add_new_var\" class=\"exmo_button_icon mini\"><i class=\"icon-add-new\"></i></button>\n </div>\n\n\n <div class=\"var_list_filter\">\n <span class=\"icon\" title=\"{{'过滤名称'|lang}}\"><i class=\"icon-filter\"></i></span>\n <input type=\"text\" title=\"{{'过滤名称'|lang}}\" class=\"exmo_input_text \" v-model=\"o_filter_key\">\n </div>\n <div class=\"var_list\">\n <!--todo:计划增加拼音、假名过滤支持-->\n <div class=\"var_item\" v-for=\"a_var in vars | filterBy o_filter_key in 'name'\">\n <edit-text-label\n v-bind:in_value.sync=\"$key\"\n display_class=\"var_name cell\"\n edit_class=\"var_name cell\"\n v-bind:edit_set_func=\"o_set_func_name\"\n ></edit-text-label>\n\n\n <edit-text-label\n v-bind:class_switch_1=\"a_var.isFormula ? 'formula' :''\"\n v-bind:in_value.sync=\"a_var.value\"\n display_class=\"var_value cell\"\n edit_class=\"var_value cell\"\n v-bind:var_name=\"$key\"\n ></edit-text-label>\n\n <button v-on:click=\"delete_a_var($key)\" class=\"exmo_button_icon mini var_delete\"><i\n class=\"icon-close\"></i></button>\n </div>\n </div>\n\n</a-area>\n";

/***/ }),
/* 537 */
Expand Down
7 changes: 6 additions & 1 deletion DVE/components/MessageBox/InputBox.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,14 @@
</label>

<div class="notetext" v-if="(item.type=='note')&&msg_input_data[item.value].checked">
{{item.note}}{{{item.html}}}
{{item.note}} {{{item.html}}}
</div>

<div class="notetext" v-if="(item.type=='textnote')">
{{item.note}} {{{item.html}}}
</div>


<div class="user-seletc-files-but" v-if="(item.type=='addfiles') ">
<button title="打开填充模板文件夹" class="exmo_button_icon mini"
v-on:click="addFiles(item.dataIndex)">
Expand Down
4 changes: 0 additions & 4 deletions DVE/components/VarPanel.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@
<var-option-menu>
</var-option-menu>





<bubble-box v-if="o_msg_bubble.var_panel.show"
v-bind:msg="o_msg_bubble.var_panel.msg"
v-bind:msg_title="o_msg_bubble.var_panel.title"
Expand Down
3 changes: 2 additions & 1 deletion DVE/components/VarPanel_optionMenu.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,9 @@
var self = this;
var data = [
{name: "", type: "notetext", html: Lang.from("是否真的要清空变量列表?")},
{name: "", type: "textnote", html: Lang.from("是否真的要清空变量列表?")},
]
UI_action.show_message_input("layer_selector", "确认", data, ok_func)
function ok_func(data, doneFunc)
Expand Down

0 comments on commit 47e6fdc

Please sign in to comment.