yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "设计器 模型宽度数字变字符串导致报错问题"

Browse Source 
This reverts commit f6f57b225d.
This commit is contained in:
qinoy 2023-11-08 09:17:22 +08:00
parent f6f57b225d
commit 3c25d84a35
3 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
com.actionsoft.apps.coe.pal/method/control.policy/diagram.attribute.custom.xml
View File

@ -5,11 +5,11 @@
<attribute key="R_Organizational_and_role_responsibilities" title="组织/角色职责" type="string" value="" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true" desc="组织/角色职责" isRequired="true"/>
<attribute key="versions" title="版本" type="string" value="" desc="版本" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Drafted_and_revised_by" title="拟制/修订人" type="string" value="" desc="拟制/修订人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="流程架构L1" isRequired="true" ref="" readonly="true" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Process_Architecture_L1" title="流程架构L1" type="string" value="" desc="流程架构L1" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Process_Architecture_L2" title="流程架构L2" type="string" value="" desc="流程架构L2" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="流程架构L3" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Process_Architecture_L4" title="流程架构L4" type="string" value="" desc="流程架构L4" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="auditor" title="审核人" type="string" value="" desc="审核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Process_Architecture_L3" title="流程架构L3" type="string" value="" desc="流程架构L3" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Process_Architecture_L4" title="流程架构L4" type="string" value="" desc="流程架构L4" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="auditor" title="审核人" type="string" value="" desc="审核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="reviewer" title="复核人" type="string" value="" desc="复核人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="approver" title="审批人" type="string" value="" desc="审批人" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="related_files" title="相关文件" type="relation" value="" desc="相关文件" isRequired="false" ref="{&quot;method&quot;:&quot;process&quot;,&quot;type&quot;:&quot;file&quot;,&quot;multiple&quot;:true}" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>
@ -23,11 +23,11 @@
<attribute key="content" title="内容" type="string" value="" desc="内容" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="company" title="编制单位" type="string" value="" desc="编制单位" isRequired="false" ref="" readonly="false" groupPath="organization" scope="*" isValid="true"/>
<attribute key="desc" title="描述" type="textarea" value="" desc="描述" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="Purpose" title="目的" type="textarea" value="" desc="目的" isRequired="true" ref="" readonly="true" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Purpose" title="目的" type="textarea" value="" desc="目的" isRequired="true" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="application" title="适用范围" type="textarea" value="" desc="适用范围" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%,*" isValid="true"/>
<attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="textarea" value="" desc="修订内容及理由" isRequired="true" ref="" readonly="true" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="Contents_and_reasons_for_revision" title="修订内容及理由" type="textarea" value="" desc="修订内容及理由" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="T_supplementary_articles" title="附则" type="textarea" value="" desc="附则" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="activity_number" title="活动序号" type="string" value="" desc="活动序号" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="*" isValid="true"/>
<attribute key="Out_related_files" title="外部相关文件" type="textarea" value="" desc="填写外部相关文件名称，多个用逗号隔开" isRequired="false" ref="" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="JYGLGY" title="相关经营管理纲要" type="select_m" value="" desc="请选择" isRequired="false" ref="【集团】全面价值经营,【集团】全面创新驱动,【奶粉】以消费者为中心，提供极致满意的消费体验,【奶粉】以高目标为引领，快速发展，只争第一,【奶粉】以共赢为指引，与合作伙伴建立长期利益共同体,【奶粉】以结果为导向，付出不亚于任何人的努力,【奶粉】以赢得市场竞争为驱动，成为一支有理想、有信念的强大团队,【酸奶】始终以消费者为中心，提供最优品质产品与最佳消费体验,【酸奶】视品牌为核心资产，让我们的品牌成为消费者的挚爱与首选,【酸奶】打造厂商命运共同体，构建稳固可持续发展的厂商生态圈,【酸奶】坚持高目标引领，直面竞争，只争第一,【酸奶】人人都是企业的经营者，不达目标誓不罢休,【酸奶】成为心中有理想、胸中有目标、敢打硬仗、能打胜仗、追求卓越的高绩效团队" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
<attribute key="JYGLGY" title="相关经营管理纲要" type="select_m" value="" desc="请选择" isRequired="false" ref="【集团】全面价值经营,【集团】全面创新驱动,【奶粉】以消费者为中心，提供极致满意的消费体验,【奶粉】以高目标为引领，快速发展，只争第一,【奶粉】以共赢为指引，与合作伙伴建立长期利益共同体,【奶粉】以结果为导向，付出不亚于任何人的努力,【奶粉】以赢得市场竞争为驱动，成为一支有理想、有信念的强大团队,【酸奶】始终以消费者为中心，提供最优品质产品与最佳消费体验,【酸奶】视品牌为核心资产，让我们的品牌成为消费者的挚爱与首选,【酸奶】打造厂商命运共同体，构建稳固可持续发展的厂商生态圈,【酸奶】坚持高目标引领，直面竞争，只争第一,【酸奶】人人都是企业的经营者，不达目标誓不罢休,【酸奶】成为心中有理想、胸中有目标、敢打硬仗、能打胜仗、追求卓越的高绩效团队" readonly="false" groupPath="baseAttribute" scope="%" isValid="true"/>
</attributes>

6
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.debug.js
View File

@ -75,12 +75,6 @@ var Designer = {
}
},
initCanvas: function() {
if (typeof Model.define.page.width == 'string') {
Model.define.page.width = parseFloat(Model.define.page.width);
}
if (typeof Model.define.page.height == 'string') {
Model.define.page.height = parseFloat(Model.define.page.height);
}
var q = Model.define.page.width.toScale();
var v = Model.define.page.height.toScale();
var B = Model.define.page.backgroundColor;

6
com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/scripts/diagraming/designer.core.js
View File

@ -75,12 +75,6 @@ var Designer = {
}
},
initCanvas: function () {
if (typeof Model.define.page.width == 'string') {
Model.define.page.width = parseFloat(Model.define.page.width);
}
if (typeof Model.define.page.height == 'string') {
Model.define.page.height = parseFloat(Model.define.page.height);
}
var q = Model.define.page.width.toScale();
var v = Model.define.page.height.toScale();
var B = Model.define.page.backgroundColor;