[DE] Fix 51187

This commit is contained in:
Julia Radzhabova 2021-11-13 14:59:46 +03:00
parent 7777208da6
commit 8384644e01
2 changed files with 35 additions and 13 deletions

View file

@ -1,15 +1,15 @@
<table cols="1"> <table cols="1">
<tr> <tr class="no-form">
<td> <td>
<label class="header"><%= scope.strFill %></label> <label class="header"><%= scope.strFill %></label>
</td> </td>
</tr> </tr>
<tr> <tr class="no-form">
<td class="padding-small"> <td class="padding-small">
<div id="shape-combo-fill-src" style="width: 100%;"></div> <div id="shape-combo-fill-src" style="width: 100%;"></div>
</td> </td>
</tr> </tr>
<tr> <tr class="no-form">
<td> <td>
<div id="shape-panel-color-fill" class="padding-small" style="width: 100%;"> <div id="shape-panel-color-fill" class="padding-small" style="width: 100%;">
<div id="shape-back-color-btn" style=""></div> <div id="shape-back-color-btn" style=""></div>
@ -99,7 +99,7 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr class="no-form">
<td> <td>
<div class="padding-small" id="shape-panel-transparent-fill" style="width: 100%;"> <div class="padding-small" id="shape-panel-transparent-fill" style="width: 100%;">
<label class="header" style="display:block;"><%= scope.strTransparency %></label> <label class="header" style="display:block;"><%= scope.strTransparency %></label>
@ -112,17 +112,17 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr class="no-form">
<td class="padding-small"> <td class="padding-small">
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr> <tr class="no-form">
<td> <td>
<label class="header"><%= scope.strStroke %></label> <label class="header"><%= scope.strStroke %></label>
</td> </td>
</tr> </tr>
<tr> <tr class="no-form">
<td class="padding-small"> <td class="padding-small">
<div style="display:inline-block;width:100px;vertical-align: middle;"> <div style="display:inline-block;width:100px;vertical-align: middle;">
<label class="input-label" style=""><%= scope.strSize %></label> <label class="input-label" style=""><%= scope.strSize %></label>
@ -134,7 +134,7 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr class="no-form">
<td class="padding-small"> <td class="padding-small">
<div style="display:inline-block;width:100px;vertical-align: middle;"> <div style="display:inline-block;width:100px;vertical-align: middle;">
<label class="input-label" style=""><%= scope.strType %></label> <label class="input-label" style=""><%= scope.strType %></label>
@ -142,7 +142,7 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr class="shape-only"> <tr class="shape-only-separator">
<td class="padding-small"> <td class="padding-small">
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
@ -203,12 +203,12 @@
<div id="shape-btn-change" style="display: inline-block; float:right;"></div> <div id="shape-btn-change" style="display: inline-block; float:right;"></div>
</td> </td>
</tr> </tr>
<tr> <tr class="no-form">
<td class="padding-small" colspan=2> <td class="padding-small" colspan=2>
<div class="separator horizontal"></div> <div class="separator horizontal"></div>
</td> </td>
</tr> </tr>
<tr> <tr class="no-form">
<td class="padding-small" colspan=2> <td class="padding-small" colspan=2>
<div id="shape-checkbox-shadow"></div> <div id="shape-checkbox-shadow"></div>
</td> </td>

View file

@ -102,7 +102,8 @@ define([
DisabledControls: false, DisabledControls: false,
HideShapeOnlySettings: false, HideShapeOnlySettings: false,
HideChangeTypeSettings: false, HideChangeTypeSettings: false,
isFromImage: false isFromImage: false,
isFixedForm: false
}; };
this.lockedControls = []; this.lockedControls = [];
this._locked = false; this._locked = false;
@ -143,6 +144,8 @@ define([
this.TransparencyContainer = $('#shape-panel-transparent-fill'); this.TransparencyContainer = $('#shape-panel-transparent-fill');
this.ShapeOnlySettings = $('.shape-only'); this.ShapeOnlySettings = $('.shape-only');
this.CanChangeType = $('.change-type'); this.CanChangeType = $('.change-type');
this.NoFormSettings = $('.no-form');
this.ShapeOnlySeparator = $('.shape-only-separator');
}, },
setApi: function(api) { setApi: function(api) {
@ -764,6 +767,7 @@ define([
(new DE.Views.ImageSettingsAdvanced( (new DE.Views.ImageSettingsAdvanced(
{ {
imageProps: elValue, imageProps: elValue,
api: me.api,
sectionProps: me.api.asc_GetSectionProps(), sectionProps: me.api.asc_GetSectionProps(),
handler: function(result, value) { handler: function(result, value) {
if (result == 'ok') { if (result == 'ok') {
@ -790,6 +794,15 @@ define([
if (this._initSettings) if (this._initSettings)
this.createDelayedElements(); this.createDelayedElements();
var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null;
if (control_props) {
var spectype = control_props.get_SpecificType();
control_props = (spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.ComboBox ||
spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.None) &&
control_props.get_FormPr() && control_props.get_FormPr().get_Fixed();
} else
control_props = false;
if (props && props.get_ShapeProperties()) if (props && props.get_ShapeProperties())
{ {
var shapeprops = props.get_ShapeProperties(), var shapeprops = props.get_ShapeProperties(),
@ -805,7 +818,7 @@ define([
|| shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2' || shapetype=='bentConnector4' || shapetype=='bentConnector5' || shapetype=='curvedConnector2'
|| shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5' || shapetype=='curvedConnector3' || shapetype=='curvedConnector4' || shapetype=='curvedConnector5'
|| shapetype=='straightConnector1'; || shapetype=='straightConnector1';
this.hideChangeTypeSettings(hidechangetype); this.hideChangeTypeSettings(hidechangetype || control_props);
this._state.isFromImage = !!shapeprops.get_FromImage(); this._state.isFromImage = !!shapeprops.get_FromImage();
if (!hidechangetype && this.btnChangeShape.menu.items.length) { if (!hidechangetype && this.btnChangeShape.menu.items.length) {
this.btnChangeShape.menu.items[0].setVisible(shapeprops.get_FromImage()); this.btnChangeShape.menu.items[0].setVisible(shapeprops.get_FromImage());
@ -1189,6 +1202,8 @@ define([
this._noApply = false; this._noApply = false;
} }
this.hideNoFormSettings(control_props);
this.ShapeOnlySeparator.toggleClass('hidden', (control_props || this._state.HideShapeOnlySettings)==true);
}, },
createDelayedControls: function() { createDelayedControls: function() {
@ -1959,6 +1974,13 @@ define([
} }
}, },
hideNoFormSettings: function(value) {
if (this._state.isFixedForm !== value) {
this._state.isFixedForm = value;
this.NoFormSettings.toggleClass('hidden', value==true);
}
},
onPositionChange: function(btn) { onPositionChange: function(btn) {
var pos = btn.getNumberValue(), var pos = btn.getNumberValue(),
minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1], minValue = (this.GradColor.currentIdx-1<0) ? 0 : this.GradColor.values[this.GradColor.currentIdx-1],