diff --git a/package-lock.json b/package-lock.json
index 686d07b..851bd58 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,15 @@
{
"name": "ddei-editor",
- "version": "1.2.41-2",
+ "version": "1.2.41-3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "ddei-editor",
- "version": "1.2.41-2",
+ "version": "1.2.41-3",
"license": "Apache License 2.0",
"dependencies": {
- "ddei-framework": "^1.2.41-2"
+ "ddei-framework": "^1.2.41-4"
},
"devDependencies": {
"@tsconfig/node18": "^18.2.0",
@@ -518,9 +518,9 @@
"integrity": "sha512-tdMuLdcJyreope1BWfnYqTQaIkSIrU/KtY9yX5mNGd+tYeJ0Y99ARHDuYnEABPX/8yh/r0Kl169v5ODg2vr98g=="
},
"node_modules/ddei-framework": {
- "version": "1.2.41-2",
- "resolved": "https://registry.npmjs.org/ddei-framework/-/ddei-framework-1.2.41-2.tgz",
- "integrity": "sha512-KlS5hYiXAHqu2Q67TTpOCFAQgvGZmajZsPSwbIlmQRM5ALc5KCoNhv68Ar98w9rmKjVKWIHpfq4C/pWL00sluw==",
+ "version": "1.2.41-4",
+ "resolved": "https://registry.npmjs.org/ddei-framework/-/ddei-framework-1.2.41-4.tgz",
+ "integrity": "sha512-kcQjHWHdOp2e3N7EBFvedcs93pHtirsaMVZkhTxDWMztnaw8ZS5ddeM1A7FI2BW2KJna3sXmpZ+LfYyru0Lbow==",
"dependencies": {
"ddei-autolink": "^1.1.1",
"lodash": "^4.17.21",
diff --git a/package.json b/package.json
index 322c62d..bb4ade6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "ddei-editor",
- "version": "1.2.41-2",
+ "version": "1.2.41-4",
"private": false,
"type": "module",
"author": "hoslay <3697355039@qq.com>",
@@ -49,7 +49,7 @@
"type-check": "vue-tsc --noEmit -p tsconfig.app.json --composite false"
},
"dependencies": {
- "ddei-framework": "^1.2.41-2"
+ "ddei-framework": "^1.2.41-4"
},
"devDependencies": {
"@tsconfig/node18": "^18.2.0",
diff --git a/plugins/search/SearchPanel.vue b/plugins/search/SearchPanel.vue
index 950adbe..1b09b73 100644
--- a/plugins/search/SearchPanel.vue
+++ b/plugins/search/SearchPanel.vue
@@ -13,7 +13,7 @@
autocomplete="off" />
-
@@ -375,9 +375,9 @@ export default {
.icon{
color:var(--icon);
- font-size: 16px;
- width:16px;
- height:16px;
+ font-size: 18px;
+ width:18px;
+ height:18px;
}
&-mode {
@@ -529,9 +529,9 @@ export default {
}
.icon {
- font-size: 16px;
- width: 16px;
- height: 16px
+ font-size: 18px;
+ width: 18px;
+ height: 18px
}
}
}
diff --git a/src/App.vue b/src/App.vue
index 5fb40cc..97bc420 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -22,7 +22,7 @@ export default defineComponent({
const options = markRaw({
// currentLayout: "ddei-core-layout-simple",
config: {
- ratio: 1, //默认缩放比例为150%
+ ratio: 1.2, //默认缩放比例为150%
paper:"A6",
"mark": "水印文本",
// EXT_STAGE_WIDTH: false,
@@ -46,20 +46,20 @@ export default defineComponent({
// }
{
id: "act_1",
- model: "102010",
+ model: "103011",
type: "emp_1",
text: "第一步",
- border: { color: "yellow", dash: [10, 10, 5, 5], width: 5 },
+ border: { color: "yellow", width: 2 },
fill: { color: "grey" },
},
{
id: "act_2",
- model: "102010",
+ model: "103010",
type: "emp_2",
width: 200,
height: 100,
text: "第二步",
- offsetY: -70,
+ offsetY: -100,
}
]
diff --git a/src/assets/fonts/iconfont/demo.css b/src/assets/fonts/iconfont/demo.css
deleted file mode 100644
index a67054a..0000000
--- a/src/assets/fonts/iconfont/demo.css
+++ /dev/null
@@ -1,539 +0,0 @@
-/* Logo 字体 */
-@font-face {
- font-family: "iconfont logo";
- src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
- src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
- url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
- url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
- url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
-}
-
-.logo {
- font-family: "iconfont logo";
- font-size: 160px;
- font-style: normal;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
-}
-
-/* tabs */
-.nav-tabs {
- position: relative;
-}
-
-.nav-tabs .nav-more {
- position: absolute;
- right: 0;
- bottom: 0;
- height: 42px;
- line-height: 42px;
- color: #666;
-}
-
-#tabs {
- border-bottom: 1px solid #eee;
-}
-
-#tabs li {
- cursor: pointer;
- width: 100px;
- height: 40px;
- line-height: 40px;
- text-align: center;
- font-size: 16px;
- border-bottom: 2px solid transparent;
- position: relative;
- z-index: 1;
- margin-bottom: -1px;
- color: #666;
-}
-
-
-#tabs .active {
- border-bottom-color: #f00;
- color: #222;
-}
-
-.tab-container .content {
- display: none;
-}
-
-/* 页面布局 */
-.main {
- padding: 30px 100px;
- width: 960px;
- margin: 0 auto;
-}
-
-.main .logo {
- color: #333;
- text-align: left;
- margin-bottom: 30px;
- line-height: 1;
- height: 110px;
- margin-top: -50px;
- overflow: hidden;
- *zoom: 1;
-}
-
-.main .logo a {
- font-size: 160px;
- color: #333;
-}
-
-.helps {
- margin-top: 40px;
-}
-
-.helps pre {
- padding: 20px;
- margin: 10px 0;
- border: solid 1px #e7e1cd;
- background-color: #fffdef;
- overflow: auto;
-}
-
-.icon_lists {
- width: 100% !important;
- overflow: hidden;
- *zoom: 1;
-}
-
-.icon_lists li {
- width: 100px;
- margin-bottom: 10px;
- margin-right: 20px;
- text-align: center;
- list-style: none !important;
- cursor: default;
-}
-
-.icon_lists li .code-name {
- line-height: 1.2;
-}
-
-.icon_lists .icon {
- display: block;
- height: 100px;
- line-height: 100px;
- font-size: 42px;
- margin: 10px auto;
- color: #333;
- -webkit-transition: font-size 0.25s linear, width 0.25s linear;
- -moz-transition: font-size 0.25s linear, width 0.25s linear;
- transition: font-size 0.25s linear, width 0.25s linear;
-}
-
-.icon_lists .icon:hover {
- font-size: 100px;
-}
-
-.icon_lists .svg-icon {
- /* 通过设置 font-size 来改变图标大小 */
- width: 1em;
- /* 图标和文字相邻时，垂直对齐 */
- vertical-align: -0.15em;
- /* 通过设置 color 来改变 SVG 的颜色/fill */
- fill: currentColor;
- /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
- normalize.css 中也包含这行 */
- overflow: hidden;
-}
-
-.icon_lists li .name,
-.icon_lists li .code-name {
- color: #666;
-}
-
-/* markdown 样式 */
-.markdown {
- color: #666;
- font-size: 14px;
- line-height: 1.8;
-}
-
-.highlight {
- line-height: 1.5;
-}
-
-.markdown img {
- vertical-align: middle;
- max-width: 100%;
-}
-
-.markdown h1 {
- color: #404040;
- font-weight: 500;
- line-height: 40px;
- margin-bottom: 24px;
-}
-
-.markdown h2,
-.markdown h3,
-.markdown h4,
-.markdown h5,
-.markdown h6 {
- color: #404040;
- margin: 1.6em 0 0.6em 0;
- font-weight: 500;
- clear: both;
-}
-
-.markdown h1 {
- font-size: 28px;
-}
-
-.markdown h2 {
- font-size: 22px;
-}
-
-.markdown h3 {
- font-size: 16px;
-}
-
-.markdown h4 {
- font-size: 14px;
-}
-
-.markdown h5 {
- font-size: 12px;
-}
-
-.markdown h6 {
- font-size: 12px;
-}
-
-.markdown hr {
- height: 1px;
- border: 0;
- background: #e9e9e9;
- margin: 16px 0;
- clear: both;
-}
-
-.markdown p {
- margin: 1em 0;
-}
-
-.markdown>p,
-.markdown>blockquote,
-.markdown>.highlight,
-.markdown>ol,
-.markdown>ul {
- width: 80%;
-}
-
-.markdown ul>li {
- list-style: circle;
-}
-
-.markdown>ul li,
-.markdown blockquote ul>li {
- margin-left: 20px;
- padding-left: 4px;
-}
-
-.markdown>ul li p,
-.markdown>ol li p {
- margin: 0.6em 0;
-}
-
-.markdown ol>li {
- list-style: decimal;
-}
-
-.markdown>ol li,
-.markdown blockquote ol>li {
- margin-left: 20px;
- padding-left: 4px;
-}
-
-.markdown code {
- margin: 0 3px;
- padding: 0 5px;
- background: #eee;
- border-radius: 3px;
-}
-
-.markdown strong,
-.markdown b {
- font-weight: 600;
-}
-
-.markdown>table {
- border-collapse: collapse;
- border-spacing: 0px;
- empty-cells: show;
- border: 1px solid #e9e9e9;
- width: 95%;
- margin-bottom: 24px;
-}
-
-.markdown>table th {
- white-space: nowrap;
- color: #333;
- font-weight: 600;
-}
-
-.markdown>table th,
-.markdown>table td {
- border: 1px solid #e9e9e9;
- padding: 8px 16px;
- text-align: left;
-}
-
-.markdown>table th {
- background: #F7F7F7;
-}
-
-.markdown blockquote {
- font-size: 90%;
- color: #999;
- border-left: 4px solid #e9e9e9;
- padding-left: 0.8em;
- margin: 1em 0;
-}
-
-.markdown blockquote p {
- margin: 0;
-}
-
-.markdown .anchor {
- opacity: 0;
- transition: opacity 0.3s ease;
- margin-left: 8px;
-}
-
-.markdown .waiting {
- color: #ccc;
-}
-
-.markdown h1:hover .anchor,
-.markdown h2:hover .anchor,
-.markdown h3:hover .anchor,
-.markdown h4:hover .anchor,
-.markdown h5:hover .anchor,
-.markdown h6:hover .anchor {
- opacity: 1;
- display: inline-block;
-}
-
-.markdown>br,
-.markdown>p>br {
- clear: both;
-}
-
-
-.hljs {
- display: block;
- background: white;
- padding: 0.5em;
- color: #333333;
- overflow-x: auto;
-}
-
-.hljs-comment,
-.hljs-meta {
- color: #969896;
-}
-
-.hljs-string,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-strong,
-.hljs-emphasis,
-.hljs-quote {
- color: #df5000;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-type {
- color: #a71d5d;
-}
-
-.hljs-literal,
-.hljs-symbol,
-.hljs-bullet,
-.hljs-attribute {
- color: #0086b3;
-}
-
-.hljs-section,
-.hljs-name {
- color: #63a35c;
-}
-
-.hljs-tag {
- color: #333333;
-}
-
-.hljs-title,
-.hljs-attr,
-.hljs-selector-id,
-.hljs-selector-class,
-.hljs-selector-attr,
-.hljs-selector-pseudo {
- color: #795da3;
-}
-
-.hljs-addition {
- color: #55a532;
- background-color: #eaffea;
-}
-
-.hljs-deletion {
- color: #bd2c00;
- background-color: #ffecec;
-}
-
-.hljs-link {
- text-decoration: underline;
-}
-
-/* 代码高亮 */
-/* PrismJS 1.15.0
-https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-code[class*="language-"],
-pre[class*="language-"] {
- color: black;
- background: none;
- text-shadow: 0 1px white;
- font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
- text-align: left;
- white-space: pre;
- word-spacing: normal;
- word-break: normal;
- word-wrap: normal;
- line-height: 1.5;
-
- -moz-tab-size: 4;
- -o-tab-size: 4;
- tab-size: 4;
-
- -webkit-hyphens: none;
- -moz-hyphens: none;
- -ms-hyphens: none;
- hyphens: none;
-}
-
-pre[class*="language-"]::-moz-selection,
-pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection,
-code[class*="language-"] ::-moz-selection {
- text-shadow: none;
- background: #b3d4fc;
-}
-
-pre[class*="language-"]::selection,
-pre[class*="language-"] ::selection,
-code[class*="language-"]::selection,
-code[class*="language-"] ::selection {
- text-shadow: none;
- background: #b3d4fc;
-}
-
-@media print {
-
- code[class*="language-"],
- pre[class*="language-"] {
- text-shadow: none;
- }
-}
-
-/* Code blocks */
-pre[class*="language-"] {
- padding: 1em;
- margin: .5em 0;
- overflow: auto;
-}
-
-:not(pre)>code[class*="language-"],
-pre[class*="language-"] {
- background: #f5f2f0;
-}
-
-/* Inline code */
-:not(pre)>code[class*="language-"] {
- padding: .1em;
- border-radius: .3em;
- white-space: normal;
-}
-
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
- color: slategray;
-}
-
-.token.punctuation {
- color: #999;
-}
-
-.namespace {
- opacity: .7;
-}
-
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
- color: #905;
-}
-
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
- color: #690;
-}
-
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
- color: #9a6e3a;
- background: hsla(0, 0%, 100%, .5);
-}
-
-.token.atrule,
-.token.attr-value,
-.token.keyword {
- color: #07a;
-}
-
-.token.function,
-.token.class-name {
- color: #DD4A68;
-}
-
-.token.regex,
-.token.important,
-.token.variable {
- color: #e90;
-}
-
-.token.important,
-.token.bold {
- font-weight: bold;
-}
-
-.token.italic {
- font-style: italic;
-}
-
-.token.entity {
- cursor: help;
-}
diff --git a/src/assets/fonts/iconfont/iconfont.css b/src/assets/fonts/iconfont/iconfont.css
index 8f29afa..0a8e0b0 100644
--- a/src/assets/fonts/iconfont/iconfont.css
+++ b/src/assets/fonts/iconfont/iconfont.css
@@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4428875 */
- src: url('iconfont.woff2?t=1728965872930') format('woff2'),
- url('iconfont.woff?t=1728965872930') format('woff'),
- url('iconfont.ttf?t=1728965872930') format('truetype');
+ src: url('iconfont.woff2?t=1729673442487') format('woff2'),
+ url('iconfont.woff?t=1729673442487') format('woff'),
+ url('iconfont.ttf?t=1729673442487') format('truetype');
}
.icon {
@@ -11,35 +11,35 @@
width: 26px;
height: 26px;
color: #424242;
- font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
+
+.icon-all-match:before {
+ content: "\e6ef";
+}
+
.icon-replace:before {
- content: "\e615";
+ content: "\e6ea";
+}
+
+.icon-shoucang:before {
+ content: "\e6e8";
}
.icon-replace-all:before {
- content: "\e6dd";
-}
-
-.icon-all-match:before {
- content: "\e633";
+ content: "\e6e3";
}
.icon-zhihuan:before {
- content: "\e6dc";
+ content: "\e6e0";
}
.icon-shapes:before {
content: "\e63a";
}
-.icon-shoucang:before {
- content: "\e6db";
-}
-
.icon-text-underline:before {
content: "\e700";
}
diff --git a/src/assets/fonts/iconfont/iconfont.js b/src/assets/fonts/iconfont/iconfont.js
index 1f94d19..b35b7eb 100644
--- a/src/assets/fonts/iconfont/iconfont.js
+++ b/src/assets/fonts/iconfont/iconfont.js
@@ -1 +1 @@
-window._iconfont_svg_string_4428875='',(l=>{var a=(h=(h=document.getElementsByTagName("script"))[h.length-1]).getAttribute("data-injectcss"),h=h.getAttribute("data-disable-injectsvg");if(!h){var t,o,i,p,z,v=function(a,h){h.parentNode.insertBefore(a,h)};if(a&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}t=function(){var a,h=document.createElement("div");h.innerHTML=l._iconfont_svg_string_4428875,(h=h.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",h=h,(a=document.body).firstChild?v(h,a.firstChild):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),t()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=t,p=l.document,z=!1,m(),p.onreadystatechange=function(){"complete"==p.readyState&&(p.onreadystatechange=null,d())})}function d(){z||(z=!0,i())}function m(){try{p.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}d()}})(window);
\ No newline at end of file
+window._iconfont_svg_string_4428875='',(l=>{var a=(h=(h=document.getElementsByTagName("script"))[h.length-1]).getAttribute("data-injectcss"),h=h.getAttribute("data-disable-injectsvg");if(!h){var t,o,i,p,z,v=function(a,h){h.parentNode.insertBefore(a,h)};if(a&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}t=function(){var a,h=document.createElement("div");h.innerHTML=l._iconfont_svg_string_4428875,(h=h.getElementsByTagName("svg")[0])&&(h.setAttribute("aria-hidden","true"),h.style.position="absolute",h.style.width=0,h.style.height=0,h.style.overflow="hidden",h=h,(a=document.body).firstChild?v(h,a.firstChild):a.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(t,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),t()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=t,p=l.document,z=!1,m(),p.onreadystatechange=function(){"complete"==p.readyState&&(p.onreadystatechange=null,d())})}function d(){z||(z=!0,i())}function m(){try{p.documentElement.doScroll("left")}catch(a){return void setTimeout(m,50)}d()}})(window);
\ No newline at end of file
diff --git a/src/assets/fonts/iconfont/iconfont.json b/src/assets/fonts/iconfont/iconfont.json
index a4720d5..b572041 100644
--- a/src/assets/fonts/iconfont/iconfont.json
+++ b/src/assets/fonts/iconfont/iconfont.json
@@ -6,32 +6,39 @@
"description": "",
"glyphs": [
{
- "icon_id": "1615636",
- "name": "查找替换",
- "font_class": "replace",
- "unicode": "e615",
- "unicode_decimal": 58901
- },
- {
- "icon_id": "1630982",
- "name": "替换图片",
- "font_class": "replace-all",
- "unicode": "e6dd",
- "unicode_decimal": 59101
- },
- {
- "icon_id": "31190539",
+ "icon_id": "42187195",
"name": "全字匹配",
"font_class": "all-match",
- "unicode": "e633",
- "unicode_decimal": 58931
+ "unicode": "e6ef",
+ "unicode_decimal": 59119
},
{
- "icon_id": "15727001",
+ "icon_id": "42187201",
+ "name": "寻找替换",
+ "font_class": "replace",
+ "unicode": "e6ea",
+ "unicode_decimal": 59114
+ },
+ {
+ "icon_id": "42187204",
+ "name": "收藏",
+ "font_class": "shoucang",
+ "unicode": "e6e8",
+ "unicode_decimal": 59112
+ },
+ {
+ "icon_id": "42187207",
+ "name": "替换图片",
+ "font_class": "replace-all",
+ "unicode": "e6e3",
+ "unicode_decimal": 59107
+ },
+ {
+ "icon_id": "42187210",
"name": "置换",
"font_class": "zhihuan",
- "unicode": "e6dc",
- "unicode_decimal": 59100
+ "unicode": "e6e0",
+ "unicode_decimal": 59104
},
{
"icon_id": "38790387",
@@ -40,13 +47,6 @@
"unicode": "e63a",
"unicode_decimal": 58938
},
- {
- "icon_id": "658040",
- "name": "收藏",
- "font_class": "shoucang",
- "unicode": "e6db",
- "unicode_decimal": 59099
- },
{
"icon_id": "39184664",
"name": "下划线",
diff --git a/src/assets/fonts/iconfont/iconfont.ttf b/src/assets/fonts/iconfont/iconfont.ttf
index 59b4250..c919772 100644
Binary files a/src/assets/fonts/iconfont/iconfont.ttf and b/src/assets/fonts/iconfont/iconfont.ttf differ
diff --git a/src/assets/fonts/iconfont/iconfont.woff b/src/assets/fonts/iconfont/iconfont.woff
index 8327965..ebb3324 100644
Binary files a/src/assets/fonts/iconfont/iconfont.woff and b/src/assets/fonts/iconfont/iconfont.woff differ
diff --git a/src/assets/fonts/iconfont/iconfont.woff2 b/src/assets/fonts/iconfont/iconfont.woff2
index 4cdbc97..6655907 100644
Binary files a/src/assets/fonts/iconfont/iconfont.woff2 and b/src/assets/fonts/iconfont/iconfont.woff2 differ