cloud-web-corejs 1.1.0-dev.26 → 1.1.0-dev.28

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

@@ -93,7 +93,7 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
   .full-width-input {
     width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/rich-editor-widget.vue

@@ -114,7 +114,7 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
   .full-width-input {
     width: 100% !important;

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

@@ -111,5 +111,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss";
+@import "~@base/styles/theme-variables.scss";
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/script-input-widget.vue

@@ -122,7 +122,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss";
+@import "~@base/styles/theme-variables.scss";
 
 .script-input-design-placeholder {
   min-height: 120px;

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

@@ -77,5 +77,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 </style>

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

@@ -81,6 +81,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/select-export-item-button-widget.vue

@@ -126,5 +126,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 </style>

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

@@ -130,7 +130,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 .full-width-input {
   width: 100% !important;

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

@@ -30,7 +30,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 .full-width-input {
   width: 100% !important;

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

@@ -122,7 +122,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 .full-width-input {
   width: 100% !important;

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

@@ -91,7 +91,7 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
   .full-width-input {
     width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue

@@ -159,7 +159,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss";
+@import "~@base/styles/theme-variables.scss";
 
 .design-time-bottom-margin {
   margin-bottom: 5px;

package/src/components/xform/form-designer/form-widget/field-widget/static-text-widget.vue

@@ -83,6 +83,6 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 
 </style>

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

@@ -165,5 +165,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 </style>

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

@@ -100,7 +100,7 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
   .full-width-input {
     width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/table-export-button-widget.vue

@@ -97,5 +97,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 </style>

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

@@ -143,5 +143,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 </style>

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

@@ -162,7 +162,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 ::v-deep .el-form-item {
   min-height: 34px;
 }

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

@@ -94,6 +94,6 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 </style>

package/src/components/xform/form-designer/form-widget/field-widget/time-range-widget.vue

@@ -97,7 +97,7 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
   .full-width-input {
     width: 100% !important;

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

@@ -125,7 +125,7 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
   .full-width-input {
     width: 100% !important;

package/src/components/xform/form-designer/form-widget/field-widget/title-head-widget.vue

@@ -77,6 +77,6 @@
 </script>
 
 <style lang="scss" scoped>
-  @import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+  @import "~@base/styles/theme-variables.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
 
 </style>

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

@@ -30,7 +30,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 .full-width-input {
   width: 100% !important;

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

@@ -314,7 +314,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 .full-width-input {
   width: 100% !important;

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

@@ -728,7 +728,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
+@import "~@base/styles/theme-variables.scss"; //* form-item-wrapper已引入，还需要重复引入吗？ *//
 
 .full-width-input {
   width: 100% !important;

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

@@ -188,7 +188,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/styles/global.scss";
+@import "~@base/styles/theme-variables.scss";
 
 .designer-vue-page-container {
   outline: 1px dashed #336699;

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/data-table-editor.vue

@@ -51,7 +51,10 @@
       <el-switch v-model="isShowQueryButton"></el-switch>
     </el-form-item>
     <el-form-item :label="i18nt('designer.setting.showPagination')">
-      <el-switch v-model="optionModel.showPagination"></el-switch>
+      <el-switch
+        v-model="optionModel.showPagination"
+        :disabled="isPagedReturnType"
+      ></el-switch>
     </el-form-item>
     <el-form-item :label="i18nt('是否显示表尾统计行')">
       <el-switch v-model="optionModel.showGridFooter"></el-switch>
@@ -719,6 +722,7 @@ import Draggable from "vuedraggable";
 import {
   deepClone,
   generateId,
+  isPagedCollectionReturnType,
 } from "../../../../../../components/xform/utils/util";
 import Sortable from "sortablejs";
 import requestaccessDialog from "../../../../../../views/user/form/report_requestaccess/dialog.vue";
@@ -1065,6 +1069,19 @@ export default {
     dynamicSchemaConvertDisplay() {
       return this.optionModel.dynamicSchemaConvert || "";
     },
+    isPagedReturnType() {
+      return isPagedCollectionReturnType(this.optionModel.accessReturnType);
+    },
+  },
+  watch: {
+    "optionModel.accessReturnType": {
+      immediate: true,
+      handler(val) {
+        if (isPagedCollectionReturnType(val)) {
+          this.optionModel.showPagination = true;
+        }
+      },
+    },
   },
   mounted: function () {
     const preloadColumnDialog = () => {

package/src/components/xform/form-designer/setting-panel/property-editor/container-list-h5/list-h5-editor.vue

@@ -59,10 +59,11 @@
               <el-input v-model="scope.row.prop"></el-input>
             </template>
           </el-table-column>
-<!-- 「列宽」已移除：H5 明细卡片是 dl/dt/dd 排版，不读列宽 —— 它当年是从数据表格
-           那套列配置沿用过来的，运行期只被塞进一个拼错的键(witdh)、无人读取。
-           列在卡片里占整行还是半行，由下面的「H5列宽」控制。
-           存量模板里残留的 width 值不用清，读不到就是了。 -->
+          <el-table-column :label="i18nt('designer.setting.columnWidth')" width="100" prop="width">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.width"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column :label="i18nt('designer.setting.visibleColumn')" width="70" prop="show">
             <template slot-scope="scope">
               <el-switch v-model="scope.row.show"></el-switch>
@@ -78,21 +79,6 @@
               <el-switch v-model="scope.row.showForRow"></el-switch>
             </template>
           </el-table-column>
-          <!-- H5 明细卡片里这个字段占整行还是半行（半行=一行两个）。
-               不配即整行，运行期判等只认 'half'（存量列读到 undefined 就是整行），
-               不能写成 !== 'full'。样式见 xform/styles/h5.scss 块 I2。
-               ★ 用 :value + $set 而不是 v-model：h5Span 是后加的键，存量列上没有，
-               Vue 2 只给赋值那一刻已存在的属性装 getter/setter，直接 v-model
-               新增属性追踪不到，选完不回显。 -->
-          <el-table-column label="H5列宽" width="110" prop="h5Span">
-            <template slot-scope="scope">
-              <el-select :value="scope.row.h5Span" clearable placeholder="整行"
-                         @input="v => $set(scope.row, 'h5Span', v)">
-                <el-option value="full" label="整行"></el-option>
-                <el-option value="half" label="半行(一行两个)"></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
           <el-table-column :label="i18nt('designer.setting.formatOfColumn')" width="200" prop="formatS">
             <template slot-scope="scope">
               <el-select v-model="scope.row.formatS" @change="changeFormatS(scope.row)" clearable>
@@ -455,11 +441,38 @@ export default {
         },
         {
           label: 'edit Format',
-          /* H5 暂时只读：编辑格式只留下拉框，其余先不下发 */
           options: [
+            {
+              value: 'editInput',
+              label: '文本输入框'
+            },
+            {
+              value: 'editNumber',
+              label: '数字输入框'
+            },
+            {
+              value: 'editDate',
+              label: '日期输入框'
+            },
             {
               value: 'editSelect',
               label: '下拉框'
+            },
+            {
+              value: 'editSearch',
+              label: '搜索框'
+            },
+            {
+              value: 'editDelete',
+              label: '删除按钮'
+            },
+            {
+              value: 'editButton',
+              label: '查看按钮'
+            },
+            {
+              value: 'button',
+              label: '按钮'
             }
           ]
         },

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

@@ -123,7 +123,7 @@ export const containers = [
 }, {
   type: "grid-sub-form",
   category: "container",
-  icon: "grid-sub-form",
+  icon: "sub-form",
   widgetList: [],
   options: {
     name: "",
@@ -141,7 +141,7 @@ export const containers = [
   {
     type: "grid-col",
     category: "container",
-    icon: "grid-col",
+    icon: "grid",
     internal: !0,
     widgetList: [],
     options: {
@@ -163,7 +163,7 @@ export const containers = [
   {
     type: "table-cell",
     category: "container",
-    icon: "table-cell",
+    icon: "table",
     internal: !0,
     widgetList: [],
     merged: !1,
@@ -179,7 +179,7 @@ export const containers = [
   {
     type: "tab-pane",
     category: "container",
-    icon: "tab-pane",
+    icon: "tab",
     internal: !0,
     widgetList: [],
     options: {
@@ -588,7 +588,7 @@ export const containers = [
      * 直接拖进 tab-pane(见 docs/详情模块标签承载方案.md) */
     type: "detail-pane",
     category: "container",
-    icon: "grid-col",
+    icon: "grid",
     buttonWidgetList: [],
     widgetList: [],
     options: {
@@ -798,7 +798,7 @@ export const containers = [
   {
     type: "h5-card-pane",
     category: "container",
-    icon: "tab-pane",
+    icon: "tab",
     internal: !0,
     buttonWidgetList: [],
     widgetList: [],
@@ -828,7 +828,7 @@ export const containers = [
   {
     type: "h5-table-cell",
     category: "container",
-    icon: "table-cell",
+    icon: "table",
     internal: !0,
     widgetList: [],
     merged: !1,
@@ -3861,7 +3861,7 @@ export const advancedFields = [
   },
   {
     type: "dropdown-item",
-    icon: "tab-pane",
+    icon: "tab",
     internal: !0,
     options: {
       name: "",

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

@@ -21,6 +21,8 @@ import {
   traverseAllWidgetsNew,
   isAttachmentWidgetType,
   isVabsearchMultiWidget,
+  isPagedCollectionReturnType,
+  shouldShowDataTablePagination,
   XFORM_ROW_CLEAN_FIELDS,
 } from "../../../../components/xform/utils/util";
 import {
@@ -266,6 +268,12 @@ modules = {
       let formRef = this.getFormRef();
       return formRef.dataId;
     },
+    /**
+     * 分页集合数据必须显示分页，否则查询结果按 records/total 解析会报错。
+     */
+    isPaginationVisible() {
+      return shouldShowDataTablePagination(this.widget.options);
+    },
   },
   created: function () {
     if (!this.formModel[this.fieldKeyName])
@@ -2697,7 +2705,9 @@ modules = {
       let tableRef = this.getTableRef();
       let formDataModel = this.getFormRef().formDataModel;
       let isQueryTable = this.widget.options.isQueryTable || false;
-      let isDataPage = this.widget.options.accessReturnType === "2";
+      let isDataPage = isPagedCollectionReturnType(
+        this.widget.options.accessReturnType
+      );
       let reportTemplate = this.getFormRef().reportTemplate;
       let formCode = reportTemplate.formCode;
       let dataId = this.formDataId;
@@ -2719,7 +2729,7 @@ modules = {
         paramFun = () => {
           let conditions = this.getSearchCondition();
           let $grid = this.getGridTable();
-          if (this.widget.options.showPagination) {
+          if (this.isPaginationVisible) {
             let proxyInfo = $grid.getProxyInfo();
             let searchCount = true;
             let isQueryAllPage = getTableStateValue($grid, "isQueryAllPage");
@@ -3166,9 +3176,7 @@ modules = {
         config: {
           height: height,
           showFooter,
-          pagerConfig: this.widget.options.showPagination
-            ? pagerConfig
-            : false,
+          pagerConfig: this.isPaginationVisible ? pagerConfig : false,
           treeConfig,
           rowConfig,
           headerCellStyle,
@@ -3799,10 +3807,10 @@ modules = {
     getScriptCode() {
       let accessReturnType = this.widget.options.accessReturnType;
       let defaultScriptCode = "getList";
-      if (accessReturnType === "1") {
-        defaultScriptCode = "getList";
-      } else if (accessReturnType === "2") {
+      if (isPagedCollectionReturnType(accessReturnType)) {
         defaultScriptCode = "getPage";
+      } else if (String(accessReturnType) === "1") {
+        defaultScriptCode = "getList";
       }
       let scriptCode = this.widget.options.formScriptCode || defaultScriptCode;
       return scriptCode;