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

package/package.json

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

package/src/components/baseArea/index.vue

@@ -111,6 +111,28 @@
             <i class="el-icon-arrow-right"></i>
           </el-button>
         </div>
+        <div class="base-area-footer">
+          <el-button
+            type="primary"
+            plain
+            class="button-sty"
+            @mousedown.prevent
+            @click="cancelSelection"
+          >
+            <i class="el-icon-close el-icon"></i>
+            {{ cancelText }}
+          </el-button>
+          <el-button
+            type="primary"
+            class="button-sty"
+            :disabled="!canConfirm"
+            @mousedown.prevent
+            @click="confirmSelection"
+          >
+            <i class="el-icon-check el-icon"></i>
+            {{ confirmText }}
+          </el-button>
+        </div>
       </div>
       <div slot="reference" class="base-area-trigger">
         <el-input
@@ -159,6 +181,11 @@ export default {
       type: Number,
       default: 4,
     },
+    /** 至少选到该层级才提交值（1-4）；分支无下级数据时视为末级 */
+    minLevel: {
+      type: Number,
+      default: 1,
+    },
     locale: {
       type: String,
       default: null,
@@ -187,6 +214,14 @@ export default {
       type: String,
       default: "暂无匹配地区",
     },
+    confirmText: {
+      type: String,
+      default: "确 定",
+    },
+    cancelText: {
+      type: String,
+      default: "取 消",
+    },
     size: {
       type: String,
       default: "small",
@@ -219,6 +254,7 @@ export default {
       committedBrowseSnapshot: null,
       committedBoundValue: null,
       lastSelectionPayload: null,
+      pendingLeaf: false,
     };
   },
   computed: {
@@ -268,6 +304,19 @@ export default {
     browseLevelCount() {
       return Math.max(this.maxLevel, this.selectedPath.length, 1);
     },
+    effectiveMinLevel() {
+      const min = this.minLevel == null ? 1 : this.minLevel;
+      return Math.max(1, Math.min(min, this.maxLevel));
+    },
+    canConfirm() {
+      if (!this.selectedPath.length) {
+        return false;
+      }
+      /* 达到最小选择层级，或该地区无下级数据（视为末级） */
+      return (
+        this.selectedPath.length >= this.effectiveMinLevel || this.pendingLeaf
+      );
+    },
     currentLevelLabel() {
       return LEVEL_LABELS[this.activeLevel - 1] || `第${this.activeLevel}级`;
     },
@@ -515,6 +564,7 @@ export default {
       return level === 1 || this.selectedPath.length >= level - 1;
     },
     handlePopoverShow() {
+      this.pendingLeaf = false;
       this.saveCommittedBrowseSnapshot();
       this.$emit("popover-open");
       this.$nextTick(() => {
@@ -1013,6 +1063,7 @@ export default {
       this.searchKeyword = "";
       this.searchList = [];
       this.searchDropdownVisible = false;
+      this.pendingLeaf = false;
       this.cancelPendingSync();
       this.emitChangeIfCommitted();
       this.restoreBrowseStateIfUncommitted();
@@ -1068,6 +1119,19 @@ export default {
       }
       this.switchLevel(this.activeLevel - 1);
     },
+    confirmSelection() {
+      if (!this.canConfirm) {
+        return;
+      }
+      const last = this.selectedPath[this.selectedPath.length - 1];
+      this.applySelection(last).then(() => {
+        this.popoverVisible = false;
+      });
+    },
+    cancelSelection() {
+      /* 关闭弹层，未确认的浏览状态由 hide 回调恢复 */
+      this.popoverVisible = false;
+    },
     nextLevel() {
       if (!this.canNextLevel) {
         return;
@@ -1080,8 +1144,20 @@ export default {
         this.searchKeyword = "";
         this.searchList = [];
         this.searchDropdownVisible = false;
-        this.applySelection(item).then(() => {
-          this.popoverVisible = false;
+        this.pendingLeaf = false;
+        if (this.selectedPath.length >= this.effectiveMinLevel) {
+          /* 已达到最小选择层级：等待确认 */
+          return;
+        }
+        /* 搜索结果未达到最小选择层级：有下级只定位下钻，无下级视为末级 */
+        const last = this.selectedPath[this.selectedPath.length - 1] || item;
+        this.fetchChildren(this.getAreaId(last)).then((children) => {
+          if (!children.length) {
+            this.pendingLeaf = true;
+            return;
+          }
+          this.activeLevel = this.selectedPath.length + 1;
+          this.levelItems = children;
         });
       });
     },
@@ -1093,19 +1169,19 @@ export default {
       const level = this.activeLevel;
       this.selectedPath = this.selectedPath.slice(0, level - 1);
       this.selectedPath.push(item);
-      this.applySelection(item).then(() => {
-        if (level >= this.maxLevel) {
-          this.popoverVisible = false;
+      this.pendingLeaf = false;
+      if (level >= this.maxLevel) {
+        /* 已到最大层级：等待确认 */
+        return;
+      }
+      this.fetchChildren(this.getAreaId(item)).then((children) => {
+        if (!children.length) {
+          /* 无下级数据：视为末级，等待确认 */
+          this.pendingLeaf = true;
           return;
         }
-        this.fetchChildren(this.getAreaId(item)).then((children) => {
-          if (!children.length) {
-            this.popoverVisible = false;
-            return;
-          }
-          this.activeLevel = level + 1;
-          this.levelItems = children;
-        });
+        this.activeLevel = level + 1;
+        this.levelItems = children;
       });
     },
     async clampPathToMaxLevel(path) {
@@ -1450,6 +1526,15 @@ export default {
     user-select: none;
   }
 }
+
+.base-area-footer {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  margin-top: 8px;
+  padding-top: 8px;
+  border-top: 1px solid #ebeef5;
+}
 </style>
 
 <style lang="scss">

package/src/components/xform/form-designer/form-widget/field-widget/area-select-widget.vue

@@ -30,6 +30,7 @@
       :label-value="areaNameLabel"
       @update:labelValue="handleAreaLabelUpdate"
       :max-level="maxLevel"
+      :min-level="minLevel"
       :locale="field.options.locale"
       :disabled="field.options.disabled"
       :readonly="field.options.readonly"
@@ -111,6 +112,17 @@ export default {
       }
       return 4;
     },
+    minLevel() {
+      const areaMinLevel = this.field.options.areaMinLevel;
+      if (areaMinLevel == null || areaMinLevel === "") {
+        return 1;
+      }
+      const type = areaMinLevel * 1;
+      if (type >= 0 && type <= 3) {
+        return type + 1;
+      }
+      return 1;
+    },
     readModeText() {
       return this.areaNameLabel || "--";
     },

package/src/components/xform/form-designer/setting-panel/property-editor/field-area-select/areaMinLevel-editor.vue

@@ -0,0 +1,50 @@
+<template>
+  <el-form-item>
+    <span slot="label"
+      >{{ i18nt("designer.setting.areaMinLevel") }}
+      <el-tooltip
+        effect="light"
+        :content="i18nt('designer.setting.areaMinLevelHint')"
+      >
+        <i class="el-icon-info"></i>
+      </el-tooltip>
+    </span>
+    <el-select v-model="minLevel" style="width: 100%">
+      <el-option
+        :label="i18nt('designer.setting.areaMinLevelNone')"
+        :value="null"
+      />
+      <el-option :label="i18nt('designer.setting.areaMinLevel0')" :value="0" />
+      <el-option :label="i18nt('designer.setting.areaMinLevel1')" :value="1" />
+      <el-option :label="i18nt('designer.setting.areaMinLevel2')" :value="2" />
+      <el-option :label="i18nt('designer.setting.areaMinLevel3')" :value="3" />
+    </el-select>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "@base/components/xform/utils/i18n";
+import propertyMixin from "@base/components/xform/form-designer/setting-panel/property-editor/propertyMixin";
+
+export default {
+  name: "areaMinLevel-editor",
+  mixins: [i18n, propertyMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  computed: {
+    minLevel: {
+      get() {
+        const val = this.optionModel.areaMinLevel;
+        return val == null || val === "" ? null : val;
+      },
+      set(val) {
+        /* 旧表单的 options 上可能没有该 key，需 $set 保证响应式 */
+        this.$set(this.optionModel, "areaMinLevel", val);
+      },
+    },
+  },
+};
+</script>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -85,6 +85,7 @@ const COMMON_PROPERTIES = {
   vabSearchName: "vabSearchName-editor",
   areaName: "areaName-editor",
   areaDataType: "areaDataType-editor",
+  areaMinLevel: "areaMinLevel-editor",
   copyButton: "copyButton-editor",
   tempStorageFlag: "tempStorage-editor",
   formatType: "formatType-editor",

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/indexMixin.js

@@ -5,7 +5,8 @@ import {
   basicFields,
   advancedFields,
   customFields,
-  businessFields
+  businessFields,
+  widgetPanelOrder
 } from "./widgetsConfig"
 import {
   formTemplates
@@ -162,14 +163,14 @@ modules = {
       return true
     },
     loadWidgets() {
-      this.containers = containers.map(con => {
+      this.containers = this.sortByPanelOrder(containers.map(con => {
         return {
           ...con,
           displayName: this.i18n2t(`designer.widgetLabel.${con.type}`, `extension.widgetLabel.${con.type}`)
         };
       }).filter(con => {
         return !con.internal && !this.isBanned(con.type) && this.getIsShow(con);
-      });
+      }), widgetPanelOrder.containers);
 
       this.commonContainers = this.containers.filter(con => !!con.commonFlag && this.getIsShow(con));
 
@@ -191,6 +192,16 @@ modules = {
         return !this.isBanned(fld.type) && this.getIsShow(fld);
       });
 
+      /* 面板分组归一：表单数据字段（搜索框/自动完成/级联/凭证/状态等）展示在基础字段分组 */
+      const moveTypes = widgetPanelOrder.basicFromAdvanced || [];
+      const movedFields = this.advancedFields.filter(fld => moveTypes.indexOf(fld.type) > -1);
+      this.advancedFields = this.advancedFields.filter(fld => moveTypes.indexOf(fld.type) === -1);
+      this.basicFields = this.sortByPanelOrder(
+        this.basicFields.concat(movedFields),
+        widgetPanelOrder.basicFields
+      );
+      this.advancedFields = this.sortByPanelOrder(this.advancedFields, widgetPanelOrder.advancedFields);
+
       this.businessFields = this.businessFields.map(fld => {
         return {
           ...fld,
@@ -200,14 +211,15 @@ modules = {
         return !this.isBanned(fld.type) && this.getIsShow(fld);
       });
 
-      this.commonAdvancedFields = advancedFields.map(fld => {
+      this.commonAdvancedFields = this.sortByPanelOrder(advancedFields.map(fld => {
         return {
           ...fld,
           displayName: this.i18n2t(`designer.widgetLabel.${fld.type}`, `extension.widgetLabel.${fld.type}`)
         };
       }).filter(fld => {
-        return !this.isBanned(fld.type) && !!fld.commonFlag && this.getIsShow(fld);
-      });
+        return !this.isBanned(fld.type) && !!fld.commonFlag && this.getIsShow(fld)
+          && moveTypes.indexOf(fld.type) === -1;
+      }), widgetPanelOrder.advancedFields);
 
       this.customFields = this.customFields.map(fld => {
         return {
@@ -239,6 +251,29 @@ modules = {
 
     },
 
+    /* 按 widgetPanelOrder 排序面板展示列表；未列出的类型（含扩展组件）排在末尾，保持原有相对顺序 */
+    sortByPanelOrder(list, orderList) {
+      if (!orderList || !orderList.length) {
+        return list;
+      }
+      const orderMap = {};
+      orderList.forEach((type, index) => {
+        orderMap[type] = index;
+      });
+      return list
+        .map((widget, index) => ({ widget, index }))
+        .sort((a, b) => {
+          const oa = orderMap[a.widget.type] !== undefined
+            ? orderMap[a.widget.type]
+            : orderList.length + a.index;
+          const ob = orderMap[b.widget.type] !== undefined
+            ? orderMap[b.widget.type]
+            : orderList.length + b.index;
+          return oa - ob;
+        })
+        .map(item => item.widget);
+    },
+
     handleContainerWidgetClone(origin) {
       return this.designer.copyNewContainerWidget(origin);
     },

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

@@ -434,7 +434,7 @@ export const containers = [
   {
     type: "detail",
     category: "container",
-    icon: "grid",
+    icon: "form",
     commonFlag: !0,
     layoutType: "PC",
     panes: [],
@@ -474,7 +474,7 @@ export const containers = [
   {
     type: "detail-h5",
     category: "container",
-    icon: "grid",
+    icon: "descriptions",
     commonFlag: !0,
     layoutType: "H5",
     panes: [],
@@ -494,7 +494,7 @@ export const containers = [
   {
     type: "list-h5",
     category: "container",
-    icon: "grid",
+    icon: "list",
     commonFlag: !0,
     formItemFlag: !0,
     layoutType: "H5",
@@ -647,7 +647,7 @@ export const containers = [
   {
     type: "h5-card",
     category: "container",
-    icon: "tab",
+    icon: "card",
     commonFlag: !0,
     layoutType: "H5",
     panes: [],
@@ -678,7 +678,7 @@ export const containers = [
   {
     type: "h5-table",
     category: "container",
-    icon: "table",
+    icon: "section",
     commonFlag: !0,
     layoutType: "H5",
     rows: [],
@@ -1188,7 +1188,7 @@ export const basicFields = [
   },
   {
     type: "script-input",
-    icon: "textarea-field",
+    icon: "component",
     commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
@@ -1531,7 +1531,7 @@ export const basicFields = [
   },
   {
     type: "area-select",
-    icon: "select-field",
+    icon: "international",
     commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
@@ -1566,6 +1566,7 @@ export const basicFields = [
       labelTooltip: null,
       areaName: "",
       areaDataType: 3,
+      areaMinLevel: null,
       locale: null,
       onCreated: "",
       onMounted: "",
@@ -2153,7 +2154,7 @@ export const basicFields = [
   },
   {
     type: "a-text",
-    icon: "text-field",
+    icon: "link",
     commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
@@ -2206,7 +2207,7 @@ export const basicFields = [
   },
   {
     type: "a-link",
-    icon: "button",
+    icon: "guide",
     commonFlag: !0,
     formItemFlag: !1,
     columnFlag: true,
@@ -3007,7 +3008,7 @@ export const advancedFields = [
   },
   {
     type: "autocomplete",
-    icon: "searchbox",
+    icon: "message",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -3018,7 +3019,7 @@ export const advancedFields = [
   },
   {
     type: "search_button",
-    icon: "button",
+    icon: "el-icon-search",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3063,7 +3064,7 @@ export const advancedFields = [
   {
     type: "save_button",
     targetType: "button",
-    icon: "button",
+    icon: "el-icon-check",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3104,7 +3105,7 @@ export const advancedFields = [
   {
     type: "reset_button",
     targetType: "button",
-    icon: "button",
+    icon: "el-icon-refresh-right",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3140,7 +3141,7 @@ export const advancedFields = [
   },
   {
     type: "table-export-button",
-    icon: "list-export",
+    icon: "el-icon-upload",
     formItemFlag: !1,
     commonFlag: !0,
     columnFlag: true,
@@ -3169,7 +3170,7 @@ export const advancedFields = [
   },
   {
     type: "select-export-button",
-    icon: "list-export",
+    icon: "el-icon-upload",
     formItemFlag: !1,
     commonFlag: !0,
     columnFlag: true,
@@ -3200,7 +3201,7 @@ export const advancedFields = [
   },
   {
     type: "select-export-item-button",
-    icon: "list-export",
+    icon: "el-icon-upload",
     formItemFlag: !1,
     commonFlag: !0,
     columnFlag: true,
@@ -3232,7 +3233,7 @@ export const advancedFields = [
   {
     type: "add_button",
     targetType: "button",
-    icon: "button",
+    icon: "el-icon-plus",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3268,7 +3269,7 @@ export const advancedFields = [
   },
   {
     type: "import-button",
-    icon: "button",
+    icon: "el-icon-download",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3320,7 +3321,7 @@ export const advancedFields = [
   },
   {
     type: "import2-button",
-    icon: "button",
+    icon: "el-icon-download",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3368,7 +3369,7 @@ export const advancedFields = [
   },
   {
     type: "print-button",
-    icon: "button",
+    icon: "el-icon-printer",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3409,7 +3410,7 @@ export const advancedFields = [
   },
   {
     type: "print-detail-button",
-    icon: "button",
+    icon: "el-icon-printer",
     commonFlag: !0,
     columnFlag: false,
     formItemFlag: !1,
@@ -3572,7 +3573,7 @@ export const advancedFields = [
 
   {
     type: "project-tag",
-    icon: "uploadbox",
+    icon: "star",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -3585,7 +3586,7 @@ export const advancedFields = [
   {
     type: "table2",
     category: "container",
-    icon: "table",
+    icon: "tree-table",
     commonFlag: !0,
     formItemFlag: !0,
     rows: [],
@@ -3611,7 +3612,7 @@ export const advancedFields = [
   },
   {
     type: "dropdown",
-    icon: "tab",
+    icon: "el-icon-arrow-down",
     commonFlag: !0,
     // columnFlag: true,
     widgetList: [],
@@ -3661,7 +3662,7 @@ export const advancedFields = [
   },
   {
     type: "gantt",
-    icon: "uploadbox",
+    icon: "chart",
     commonFlag: !0,
     formItemFlag: !1,
     options: {
@@ -3683,7 +3684,7 @@ export const advancedFields = [
 
   {
     type: "download-button",
-    icon: "button",
+    icon: "el-icon-download",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -3721,7 +3722,7 @@ export const advancedFields = [
 
   {
     type: "vue-page",
-    icon: "html-text",
+    icon: "vue-sfc",
     commonFlag: !0,
     formItemFlag: !1,
     columnFlag: false,
@@ -3809,7 +3810,7 @@ export const businessFields = [
   {
     type: "create_by-text",
     targetType: "text",
-    icon: "text",
+    icon: "people",
     commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
@@ -3848,7 +3849,7 @@ export const businessFields = [
   {
     type: "modify_by-text",
     targetType: "text",
-    icon: "text",
+    icon: "edit",
     commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
@@ -3887,7 +3888,7 @@ export const businessFields = [
   {
     type: "create_date-text",
     targetType: "text",
-    icon: "text",
+    icon: "date-field",
     commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
@@ -3926,7 +3927,7 @@ export const businessFields = [
   {
     type: "modify_date-text",
     targetType: "text",
-    icon: "text",
+    icon: "time-field",
     commonFlag: !0,
     formItemFlag: !0,
     columnFlag: true,
@@ -3966,7 +3967,7 @@ export const businessFields = [
   {
     type: "user-vabsearch",
     targetType: "singerSearch",
-    icon: "searchbox",
+    icon: "user",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -3989,7 +3990,7 @@ export const businessFields = [
   {
     type: "saleOrg-vabsearch",
     targetType: "singerSearch",
-    icon: "searchbox",
+    icon: "tree",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -4013,7 +4014,7 @@ export const businessFields = [
   {
     type: "user-project-tag",
     targetType: "project-tag",
-    icon: "uploadbox",
+    icon: "peoples",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -4034,7 +4035,7 @@ export const businessFields = [
   {
     type: "saleOrg-project-tag",
     targetType: "project-tag",
-    icon: "uploadbox",
+    icon: "tree",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
@@ -4055,7 +4056,7 @@ export const businessFields = [
   {
     type: "save_submit_wf_button",
     targetType: "button",
-    icon: "button",
+    icon: "el-icon-video-play",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -4093,7 +4094,7 @@ export const businessFields = [
   },
   {
     type: "copy_button",
-    icon: "button",
+    icon: "el-icon-document-copy",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -4123,7 +4124,7 @@ export const businessFields = [
   },
   {
     type: "tempStorage",
-    icon: "uploadbox",
+    icon: "documentation",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !1,
@@ -4147,7 +4148,7 @@ export const businessFields = [
   },
   {
     type: "oplog",
-    icon: "uploadbox",
+    icon: "list",
     commonFlag: !0,
     formItemFlag: !1,
     options: {
@@ -4168,7 +4169,7 @@ export const businessFields = [
   },
   {
     type: "vabUpload2",
-    icon: "uploadbox",
+    icon: "file-upload-field",
     commonFlag: !0,
     formItemFlag: !0,
     tableField: null,
@@ -4230,7 +4231,7 @@ export const compareFields = [
   {
     type: "compare-change-button",
     targetType: "button",
-    icon: "button",
+    icon: "switch-field",
     commonFlag: !0,
     formItemFlag: !1,
     columnFlag: true,
@@ -4276,7 +4277,7 @@ export const compareFields = [
   {
     type: "compare-button",
     targetType: "button",
-    icon: "button",
+    icon: "fullscreen",
     commonFlag: !0,
     formItemFlag: !1,
     columnFlag: true,
@@ -4320,7 +4321,7 @@ export const compareFields = [
   {
     type: "compare-close-button",
     targetType: "button",
-    icon: "button",
+    icon: "exit-fullscreen",
     commonFlag: !0,
     formItemFlag: !1,
     columnFlag: true,
@@ -4364,7 +4365,7 @@ export const compareFields = [
   {
     type: "compare-del-button",
     targetType: "button",
-    icon: "button",
+    icon: "eye",
     commonFlag: !0,
     formItemFlag: !1,
     columnFlag: true,
@@ -4414,6 +4415,105 @@ export const keyNamePrefixMap = {
 
 export const customFields = [];
 
+/* 组件面板展示顺序与分组归一（仅影响左侧面板展示，不影响按 type 查找与扩展注册）：
+ * - 分组规则：基础字段 = 表单数据字段；高级字段 = 图表/特殊展示/功能按钮
+ * - 未列出的类型（含扩展注册的组件）排在已列出类型之后，保持原有相对顺序
+ * - basicFromAdvanced：展示时从「高级字段」归入「基础字段」的类型
+ */
+export const widgetPanelOrder = {
+  /* 通用布局 → 数据/详情 → 树 → H5 专用；internal 子容器紧随父容器（不展示，仅占位） */
+  containers: [
+    "grid",
+    "grid-col",
+    "table",
+    "table-cell",
+    "tab",
+    "tab-pane",
+    "data-table",
+    "table-column",
+    "detail",
+    "detail-pane",
+    "tree-pane",
+    "tree",
+    "vf-dialog",
+    "detail-h5",
+    "list-h5",
+    "h5-card",
+    "h5-card-pane",
+    "h5-table",
+    "h5-table-cell",
+  ],
+  /* 输入 → 选择 → 日期时间 → 上传 → 状态/文本展示 → 其他 */
+  basicFields: [
+    "input",
+    "input-batch",
+    "textarea",
+    "script-input",
+    "number",
+    "radio",
+    "checkbox",
+    "select",
+    "cascader",
+    "area-select",
+    "vabsearch",
+    "singerSearch",
+    "multiSearch",
+    "autocomplete",
+    "date",
+    "date-range",
+    "time",
+    "time-range",
+    "vabUpload",
+    "baseAttachment",
+    "status",
+    "text",
+    "a-text",
+    "static-text",
+    "html-text",
+    "a-link",
+    "a-link2",
+    "button",
+    "divider",
+  ],
+  /* 图表 → 展示 → 按钮 */
+  advancedFields: [
+    "echart-pie",
+    "echart-bar",
+    "echart-category",
+    "echart",
+    "gantt",
+    "census",
+    "project-tag",
+    "table2",
+    "vue-page",
+    "search_button",
+    "reset_button",
+    "save_button",
+    "add_button",
+    "import-button",
+    "import2-button",
+    "table-export-button",
+    "select-export-button",
+    "select-export-item-button",
+    "print-button",
+    "print-detail-button",
+    "download-button",
+    "dropdown",
+    "dropdown-item",
+  ],
+  /* 表单数据字段归入基础字段展示（隐藏的 singerSearch/multiSearch/baseAttachment 跟随同类） */
+  basicFromAdvanced: [
+    "vabsearch",
+    "singerSearch",
+    "multiSearch",
+    "autocomplete",
+    "cascader",
+    "vabUpload",
+    "baseAttachment",
+    "status",
+  ],
+};
+
 export function addContainerWidgetSchema(containerSchema) {
   containers.push(containerSchema);
 }

package/src/components/xform/lang/en-US.js

@@ -200,6 +200,14 @@ export default {
           areaDataType3: "Province/City/District/Town",
           areaName: "Area Name Field",
           areaNameHint: "Form field name for area full name",
+          areaMinLevel: "Min Area Level",
+          areaMinLevelHint:
+            "Selection must reach at least this level (unless the area has no children)",
+          areaMinLevelNone: "None",
+          areaMinLevel0: "Province",
+          areaMinLevel1: "City",
+          areaMinLevel2: "District",
+          areaMinLevel3: "Town",
           editable: "Editable",
           format: "Format",
           valueFormat: "Value Format",

package/src/components/xform/lang/zh-CN.js

@@ -353,6 +353,14 @@ export default {
       areaDataType3: "省/市/区/乡镇",
       areaName: "地区名称字段",
       areaNameHint: "用于保存地区全称的表单字段名",
+      areaMinLevel: "至少选择层级",
+      areaMinLevelHint:
+        "选择结果至少要到该层级才能选中（该地区无下级数据时除外）",
+      areaMinLevelNone: "不限",
+      areaMinLevel0: "省",
+      areaMinLevel1: "市",
+      areaMinLevel2: "区",
+      areaMinLevel3: "乡镇",
       editable: "可输入",
       format: "显示格式",
       valueFormat: "绑定值格式",