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

package/package.json

@@ -1,12 +1,10 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.1.0-dev.27",
+  "version": "1.1.0-dev.28",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",
-    "check:package-resources": "node build/check-package-resources.js",
-    "check:minimal-consumer": "node build/check-minimal-consumer-build.js",
     "lint": "eslint --ext .js,.vue src",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
@@ -15,7 +13,7 @@
     "new": "plop",
     "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",
-    "test:ci": "npm run check:package-resources && npm run check:minimal-consumer && npm run lint && npm run test:unit",
+    "test:ci": "npm run lint && npm run test:unit",
     "updateCorejs": "npm install cloud-web-corejs --registry https://registry.npmjs.org",
     "publishDev": "npm publish --tag dev"
   },
@@ -177,6 +175,7 @@
     "src/components/bizTab",
     "src/api",
     "src/views/bd",
+    "src/views/demo",
     "src/views/support",
     "src/views/user",
     "src/views/mobile/user",
@@ -184,9 +183,7 @@
     "src/mixins",
     "src/directive",
     "src/store",
-    "src/core-resources",
-    "src/styles",
-    "src/icons",
+    "src/resources/js",
     "src/lang/index.js",
     "src/lang/locale/en/login.js",
     "src/lang/locale/zh/login.js",
@@ -195,10 +192,6 @@
     "src/router",
     "src/permission.js",
     "src/index.js",
-    "src/index.next.js",
-    "src/boot-assets.legacy.js",
-    "src/boot-assets.next.js",
-    "src/app-bootstrap.js",
     "src/public-path.js",
     "src/microRouter",
     "src/App.vue"

package/src/components/table/index.js

@@ -890,6 +890,9 @@ function initOption(opts) {
   result = configUtil.extendDeeply(defaultOptions, config);
   applyTableFeatureDisabled(result, that);
 
+  if (!result.pagerConfig) {
+    return result;
+  }
   let pageSize = result.pagerConfig.pageSize;
   let pageSizes = result.pagerConfig.pageSizes;
   if (pageSizes && !pageSizes.includes(pageSize)) {

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-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;