cloud-web-corejs 1.0.54-dev.743 → 1.0.54-dev.744

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.743",
+  "version": "1.0.54-dev.744",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/widget-panel/index.vue

@@ -14,7 +14,7 @@
                 <li v-for="(ctn, index) in containers" :key="index" class="container-widget-item"
                     :title="ctn.displayName"
                     @dblclick="addContainerByDbClick(ctn)">
-              <span><svg-icon :icon-class="ctn.icon" class-name="color-svg-icon"/>
+              <span><widget-icon :icon="ctn.icon"/>
                 <span>{{ i18n2t(`designer.widgetLabel.${ctn.type}`, `extension.widgetLabel.${ctn.type}`) }}</span>
               </span>
                 </li>
@@ -27,8 +27,7 @@
                          :clone="handleFieldWidgetClone" ghost-class="ghost" :sort="false">
                 <li v-for="(fld, index) in basicFields" :key="index" class="field-widget-item" :title="fld.displayName"
                     @dblclick="addFieldByDbClick(fld)">
-                  <span><svg-icon :icon-class="fld.icon"
-                                  class-name="color-svg-icon"/><span>{{
+                  <span><widget-icon :icon="fld.icon"/><span>{{
                       i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`)
                     }}</span></span>
                 </li>
@@ -42,7 +41,7 @@
                 <li v-for="(fld, index) in advancedFields" :key="index" class="field-widget-item"
                     :title="fld.displayName"
                     @dblclick="addFieldByDbClick(fld)">
-              <span><svg-icon :icon-class="fld.icon" class-name="color-svg-icon"/>
+              <span><widget-icon :icon="fld.icon"/>
               <span>{{ i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`) }}</span>
               </span>
                 </li>
@@ -57,7 +56,7 @@
                 <li v-for="(fld, index) in customFields" :key="index" class="field-widget-item" :title="fld.displayName"
                     @dblclick="addFieldByDbClick(fld)">
               <span>
-                <svg-icon :icon-class="fld.icon" class-name="color-svg-icon"/>
+                <widget-icon :icon="fld.icon"/>
                 <span>{{ i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`) }}</span>
               </span>
                 </li>
@@ -80,7 +79,7 @@
                 <li v-for="(ctn, index) in commonContainers" :key="index" class="container-widget-item"
                     :title="ctn.displayName"
                     @dblclick="addContainerByDbClick(ctn)">
-              <span><svg-icon :icon-class="ctn.icon" class-name="color-svg-icon"/>
+              <span><widget-icon :icon="ctn.icon"/>
                 <span>{{ i18n2t(`designer.widgetLabel.${ctn.type}`, `extension.widgetLabel.${ctn.type}`) }}</span>
               </span>
                 </li>
@@ -92,8 +91,7 @@
                          :clone="handleFieldWidgetClone" ghost-class="ghost" :sort="false">
                 <li v-for="(fld, index) in basicFields" :key="index" class="field-widget-item" :title="fld.displayName"
                     @dblclick="addFieldByDbClick(fld)">
-                  <span><svg-icon :icon-class="fld.icon"
-                                  class-name="color-svg-icon"/><span>{{
+                  <span><widget-icon :icon="fld.icon"/><span>{{
                       i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`)
                     }}</span></span>
                 </li>
@@ -106,7 +104,7 @@
                 <li v-for="(fld, index) in commonAdvancedFields" :key="index" class="field-widget-item"
                     :title="fld.displayName"
                     @dblclick="addFieldByDbClick(fld)">
-              <span><svg-icon :icon-class="fld.icon" class-name="color-svg-icon"/>
+              <span><widget-icon :icon="fld.icon"/>
               <span>{{ i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`) }}</span>
               </span>
                 </li>
@@ -123,8 +121,7 @@
                 <li v-for="(fld, index) in metaFields.main.fieldList" :key="index" class="field-widget-item"
                     :title="fld.displayName"
                     @dblclick="addFieldByDbClick(fld)">
-                  <span><svg-icon :icon-class="fld.icon"
-                                  class-name="color-svg-icon"/><span>{{ getMetaFieldLabel(fld) }}</span></span>
+                  <span><widget-icon :icon="fld.icon"/><span>{{ getMetaFieldLabel(fld) }}</span></span>
                 </li>
               </draggable>
             </el-collapse-item>
@@ -138,7 +135,7 @@
                   <li v-for="(fld, index) in item.fieldList" :key="index" class="field-widget-item"
                       :title="fld.displayName"
                       @dblclick="addFieldByDbClick(fld)">
-              <span><svg-icon :icon-class="fld.icon" class-name="color-svg-icon"/>
+              <span><widget-icon :icon="fld.icon"/>
               <span>{{ getMetaFieldLabel(fld) }}</span>
               </span>
                   </li>
@@ -157,7 +154,7 @@
                 <li v-for="(fld, index) in businessFields" :key="index" class="field-widget-item"
                     :title="fld.displayName"
                     @dblclick="addFieldByDbClick(fld)">
-              <span><svg-icon :icon-class="fld.icon" class-name="color-svg-icon"/>
+              <span><widget-icon :icon="fld.icon"/>
               <span>{{ i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`) }}</span>
               </span>
                 </li>
@@ -170,7 +167,7 @@
                 <li v-for="(fld, index) in compareFields" :key="index" class="field-widget-item"
                     :title="fld.displayName"
                     @dblclick="addFieldByDbClick(fld)">
-              <span><svg-icon :icon-class="fld.icon" class-name="color-svg-icon"/>
+              <span><widget-icon :icon="fld.icon"/>
               <span>{{ i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`) }}</span>
               </span>
                 </li>
@@ -212,6 +209,21 @@ export default {
   mixins: [indexMixin],
   components: {
     Draggable,
+    /* 面板组件图标：el-icon- 前缀渲染 element 字体图标，否则渲染 svg-icon */
+    WidgetIcon: {
+      name: "WidgetIcon",
+      functional: true,
+      props: { icon: String },
+      render(h, ctx) {
+        const icon = ctx.props.icon || "";
+        if (icon.indexOf("el-icon-") === 0) {
+          return h("i", { class: [icon, "color-svg-icon", "panel-el-icon"] });
+        }
+        return h("svg-icon", {
+          props: { iconClass: icon, className: "color-svg-icon" },
+        });
+      },
+    },
   },
   data() {
     return {
@@ -310,6 +322,13 @@ export default {
 
         }
 
+        i.panel-el-icon {
+          display: inline-block;
+          font-size: 1.25em;
+          vertical-align: middle;
+          margin-right: 5px;
+        }
+
         span > span {
           vertical-align: middle;
         }

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -1188,7 +1188,7 @@ export const basicFields = [
   },
   {
     type: "script-input",
-    icon: "code",
+    icon: "component",
     commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
@@ -3008,7 +3008,7 @@ export const advancedFields = [
   },
   {
     type: "autocomplete",
-    icon: "edit",
+    icon: "message",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -3019,7 +3019,7 @@ export const advancedFields = [
   },
   {
     type: "search_button",
-    icon: "search",
+    icon: "el-icon-search",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3064,7 +3064,7 @@ export const advancedFields = [
   {
     type: "save_button",
     targetType: "button",
-    icon: "save",
+    icon: "el-icon-check",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3105,7 +3105,7 @@ export const advancedFields = [
   {
     type: "reset_button",
     targetType: "button",
-    icon: "redo",
+    icon: "el-icon-refresh-right",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3141,7 +3141,7 @@ export const advancedFields = [
   },
   {
     type: "table-export-button",
-    icon: "list-export",
+    icon: "el-icon-upload",
     formItemFlag: !1,
     commonFlag: !0,
     columnFlag: true,
@@ -3170,7 +3170,7 @@ export const advancedFields = [
   },
   {
     type: "select-export-button",
-    icon: "export",
+    icon: "el-icon-upload",
     formItemFlag: !1,
     commonFlag: !0,
     columnFlag: true,
@@ -3201,7 +3201,7 @@ export const advancedFields = [
   },
   {
     type: "select-export-item-button",
-    icon: "document",
+    icon: "el-icon-upload",
     formItemFlag: !1,
     commonFlag: !0,
     columnFlag: true,
@@ -3233,7 +3233,7 @@ export const advancedFields = [
   {
     type: "add_button",
     targetType: "button",
-    icon: "add",
+    icon: "el-icon-plus",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3269,7 +3269,7 @@ export const advancedFields = [
   },
   {
     type: "import-button",
-    icon: "import",
+    icon: "el-icon-download",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3321,7 +3321,7 @@ export const advancedFields = [
   },
   {
     type: "import2-button",
-    icon: "excel",
+    icon: "el-icon-download",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3369,7 +3369,7 @@ export const advancedFields = [
   },
   {
     type: "print-button",
-    icon: "print",
+    icon: "el-icon-printer",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3410,7 +3410,7 @@ export const advancedFields = [
   },
   {
     type: "print-detail-button",
-    icon: "pdf",
+    icon: "el-icon-printer",
     commonFlag: !0,
     columnFlag: false,
     formItemFlag: !1,
@@ -3573,7 +3573,7 @@ export const advancedFields = [
 
   {
     type: "project-tag",
-    icon: "tag",
+    icon: "star",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -3612,7 +3612,7 @@ export const advancedFields = [
   },
   {
     type: "dropdown",
-    icon: "ico-more",
+    icon: "el-icon-arrow-down",
     commonFlag: !0,
     // columnFlag: true,
     widgetList: [],
@@ -3684,7 +3684,7 @@ export const advancedFields = [
 
   {
     type: "download-button",
-    icon: "download",
+    icon: "el-icon-download",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3990,7 +3990,7 @@ export const businessFields = [
   {
     type: "saleOrg-vabsearch",
     targetType: "singerSearch",
-    icon: "org",
+    icon: "tree",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -4035,7 +4035,7 @@ export const businessFields = [
   {
     type: "saleOrg-project-tag",
     targetType: "project-tag",
-    icon: "org",
+    icon: "tree",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -4056,7 +4056,7 @@ export const businessFields = [
   {
     type: "save_submit_wf_button",
     targetType: "button",
-    icon: "node-tree",
+    icon: "el-icon-video-play",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -4094,7 +4094,7 @@ export const businessFields = [
   },
   {
     type: "copy_button",
-    icon: "clipboard",
+    icon: "el-icon-document-copy",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -4277,7 +4277,7 @@ export const compareFields = [
   {
     type: "compare-button",
     targetType: "button",
-    icon: "compare",
+    icon: "fullscreen",
     commonFlag: !0,
     formItemFlag: !1,
     columnFlag: true,