cloud-web-corejs 1.0.54-dev.677 → 1.0.54-dev.679

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -123,6 +123,8 @@ modules = {
       eventConfig: {},
       dynamicTableColumns: [],
       dynamicColumnsPreloaded: false,
+      dynamicColumnsInitResolved: false,
+      dynamicColumnsInitSkipped: false,
     };
   },
   watch: {
@@ -177,8 +179,8 @@ modules = {
     if (!this.widget.options.dynamicColumnMode) {
       this.$set(this.widget.options, "dynamicColumnMode", "append");
     }
-    if (this.widget.options.dynamicColumnScriptEnabled === undefined) {
-      this.$set(this.widget.options, "dynamicColumnScriptEnabled", false);
+    if (this.widget.options.dynamicColumnSourceType === undefined) {
+      this.$set(this.widget.options, "dynamicColumnSourceType", "none");
     }
     this.initRefList();
     // this.initConfig();
@@ -695,7 +697,13 @@ modules = {
     getTableColumns() {
       return this.widget.options.tableColumns || [];
     },
+    getDynamicColumnSourceType() {
+      return this.widget.options.dynamicColumnSourceType || "none";
+    },
     getDynamicTableColumnsFromScript() {
+      if (this.getDynamicColumnSourceType() !== "script") {
+        return undefined;
+      }
       const script = this.widget.options.dynamicColumnsScript;
       if (!script) {
         return undefined;
@@ -746,12 +754,16 @@ modules = {
       }
       return staticCols;
     },
-    getEffectiveTableColumns() {
+    getEffectiveTableColumns(forceDynamic = false) {
       const staticColumns = this.widget.options.tableColumns || [];
       const runtimeDynamic = this.dynamicTableColumns || [];
-      const scriptDynamic = this.getDynamicTableColumnsFromScript();
-      if (scriptDynamic !== undefined) {
-        return this.mergeDynamicTableColumns(staticColumns, scriptDynamic);
+      const applyScriptDynamic =
+        forceDynamic || !this.shouldSkipDynamicColumnsOnInit();
+      if (applyScriptDynamic) {
+        const scriptDynamic = this.getDynamicTableColumnsFromScript();
+        if (scriptDynamic !== undefined) {
+          return this.mergeDynamicTableColumns(staticColumns, scriptDynamic);
+        }
       }
       if (runtimeDynamic.length) {
         if (this.widget.options.dynamicColumnMode === "replace") {
@@ -780,11 +792,16 @@ modules = {
       this.widget.options.tableColumns = savedColumns;
       return tableColumns;
     },
-    ensureEffectiveColumnWidgets() {
-      const effectiveColumns = this.getEffectiveTableColumns();
+    ensureEffectiveColumnWidgets(forceDynamic = false) {
+      const effectiveColumns = this.getEffectiveTableColumns(forceDynamic);
       this.attachTableColumnWidgets(effectiveColumns);
       this.syncEffectiveColumnWidgetFieldKeys(effectiveColumns);
     },
+    shouldSkipDynamicColumnsOnInit() {
+      return (
+        this.dynamicColumnsInitResolved && this.dynamicColumnsInitSkipped
+      );
+    },
     getColumnVisible(columnConfig) {
       if (columnConfig.show === false) {
         return false;
@@ -800,8 +817,8 @@ modules = {
       return true;
     },
     applyTableColumnsReload() {
-      this.ensureEffectiveColumnWidgets();
-      const effectiveColumns = this.getEffectiveTableColumns();
+      this.ensureEffectiveColumnWidgets(true);
+      const effectiveColumns = this.getEffectiveTableColumns(true);
       return new Promise((resolve) => {
         this.initColumnWidgetConfig(() => {
           const columns = this.createColumns();
@@ -859,11 +876,8 @@ modules = {
         }
       );
     },
-    refreshTableColumns() {
-      return this.applyTableColumnsReload();
-    },
     refreshColumnVisible() {
-      return this.refreshTableColumns();
+      return this.applyTableColumnsReload();
     },
     normalizeDynamicColumnItem(item, index) {
       if (!item || typeof item !== "object") {
@@ -955,7 +969,19 @@ modules = {
       }
       return [];
     },
-    loadDynamicColumnsFromApi(options = {}) {
+    loadDynamicColumns(options = {}) {
+      const source = this.getDynamicColumnSourceType();
+      if (source === "script") {
+        return this.applyTableColumnsReload().then((columns) => {
+          options.success && options.success(null, columns);
+          return columns;
+        });
+      }
+      if (source !== "api") {
+        const columns = this.getEffectiveTableColumns(true);
+        options.success && options.success(null, columns);
+        return Promise.resolve(columns);
+      }
       const isLoading = options.isLoading ?? true;
       const mode = options.mode ?? this.widget.options.dynamicColumnMode;
       return this.requestDynamicColumnsFromApi({
@@ -971,18 +997,19 @@ modules = {
         });
       });
     },
-    loadDynamicColumns(options) {
-      return this.loadDynamicColumnsFromApi(options);
-    },
-    fetchDynamicColumns(options) {
-      return this.loadDynamicColumnsFromApi(options);
-    },
-    resolveShouldAutoLoadDynamicColumns() {
+    resolveShouldInitDynamicColumns() {
+      const source = this.getDynamicColumnSourceType();
+      if (source === "none") {
+        return Promise.resolve(false);
+      }
       const options = this.widget.options;
-      if (!options.dynamicColumnScriptEnabled || !options.dynamicColumnScriptCode) {
+      if (source === "api" && !options.dynamicColumnScriptCode) {
         return Promise.resolve(false);
       }
-      const script = options.dynamicColumnAutoLoadScript;
+      if (source === "script" && !options.dynamicColumnsScript) {
+        return Promise.resolve(false);
+      }
+      const script = options.dynamicColumnLoadScript;
       if (!script) {
         return Promise.resolve(true);
       }
@@ -990,46 +1017,15 @@ modules = {
       if (!formRef || formRef.designState) {
         return Promise.resolve(false);
       }
-      return new Promise((resolve) => {
-        let settled = false;
-        const finishLoad = () => {
-          if (settled) {
-            return;
-          }
-          settled = true;
-          resolve(true);
-        };
-        const finishSkip = () => {
-          if (settled) {
-            return;
-          }
-          settled = true;
-          resolve(false);
-        };
-        const done = finishLoad;
-        try {
-          const result = formRef.handleCustomEvent(script, ["done"], [done]);
-          if (settled) {
-            return;
-          }
-          if (result === null || result === false) {
-            if (result === null) {
-              finishSkip();
-              return;
-            }
-            // return false：异步 defer 等待 done()；未调用则视为跳过
-            setTimeout(() => {
-              if (!settled) {
-                finishSkip();
-              }
-            }, 0);
-            return;
-          }
-          finishLoad();
-        } catch (e) {
-          finishSkip();
+      try {
+        const result = this.handleCustomEvent(script);
+        if (result === false || result === null) {
+          return Promise.resolve(false);
         }
-      });
+        return Promise.resolve(true);
+      } catch (e) {
+        return Promise.resolve(false);
+      }
     },
     isTableColumnGridInitialized() {
       return !!this.vxeOption;
@@ -1066,28 +1062,33 @@ modules = {
       });
     },
     bootstrapDynamicColumnsBeforeInit() {
-      return this.resolveShouldAutoLoadDynamicColumns().then((shouldLoad) => {
-        if (!shouldLoad) {
+      return this.resolveShouldInitDynamicColumns().then((shouldInit) => {
+        this.dynamicColumnsInitResolved = true;
+        this.dynamicColumnsInitSkipped = !shouldInit;
+        if (!shouldInit) {
+          return;
+        }
+        if (this.getDynamicColumnSourceType() !== "api") {
           return;
         }
         this.dynamicColumnsPreloaded = true;
-        const mode = this.widget.options.dynamicColumnMode;
-        return this.requestDynamicColumnsFromApi({ isLoading: true })
-          .then(({ columns }) => this.assignDynamicTableColumns(columns, { mode }))
-          .catch(() => {
-            this.dynamicColumnsPreloaded = false;
-          });
+        return this.loadDynamicColumns({ isLoading: true }).catch(() => {
+          this.dynamicColumnsPreloaded = false;
+        });
       });
     },
     tryAutoLoadDynamicColumns() {
-      if (this.dynamicColumnsPreloaded) {
+      if (
+        this.dynamicColumnsPreloaded ||
+        this.getDynamicColumnSourceType() !== "api"
+      ) {
         return Promise.resolve();
       }
-      return this.resolveShouldAutoLoadDynamicColumns().then((shouldLoad) => {
+      return this.resolveShouldInitDynamicColumns().then((shouldLoad) => {
         if (!shouldLoad) {
           return;
         }
-        return this.loadDynamicColumnsFromApi({ isLoading: true }).catch(() => {});
+        return this.loadDynamicColumns({ isLoading: true }).catch(() => {});
       });
     },
     getTableData: function () {
@@ -1886,6 +1887,9 @@ modules = {
         isQueryAllPage,
         exportItemConfig,
         vform: true,
+        ...(this.getDynamicColumnSourceType() !== "none"
+          ? { visibleSync: false }
+          : {}),
         ...(dataTableConfig.otherConfig || {}),
         config: {
           height: height,
@@ -2602,6 +2606,10 @@ modules = {
           let vabSearchName = widget.options.vabSearchName;
           if (vabSearchName) newData[vabSearchName] = null;
         }
+        if (widget.type === "area-select") {
+          let areaName = widget.options.areaName;
+          if (areaName) newData[areaName] = null;
+        }
       }
     },
     createNewTableData(isEdit, defaultValueEnabled = true) {

package/src/components/xform/form-render/indexMixin.js

@@ -1564,6 +1564,18 @@ modules = {
             baseRefUtil.deepClone(val)
           );
         }
+      } else if ("area-select" === e.type) {
+        let c = currentFormData[fieldKeyName];
+        this.$set(this.formDataModel, fieldKeyName, baseRefUtil.deepClone(c));
+        let areaName = e.options.areaName;
+        if (areaName) {
+          let val = currentFormData[areaName] ?? null;
+          this.$set(
+            this.formDataModel,
+            areaName,
+            baseRefUtil.deepClone(val)
+          );
+        }
       } else if ("table2-item" === e.type) {
         this.$set(this.formDataModel, fieldKeyName, []);
       } else if (e.formItemFlag) {
@@ -2125,6 +2137,10 @@ modules = {
                 let vabSearchName = widget.options.vabSearchName;
                 if (vabSearchName) fieldMap[vabSearchName] = vabSearchName;
               }
+              if (this.isAreaSelectFlagWidget(widget)) {
+                let areaName = widget.options.areaName;
+                if (areaName) fieldMap[areaName] = areaName;
+              }
             }
           } else {
             if (widget.category === "container") {
@@ -2161,6 +2177,9 @@ modules = {
         type === "multiSearch"
       );
     },
+    isAreaSelectFlagWidget(widget) {
+      return widget?.type === "area-select";
+    },
     getFormTemplateTableDTOs() {
       let formTemplateTableDTOs = [];
       let formCode = this.reportTemplate.formCode;
@@ -2288,6 +2307,21 @@ modules = {
                 });
               }
             }
+          } else if (widget.tableField && this.isAreaSelectFlagWidget(widget)) {
+            if (submitFlag) {
+              fields.push({
+                fieldDesc: widget.options.label + "ID",
+                fieldName: widgetName,
+              });
+              let areaName = widget.options.areaName;
+              if (areaName) {
+                fields.push({
+                  fieldDesc: widget.options.label,
+                  fieldName: areaName,
+                  name: areaName,
+                });
+              }
+            }
           } else if (widget.tableField) {
             if (submitFlag) {
               fields.push({

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

@@ -55,6 +55,7 @@ export default {
           "file-upload": "File",
           "rich-editor": "Rich Editor",
           cascader: "Cascader",
+          "area-select": "Area Select",
           slot: "Slot",
           custom: "Custom Component"
         },
@@ -190,6 +191,12 @@ export default {
           textContent: "Text",
           htmlContent: "HTML",
           clearable: "Clearable",
+          areaDataType: "Area Level",
+          areaDataType1: "Province/City",
+          areaDataType2: "Province/City/District",
+          areaDataType3: "Province/City/District/Town",
+          areaName: "Area Name Field",
+          areaNameHint: "Form field name for area full name",
           editable: "Editable",
           format: "Format",
           valueFormat: "Value Format",

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

@@ -77,6 +77,7 @@ export default {
       "copy_button": "复制按钮",
       "rich-editor": "富文本",
       cascader: "级联选择",
+      "area-select": "地区选择",
       slot: "插槽",
       echart: '图表',
       'echart-pie': '饼图',
@@ -353,6 +354,12 @@ export default {
       preWrap: '自动换行',
       htmlContent: "HTML",
       clearable: "可清除",
+      areaDataType: "地区层级",
+      areaDataType1: "省/市",
+      areaDataType2: "省/市/区",
+      areaDataType3: "省/市/区/乡镇",
+      areaName: "地区名称字段",
+      areaNameHint: "用于保存地区全称的表单字段名",
       editable: "可输入",
       format: "显示格式",
       valueFormat: "绑定值格式",

package/src/index.js

@@ -134,6 +134,10 @@ import baseInputBatch from "@base/components/baseInputBatch/index.vue";
 
 Vue.component(baseInputBatch.name, baseInputBatch);
 
+import baseArea from "@base/components/baseArea/index.vue";
+
+Vue.component(baseArea.name, baseArea);
+
 Vue.component("baseInputExport", () =>
   import("@base/components/baseInputExport/index.vue")
 );

package/src/layout/components/Sidebar/default.vue

@@ -1547,7 +1547,7 @@ export default {
 //   height: auto !important;
 // }
 .el-menu--vertical{
-   > .el-menu--popup{overflow: hidden;
+   > .el-menu--popup{overflow: auto;//不用atuo 超出不出滚动条
       .el-submenu__title, .el-menu-item{
         height: auto !important;
         line-height: 1.4 !important;

package/src/views/bd/setting/formVersion/compareBasicSection.vue

@@ -76,8 +76,8 @@ export default {
   @include compare-cont-shell;
   @include compare-cont-title;
   @include compare-version-label;
+  margin:16px;
 }
-
 .table-border_1 {
   width: 100%;
   border-collapse: collapse;
@@ -86,8 +86,7 @@ export default {
   th,
   td {
     padding: 10px 12px;
-    border: 1px solid #ebeef5;
-    font-size: 13px;
+    border: 1px solid rgba(0,0,0,0.15);
     line-height: 20px;
     vertical-align: middle;
     word-break: break-all;
@@ -95,15 +94,15 @@ export default {
 
   th {
     width: 160px;
-    background: #f5f7fa;
-    color: #606266;
+    background: rgba(0,0,0,0.04);
+    color: rgba(0,0,0,.65);
     font-weight: 500;
     text-align: left;
   }
 
   td {
     width: calc((100% - 160px) / 2);
-    color: #303133;
+    color: rgba(0,0,0,.85);
 
     .version-blue,
     .version-green {
@@ -119,7 +118,7 @@ export default {
   tr.id-difference {
     td {
       background: #fef0f0;
-      color: #f56c6c;
+      color: $red;
     }
   }
 }

package/src/views/bd/setting/formVersion/compareCodeSection.vue

@@ -10,23 +10,25 @@
         </div>
         <div v-if="enableDiff" class="compare-diff-legend">
           <span class="compare-diff-nav">
-            <span
-              class="diff-nav-btn"
-              :class="{ 'is-disabled': !diffNavList.length }"
+            <el-button plain
+              :type="!diffNavList.length ? 'info' : 'primary'"
+              class="button-sty"
+              :disabled="!diffNavList.length"
               @click="diffNavList.length && gotoPrevDiff()"
             >
               <i class="el-icon-top"></i>{{ $t1("上一处差异") }}
-            </span>
-            <span
-              class="diff-nav-btn"
-              :class="{ 'is-disabled': !diffNavList.length }"
+            </el-button>
+            <el-button  plain
+              :type="!diffNavList.length ? 'info' : 'primary'"
+              class="button-sty"
+              :disabled="!diffNavList.length"
               @click="diffNavList.length && gotoNextDiff()"
             >
               <i class="el-icon-bottom"></i>{{ $t1("下一处差异") }}
-            </span>
-            <span class="diff-nav-btn" @click="gotoTop">
+            </el-button>
+            <el-button type="primary" plain @click="gotoTop" class="button-sty">
               <i class="el-icon-caret-top"></i>{{ $t1("返回顶部") }}
-            </span>
+            </el-button>
             <span v-if="diffNavList.length" class="diff-nav-count">
               {{ currentDiffIndex < 0 ? "-" : currentDiffIndex + 1 }} /
               {{ diffNavList.length }}
@@ -358,7 +360,8 @@ export default {
   @include compare-cont-full-link;
   @include compare-version-label;
   @include compare-flex-row;
-
+  padding:0 16px 16px;
+  overflow: hidden;
   .compare-code-flex {
     margin-top: 0;
 
@@ -378,17 +381,15 @@ export default {
     position: relative;
     min-height: 28px;
     padding-right: 24px;
+    margin-bottom:16px;
   }
 
   .compare-header-main {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 0 16px;
+    position:relative;
   }
 
   .title {
-    margin-bottom: 0 !important;
+
   }
 
   .compare-diff-legend {
@@ -397,7 +398,9 @@ export default {
     flex-wrap: wrap;
     font-size: 12px;
     gap: 0 12px;
-
+    position: absolute;
+    top: 8px;
+    left: 127px;
     .legend-item {
       display: inline-block;
       padding: 2px 8px;
@@ -501,6 +504,7 @@ export default {
     flex-direction: column;
     margin: 0;
     overflow: hidden;
+    background:#FFF;border-radius:12px;
 
     .compare-code-header {
       flex-shrink: 0;

package/src/views/bd/setting/formVersion/compareContMixin.scss

@@ -1,32 +1,26 @@
+@import "~@/styles/variables.scss";
 @mixin compare-cont-shell {
   position: relative;
-  margin-bottom: 8px;
-  padding: 8px;
-  background: #fff;
-  border-radius: 2px;
-
   ~ .compare-cont {
     margin-bottom: 0;
+
   }
 }
 
 @mixin compare-cont-title {
   > .title {
-    padding: 0 4px;
-    margin-bottom: 8px;
-    font-size: 14px;
-    color: #303133;
+    margin: -16px -16px 16px;
   }
 }
 
 @mixin compare-cont-full-link {
   .is-full {
     position: absolute;
-    top: 8px;
-    right: 8px;
-    padding: 2px 3px;
+    top: 12px;
+    right: 12px;
+    padding: 4px 6px;
     font-size: 16px;
-    color: #4595e6;
+    color: $baseColor;
     background: #f2f6fc;
     border-radius: 4px;
 
@@ -40,21 +34,21 @@
   .version-blue,
   .version-green {
     display: inline-block;
-    height: 22px;
-    margin-bottom: 8px;
-    padding: 0 4px;
-    font-size: 12px;
-    line-height: 22px;
+    height: 26px;
+    padding: 0 8px;
+    line-height: 26px;
     color: #fff;
     vertical-align: middle;
+    width: 88px;
+    text-align: center;
   }
 
   .version-blue {
-    background: #2c7eeb;
+    background: $baseColor;
   }
 
   .version-green {
-    background: #6dc442;
+    background: $green;
   }
 }
 

package/src/views/bd/setting/formVersion/compareDialog.vue

@@ -7,7 +7,7 @@
       :close-on-click-modal="falseValue"
       :visible.sync="showDialog"
       :modal="falseValue"
-      custom-class="dialog-style list-dialog dialog-checkbox pd_0 form-version-compare-dialog"
+      custom-class="dialog-style list-dialog dialog-checkbox nopd0 form-version-compare-dialog"
       width="1200px"
       @close="dialogClose"
       v-el-drag-dialog
@@ -16,7 +16,7 @@
     >
       <div
         class="cont compare-dialog-cont"
-        style="height: calc(100vh - 58px); overflow: auto"
+        style="height: calc(100vh - 48px); overflow: auto"
       >
         <compareContent
           v-if="compareReady"

package/src/views/bd/setting/formVersion/ftHistoryDialog.vue

@@ -7,7 +7,7 @@
       :close-on-click-modal="falseValue"
       :visible.sync="showDialog"
       :modal="falseValue"
-      custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+      custom-class="dialog-style list-dialog dialog-checkbox nopd0"
       width="1200px"
       @close="dialogClose"
       v-el-drag-dialog
@@ -17,7 +17,7 @@
       <div
         class="cont"
         id="containt"
-        style="height: calc(100vh - 58px); overflow: hidden"
+        style="height: calc(100vh - 48px); overflow: hidden"
       >
         <el-tabs ref="xTabs" v-model="activeName" class="tab-box">
           <el-tab-pane :label="$t1('详情')" name="first">
@@ -392,7 +392,7 @@ export default {
 </script>
 <style scoped lang="scss">
 .grid-height {
-  height: calc(100vh - 110px) !important;
+  height: calc(100vh - 106px) !important;
 }
 ::v-deep .detail-wrap .d-cont {
   height: calc(100vh - 148px) !important;

package/src/views/bd/setting/formVersion/reverButton.vue

@@ -1,5 +1,5 @@
 <template>
-  <span class="button-sty" style="cursor: unset">
+  <span style="cursor: unset">
     <el-button
       type="primary"
       plain

package/src/views/bd/setting/formVersion/tableDetailDiff.js

@@ -34,14 +34,15 @@ export function getDetailRowKey(row, index = 0) {
 }
 
 export function sortDetailRowsByZdEn(rows = []) {
-  return [...rows].sort((a, b) => {
+  /* return [...rows].sort((a, b) => {
     const aVal = String(a?.zdEn ?? "");
     const bVal = String(b?.zdEn ?? "");
     return aVal.localeCompare(bVal, "zh-CN", {
       numeric: true,
       sensitivity: "base",
     });
-  });
+  }); */
+  return [...rows];
 }
 
 export function buildRowDiffMaps(preCellDiff = {}, curCellDiff = {}) {

package/src/views/user/form/vform/designer.vue

@@ -668,10 +668,12 @@ export default {
 
       /* 处理地区选择字段 */
       if (fldObj.type === "AreaSelect") {
-        fieldSchema.optionItemsReadonly = true;
         fieldSchema.options.areaDataType = !fldObj.areaDataType
           ? fieldSchema.options.areaDataType
           : fldObj.areaDataType * 1;
+        if (fldObj.areaName) {
+          fieldSchema.options.areaName = fldObj.areaName;
+        }
       }
 
       /* 处理一对一字段 */