cloud-web-corejs 1.0.54-dev.786 → 1.0.54-dev.787

package/src/components/formDrawer/index.js

@@ -0,0 +1,50 @@
+const modules = {};
+import vue from "vue";
+
+// 壳组件懒加载：首屏只留本入口几十行；抽屉壳（含 select 逻辑、按钮公共模块）
+// 随首次调用进独立 chunk，xform 渲染器与 formDialog 共享同一异步 chunk
+let FormDrawerCtor = null;
+
+function loadCtor() {
+  if (FormDrawerCtor) return Promise.resolve(FormDrawerCtor);
+  return import(
+    /* webpackChunkName: "form-drawer" */ "./drawer.vue"
+  ).then((m) => {
+    FormDrawerCtor = vue.extend(m.default);
+    return FormDrawerCtor;
+  });
+}
+
+/**
+ * JS 调用打开 formCode 抽屉。每次调用创建独立实例，支持叠开多层。
+ * options：{ formCode, title, size, direction, param, conditionParam, plain,
+ *           select: {multiple, rows, fieldKey, queryParam, onConfirm},
+ *           buttons, showFooter, readonly, onReady, beforeConfirm, model, ... }
+ * resolve：默认按钮下 select 模式返回选中行数组、表单模式返回表单数据；
+ * 配置了自定义按钮（formConfig.actionButtons / options.buttons）返回 {action, data}；
+ * 取消/关闭返回 null。详见 components/formDialog/README.md。
+ */
+function open(options = {}) {
+  return loadCtor().then((Ctor) => {
+    const parent
+      = typeof window !== "undefined" && window.$vueRoot ? window.$vueRoot : null;
+    const instanceOptions = {};
+    if (parent) {
+      instanceOptions.parent = parent;
+      if (parent._i18n) {
+        instanceOptions.i18n = parent._i18n;
+      }
+    }
+    const instance = new Ctor(instanceOptions);
+    instance.$mount();
+    document.body.appendChild(instance.$el);
+    return instance.open(options);
+  });
+}
+
+modules.install = function (Vue) {
+  Vue.prototype.$formDrawer = open;
+};
+modules.open = open;
+
+export default modules;

package/src/components/onlineTalk/talkUserDialog.vue

@@ -37,7 +37,7 @@
                 type="text"
                 status="primary"
                 plain
-                >{{ $t1("重置") }}
+                >{{ $t1("刷新") }}
               </vxe-button>
               <vxe-button
                 status="warning"

package/src/components/tempStorage/tempStorageDialog.vue

@@ -38,7 +38,7 @@
                 type="text"
                 status="primary"
                 plain
-                >{{ $t1("重置") }}
+                >{{ $t1("刷新") }}
               </vxe-button>
               <vxe-button
                 status="warning"

package/src/components/wf/addTaskUserdialog.vue

@@ -33,7 +33,7 @@
           <div class="clearfix screen-btns">
             <div class="fr">
               <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>{{ $t2('重置', 'system.button.reset') }}
+                          plain>{{ $t1('刷新') }}
               </vxe-button>
               <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
                 {{ $t2('搜索', 'system.button.search') }}

package/src/components/xform/form-designer/form-widget/container-widget/data-table-widget.vue

@@ -65,7 +65,7 @@
               <div class="fr">
                 <!-- <vxe-button icon="el-icon-view" class="button-sty" @click="searchEvent">显示总记录数</vxe-button> -->
                 <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                            plain>重置
+                            plain>刷新
                 </vxe-button>
 
                 <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索

package/src/components/xform/form-designer/form-widget/dialog/formDialog.vue

@@ -6,7 +6,16 @@
     v-bind="dialogConfig"
     @close="close"
   >
-    <div class="cont designer-view" v-bind="bodyConfig" id="containt">
+    <!-- host:"list" —— 承载列表宿主页（自带「常规(详情)/列表」页签），行点击进详情等行为与整页一致。
+         list.vue 根节点自带 #containt，本分支不再套 id，避免嵌套重复。 -->
+    <div
+      class="cont designer-view fd-list-host"
+      v-bind="bodyConfig"
+      v-if="listHost"
+    >
+      <list-view-host :formCode="listFormCode" :param="dialogParam" />
+    </div>
+    <div class="cont designer-view" v-bind="bodyConfig" id="containt" v-else>
       <v-form-render
         :form-json.sync="formJson"
         :form-data="formData"
@@ -22,6 +31,7 @@
         v-bind="formConfig"
         :param="dialogParam"
         class="data-table_height"
+        @hook:mounted="handleFormMounted"
       />
     </div>
     <span
@@ -34,7 +44,27 @@
         <i class="el-icon-close el-icon"></i>
         {{ $t2("取 消", "system.button.cancel2") }}
       </el-button>
-      <el-button type="primary" @click="dialogSubmit" class="button-sty" v-if="confirmButtonVisible">
+      <!-- 模板配了 formConfig.actionButtons 时，用配置按钮替代「确定」（取消保持不变） -->
+      <template v-if="visibleFooterButtons">
+        <el-button
+          v-for="btn in visibleFooterButtons"
+          :key="btn.code"
+          :type="btn.type || 'primary'"
+          :plain="btn.plain === true"
+          class="button-sty"
+          :loading="!!btnLoadingMap[btn.code]"
+          @click="handleActionButton(btn)"
+        >
+          <i v-if="btn.icon" :class="[btn.icon, 'el-icon']"></i>
+          {{ btnLabel(btn) }}
+        </el-button>
+      </template>
+      <el-button
+        v-else-if="confirmButtonVisible"
+        type="primary"
+        @click="dialogSubmit"
+        class="button-sty"
+      >
         <i class="el-icon-check el-icon"></i>
         {{ $t2("确 定", "system.button.confirm2") }}
       </el-button>
@@ -44,9 +74,22 @@
 
 <script>
 import VFormRender from "../../../../../components/xform/form-render/index.vue";
+import {
+  resolveActionButtons,
+  hasButtonPermission,
+  isButtonVisible,
+  runActionButton,
+} from "@base/components/formDialog/actionButtons";
 
 export default {
-  components: { VFormRender },
+  components: {
+    VFormRender,
+    // 列表宿主页（x-tabs：常规/列表/其他页签/多标签编辑），仅 host:"list" 时加载
+    ListViewHost: () =>
+      import(
+        /* webpackChunkName: "form-list-host" */ "@base/views/user/form/view/list.vue"
+      ),
+  },
   props: {
     visiable: Boolean,
     option: Object,
@@ -76,7 +119,11 @@ export default {
       currentLayoutType: null,
       dataId: null,
       formConfig: {},
-      confirmButtonVisible: true
+      confirmButtonVisible: true,
+      // 模板 formConfig.actionButtons（权限过滤后）；为空则底部保持默认「确定」
+      customButtons: null,
+      btnLoadingMap: {},
+      formRefMounted: false,
     };
   },
   computed: {
@@ -86,6 +133,13 @@ export default {
     dialogParam() {
       return this.option?.param;
     },
+    // host:"list" —— 用列表宿主页承载（带「常规/列表」页签），而非直接渲染单个表单
+    listHost() {
+      return this.option?.host === "list";
+    },
+    listFormCode() {
+      return this.option?.formCode;
+    },
     /* formConfig() {
       return this.option?.formConfig;
     }, */
@@ -107,6 +161,15 @@ export default {
       config.title = this.$t1(config.title);
       return config;
     },
+    // 自定义按钮渲染列表：权限已在 initCustomButtons 过滤，此处按 visible 脚本过滤
+    visibleFooterButtons() {
+      if (!this.customButtons || !this.customButtons.length) return null;
+      this.formRefMounted; // eslint-disable-line no-unused-expressions
+      let buttons = this.customButtons.filter((btn) =>
+        isButtonVisible(btn, this.$refs.vFormRef)
+      );
+      return buttons.length ? buttons : null;
+    },
     bodyConfig() {
       let config = {};
       let classStr = this.currentLayoutType;
@@ -131,6 +194,8 @@ export default {
     this.currentLayoutType = currentFormConfig.layoutType;
 
     this.selectMulti = this.option.multiple ?? true;
+    // 列表宿主页自己会加载模板；仅在未指定标题时补取一次模板名做弹框标题
+    if (this.listHost && this.option.dialogConfig?.title) return;
     this.getReportTemplate();
   },
   methods: {
@@ -162,6 +227,8 @@ export default {
         success: (res) => {
           let formTemplate = res.objx || {};
           this.formTemplate = formTemplate;
+          // 列表宿主模式：只借模板名做标题，渲染与按钮均由宿主页自己负责
+          if (this.listHost) return;
           this.formJson = formTemplate.formViewContent
             ? JSON.parse(formTemplate.formViewContent)
             : {};
@@ -170,11 +237,47 @@ export default {
           if (formConfig.searchDialogUniqueField) {
             this.fieldKey = formConfig.searchDialogUniqueField;
           }
+          this.initCustomButtons(formConfig);
 
           this.showRender = true;
         },
       });
     },
+    // 模板 actionButtons：option.buttons 可覆盖；权限 formCode:authName 在此一次性过滤
+    initCustomButtons(formConfig) {
+      let buttons = resolveActionButtons(this.option?.buttons, formConfig);
+      this.customButtons = buttons
+        ? buttons.filter((btn) => hasButtonPermission(btn, this.formCode, this))
+        : null;
+    },
+    handleFormMounted() {
+      this.formRefMounted = true;
+    },
+    btnLabel(btn) {
+      return this.$t1 ? this.$t1(btn.label) : btn.label;
+    },
+    /**
+     * 自定义按钮点击：校验 → onClick 脚本 → done/closeAfter 收口。
+     * 收口时优先回调 option.onAction(payload, formRef, vm)；
+     * 未提供则仅按 closeAfter 关闭（按钮自身脚本即业务处理，不再走 option.confirm）。
+     */
+    handleActionButton(btn) {
+      let formRef = this.$refs.vFormRef;
+      if (!formRef || this.btnLoadingMap[btn.code]) return;
+      this.$set(this.btnLoadingMap, btn.code, true);
+      let clearLoading = () => this.$set(this.btnLoadingMap, btn.code, false);
+      runActionButton(btn, {
+        formRef,
+        host: this,
+        getSelection: () => [],
+        onSettle: (payload, close) => {
+          if (typeof this.option.onAction === "function") {
+            this.option.onAction(payload, formRef, this);
+          }
+          if (close) this.close();
+        },
+      }).then(clearLoading, clearLoading);
+    },
     close() {
       let formRef = this.$refs.vFormRef;
       this.showDialog = false;
@@ -206,6 +309,14 @@ export default {
 .list-dialog {
   .el-dialog__body {
     height: calc(100% - 42px);
+    // host:"list"：.cont 已有确定高度，把它传给 list.vue 根节点 #containt，
+    // .tab-box 自身是 height:100%，父链没高度页签内容区会塌成一条
+    .cont.fd-list-host {
+      padding: 0;
+      ::v-deep > #containt {
+        height: 100%;
+      }
+    }
     .cont {
       height: calc(100vh - 210px);
 

package/src/components/xform/form-designer/form-widget/dialog/formDrawer.vue

@@ -1,18 +1,32 @@
 <template>
   <el-drawer v-bind="dialogConfig" @close="close" :visible.sync="showDialog">
-    <div class="cont" v-bind="bodyConfig" id="containt">
+    <!-- host:"list" —— 承载列表宿主页（自带「常规(详情)/列表」页签），行点击进详情等行为与整页一致。
+         list.vue 根节点自带 #containt，本分支不再套 id，避免嵌套重复。 -->
+    <div class="cont fd-list-host" v-bind="bodyConfig" v-if="listHost">
+      <list-view-host :formCode="listFormCode" :param="dialogParam"/>
+    </div>
+    <div class="cont" v-bind="bodyConfig" id="containt" v-else>
       <v-form-render :form-json.sync="formJson" :form-data="formData" :option-data="optionData" ref="vFormRef"
                      :reportTemplate.sync="formTemplate" :conditionParam.sync="conditionParam"
                      :formInsData.sync="formInsData" v-if="showRender" visible-key="showRender" :parent-target="_self"
                      @reload="reload" :param="dialogParam"
-                     class="data-table_height"/>
+                     class="data-table_height" @hook:mounted="handleFormMounted"/>
     </div>
     <span class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">
 			<el-button type="primary" plain class="button-sty" @click="close">
 				<i class="el-icon-close el-icon"></i>
 				{{ $t2('取 消', 'system.button.cancel2') }}
 			</el-button>
-			<el-button type="primary" @click="dialogSubmit" class="button-sty">
+			<!-- 模板配了 formConfig.actionButtons 时，用配置按钮替代「确定」（取消保持不变） -->
+			<template v-if="visibleFooterButtons">
+				<el-button v-for="btn in visibleFooterButtons" :key="btn.code" :type="btn.type || 'primary'"
+									 :plain="btn.plain === true" class="button-sty" :loading="!!btnLoadingMap[btn.code]"
+									 @click="handleActionButton(btn)">
+					<i v-if="btn.icon" :class="[btn.icon, 'el-icon']"></i>
+					{{ btnLabel(btn) }}
+				</el-button>
+			</template>
+			<el-button v-else type="primary" @click="dialogSubmit" class="button-sty">
 				<i class="el-icon-check el-icon"></i>
 				{{ $t2('确 定', 'system.button.confirm2') }}
 			</el-button>
@@ -22,9 +36,22 @@
 
 <script>
 import VFormRender from "../../../../../components/xform/form-render/index.vue";
+import {
+  resolveActionButtons,
+  hasButtonPermission,
+  isButtonVisible,
+  runActionButton,
+} from "@base/components/formDialog/actionButtons";
 
 export default {
-  components: {VFormRender},
+  components: {
+    VFormRender,
+    // 列表宿主页（x-tabs：常规/列表/其他页签/多标签编辑），仅 host:"list" 时加载
+    ListViewHost: () =>
+      import(
+        /* webpackChunkName: "form-list-host" */ "@base/views/user/form/view/list.vue"
+      ),
+  },
   props: {
     visiable: Boolean,
     option: Object
@@ -52,7 +79,11 @@ export default {
       conditionParam: null,
       formInsData: null,
       $grid: null,
-      currentLayoutType: null
+      currentLayoutType: null,
+      // 模板 formConfig.actionButtons（权限过滤后）；为空则底部保持默认「确定」
+      customButtons: null,
+      btnLoadingMap: {},
+      formRefMounted: false
     };
   },
   computed: {
@@ -62,6 +93,13 @@ export default {
     dialogParam() {
       return this.option?.param;
     },
+    // host:"list" —— 用列表宿主页承载（带「常规/列表」页签），而非直接渲染单个表单
+    listHost() {
+      return this.option?.host === "list";
+    },
+    listFormCode() {
+      return this.option?.formCode;
+    },
     dialogConfig() {
       let customClass = "dialog-style list-dialog dialog-checkbox pd_0";
       if (this.option.dialogConfig?.customClass) {
@@ -83,6 +121,15 @@ export default {
       config.title = this.$t1(config.title);
       return config;
     },
+    // 自定义按钮渲染列表：权限已在 initCustomButtons 过滤，此处按 visible 脚本过滤
+    visibleFooterButtons() {
+      if (!this.customButtons || !this.customButtons.length) return null;
+      this.formRefMounted; // eslint-disable-line no-unused-expressions
+      let buttons = this.customButtons.filter((btn) =>
+        isButtonVisible(btn, this.$refs.vFormRef)
+      );
+      return buttons.length ? buttons : null;
+    },
     bodyConfig() {
       let config = {};
       let classStr = this.currentLayoutType
@@ -101,6 +148,8 @@ export default {
     this.currentLayoutType = currentFormConfig.layoutType
 
     this.selectMulti = this.option.multiple ?? true;
+    // 列表宿主页自己会加载模板；仅在未指定标题时补取一次模板名做抽屉标题
+    if (this.listHost && this.option.dialogConfig?.title) return;
     this.getReportTemplate();
   },
   methods: {
@@ -130,12 +179,15 @@ export default {
         success: res => {
           let formTemplate = res.objx || {};
           this.formTemplate = formTemplate;
+          // 列表宿主模式：只借模板名做标题，渲染与按钮均由宿主页自己负责
+          if (this.listHost) return;
           this.formJson = formTemplate.formViewContent ? JSON.parse(formTemplate.formViewContent) : {};
           this.layoutType = this.formJson.formConfig.layoutType
           let formConfig = this.formJson.formConfig;
           if (formConfig.searchDialogUniqueField) {
             this.fieldKey = formConfig.searchDialogUniqueField;
           }
+          this.initCustomButtons(formConfig);
 
           this.showRender = true;
 
@@ -143,6 +195,41 @@ export default {
         }
       });
     },
+    // 模板 actionButtons：option.buttons 可覆盖；权限 formCode:authName 在此一次性过滤
+    initCustomButtons(formConfig) {
+      let buttons = resolveActionButtons(this.option?.buttons, formConfig);
+      this.customButtons = buttons
+        ? buttons.filter((btn) => hasButtonPermission(btn, this.formCode, this))
+        : null;
+    },
+    handleFormMounted() {
+      this.formRefMounted = true;
+    },
+    btnLabel(btn) {
+      return this.$t1 ? this.$t1(btn.label) : btn.label;
+    },
+    /**
+     * 自定义按钮点击：校验 → onClick 脚本 → done/closeAfter 收口。
+     * 收口时优先回调 option.onAction(payload, formRef, vm)；
+     * 未提供则仅按 closeAfter 关闭（按钮自身脚本即业务处理，不再走 option.confirm）。
+     */
+    handleActionButton(btn) {
+      let formRef = this.$refs.vFormRef;
+      if (!formRef || this.btnLoadingMap[btn.code]) return;
+      this.$set(this.btnLoadingMap, btn.code, true);
+      let clearLoading = () => this.$set(this.btnLoadingMap, btn.code, false);
+      runActionButton(btn, {
+        formRef,
+        host: this,
+        getSelection: () => [],
+        onSettle: (payload, close) => {
+          if (typeof this.option.onAction === "function") {
+            this.option.onAction(payload, formRef, this);
+          }
+          if (close) this.close();
+        },
+      }).then(clearLoading, clearLoading);
+    },
     close() {
       let formRef = this.$refs.vFormRef;
       this.showDialog = false;
@@ -172,6 +259,16 @@ export default {
   .el-dialog__body {
     height: calc(100% - 42px);
 
+    // host:"list"：.cont 已有确定高度，把它传给 list.vue 根节点 #containt，
+    // .tab-box 自身是 height:100%，父链没高度页签内容区会塌成一条
+    .cont.fd-list-host {
+      padding: 0;
+
+      ::v-deep > #containt {
+        height: 100%;
+      }
+    }
+
     .cont {
       height: calc(100vh - 210px);
 

package/src/components/xform/form-designer/form-widget/dialog/formFieldDialog.vue

@@ -27,7 +27,7 @@
           <div class="clearfix screen-btns">
             <div class="fr">
               <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>重置
+                          plain>刷新
               </vxe-button>
               <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索</vxe-button>
             </div>

package/src/components/xform/form-designer/form-widget/dialog/vabSearchDialog.vue

@@ -27,7 +27,7 @@
           <div class="clearfix screen-btns">
             <div class="fr">
               <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>重置
+                          plain>刷新
               </vxe-button>
               <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索</vxe-button>
             </div>