cloud-web-corejs 1.0.54-dev.643 → 1.0.54-dev.645

package/package.json

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

package/src/components/xform/form-designer/toolbar-panel/index.vue

@@ -1,20 +1,38 @@
 <template>
   <div class="toolbar-container">
     <div class="left-toolbar">
-      <el-button type="text" :disabled="undoDisabled" :title="i18nt('designer.toolbar.undoHint')" @click="undoHistory">
-        <svg-icon icon-class="undo"/>
+      <el-button
+        type="text"
+        :disabled="undoDisabled"
+        :title="i18nt('designer.toolbar.undoHint')"
+        @click="undoHistory"
+      >
+        <svg-icon icon-class="undo" />
       </el-button>
-      <el-button type="text" :disabled="redoDisabled" :title="i18nt('designer.toolbar.redoHint')" @click="redoHistory">
-        <svg-icon icon-class="redo"/>
+      <el-button
+        type="text"
+        :disabled="redoDisabled"
+        :title="i18nt('designer.toolbar.redoHint')"
+        @click="redoHistory"
+      >
+        <svg-icon icon-class="redo" />
       </el-button>
-      <el-button-group>
-<!--        <el-button :type="layoutType === 'PC' ? 'info' : ''" @click="changeLayoutType('PC')" size="mini">
-          {{ i18nt('designer.toolbar.pcLayout') }}
-        </el-button>-->
+      <el-button-group v-if="$store.getters.loginAccount === 'dev_徐凯'">
+        <el-button
+          :type="layoutType === 'PC' ? 'info' : ''"
+          @click="changeLayoutType('PC')"
+          size="mini"
+        >
+          {{ i18nt("designer.toolbar.pcLayout") }}
+        </el-button>
         <!--         <el-button :type="layoutType === 'Pad' ? 'info' : ''" @click="changeLayoutType('Pad')">{{ i18nt('designer.toolbar.padLayout') }}</el-button>-->
-        <!--        <el-button :type="layoutType === 'H5' ? 'info' : ''" @click="changeLayoutType('H5')" size="mini">
-                  {{ i18nt('designer.toolbar.mobileLayout') }}
-                </el-button>-->
+        <el-button
+          :type="layoutType === 'H5' ? 'info' : ''"
+          @click="changeLayoutType('H5')"
+          size="mini"
+        >
+          {{ i18nt("designer.toolbar.mobileLayout") }}
+        </el-button>
       </el-button-group>
       <!--       <el-button type="" style="margin-left: 20px" :title="i18nt('designer.toolbar.nodeTreeHint')" @click="showNodeTreeDrawer"><svg-icon icon-class="node-tree" /></el-button>-->
     </div>
@@ -46,26 +64,50 @@
                   <i class="iconfont icon-liebiaoshezhi-list-setting"/>
                   表单/列表设置
                 </el-button>-->
-        <el-button type="primary" @click="saveReportTemplate()" plain
-                   v-if="designer.vueInstance.isDev && designer.vueInstance.menuKindAuth.editAuth===1 && !readonly">
-          <i class="el-icon-check"/>
+        <el-button
+          type="primary"
+          @click="saveReportTemplate()"
+          plain
+          v-if="
+            designer.vueInstance.isDev &&
+            designer.vueInstance.menuKindAuth.editAuth === 1 &&
+            !readonly
+          "
+        >
+          <i class="el-icon-check" />
           保存
         </el-button>
         <el-divider direction="vertical"></el-divider>
-        <el-button v-if="showToolButton('clearDesignerButton') && !readonly" type="text" @click="clearFormWidget">
-          <i class="el-icon-delete"/>
-          {{ i18nt('designer.toolbar.clear') }}
+        <el-button
+          v-if="showToolButton('clearDesignerButton') && !readonly"
+          type="text"
+          @click="clearFormWidget"
+        >
+          <i class="el-icon-delete" />
+          {{ i18nt("designer.toolbar.clear") }}
         </el-button>
-        <el-button v-if="showToolButton('previewFormButton')" type="text" @click="previewForm">
-          <i class="el-icon-view"/>
-          {{ i18nt('designer.toolbar.preview') }}
+        <el-button
+          v-if="showToolButton('previewFormButton')"
+          type="text"
+          @click="previewForm"
+        >
+          <i class="el-icon-view" />
+          {{ i18nt("designer.toolbar.preview") }}
         </el-button>
         <el-divider direction="vertical"></el-divider>
-        <el-button v-if="showToolButton('importJsonButton') && !readonly" type="text" @click="importJson">
-          {{ i18nt('designer.toolbar.importJson') }}
+        <el-button
+          v-if="showToolButton('importJsonButton') && !readonly"
+          type="text"
+          @click="importJson"
+        >
+          {{ i18nt("designer.toolbar.importJson") }}
         </el-button>
-        <el-button v-if="showToolButton('exportJsonButton')" type="text" @click="exportJson">
-          {{ i18nt('designer.toolbar.exportJson') }}
+        <el-button
+          v-if="showToolButton('exportJsonButton')"
+          type="text"
+          @click="exportJson"
+        >
+          {{ i18nt("designer.toolbar.exportJson") }}
         </el-button>
         <!--<el-button v-if="showToolButton('exportCodeButton')" type="text" @click="exportCode">{{ i18nt('designer.toolbar.exportCode') }}</el-button>
          <el-button v-if="showToolButton('generateSFCButton')" type="text" @click="generateSFC">
@@ -92,12 +134,21 @@
       :modal-append-to-body="true"
       class="small-padding-dialog preview-dialog"
       width="75%"
-      :fullscreen='true'
-      @close="showPreviewDialogFlag=false"
+      :fullscreen="true"
+      @close="showPreviewDialogFlag = false"
     >
       <div>
-        <div class="form-render-wrapper" id="containt"
-             :class="[layoutType === 'H5' ? 'h5-layout' : layoutType === 'Pad' ? 'pad-layout' : '']">
+        <div
+          class="form-render-wrapper"
+          id="containt"
+          :class="[
+            layoutType === 'H5'
+              ? 'h5-layout'
+              : layoutType === 'Pad'
+              ? 'pad-layout'
+              : '',
+          ]"
+        >
           <VFormRender
             ref="preForm"
             :form-json="formJson"
@@ -108,7 +159,10 @@
             @buttonClick="testOnButtonClick"
             @formChange="handleFormChange"
             :reportTemplate.sync="reportTemplate"
-            v-if="showRender" visible-key="showRender" :parent-target="_self" @reload="$reloadHandle"
+            v-if="showRender"
+            visible-key="showRender"
+            :parent-target="_self"
+            @reload="$reloadHandle"
           >
             <!--
             <div slot="testSlot">aaaa</div>
@@ -239,10 +293,18 @@
         <el-button type="primary" @click="setFormDisabled" class="button-sty">{{ i18nt('designer.hint.disableForm') }}</el-button>
         <el-button type="primary" @click="setFormEnabled" class="button-sty">{{ i18nt('designer.hint.enableForm') }}</el-button>
         <el-button type="" @click="showPreviewDialogFlag = false" class="button-sty">{{ i18nt('designer.hint.closePreview') }}</el-button> -->
-        <el-button v-if="false" @click="printFormJson" class="button-sty">PrintFormJson</el-button>
-        <el-button v-if="false" @click="testValidate" class="button-sty">TestValidate</el-button>
-        <el-button v-if="false" @click="testSetFormData" class="button-sty">TestSF</el-button>
-        <el-button @click="$refs['preForm'].saveForm()" class="button-sty">测试保存</el-button>
+        <el-button v-if="false" @click="printFormJson" class="button-sty"
+          >PrintFormJson</el-button
+        >
+        <el-button v-if="false" @click="testValidate" class="button-sty"
+          >TestValidate</el-button
+        >
+        <el-button v-if="false" @click="testSetFormData" class="button-sty"
+          >TestSF</el-button
+        >
+        <el-button @click="$refs['preForm'].saveForm()" class="button-sty"
+          >测试保存</el-button
+        >
       </div>
     </el-dialog>
 
@@ -260,16 +322,23 @@
       :append-to-body="true"
       :modal-append-to-body="true"
     >
-      <el-alert type="info" :title="i18nt('designer.hint.importJsonHint')" show-icon class="alert-padding"></el-alert>
-      <code-editor :mode="'json'" :readonly="false" v-model="importTemplate"></code-editor>
+      <el-alert
+        type="info"
+        :title="i18nt('designer.hint.importJsonHint')"
+        show-icon
+        class="alert-padding"
+      ></el-alert>
+      <code-editor
+        :mode="'json'"
+        :readonly="false"
+        v-model="importTemplate"
+      ></code-editor>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="doJsonImport" class="button-sty">{{
-            i18nt('designer.hint.import')
-          }}
+        <el-button type="primary" @click="doJsonImport" class="button-sty"
+          >{{ i18nt("designer.hint.import") }}
         </el-button>
-        <el-button @click="showImportJsonDialogFlag = false" class="button-sty">{{
-            i18nt('designer.hint.cancel')
-          }}
+        <el-button @click="showImportJsonDialogFlag = false" class="button-sty"
+          >{{ i18nt("designer.hint.cancel") }}
         </el-button>
       </div>
     </el-dialog>
@@ -288,14 +357,28 @@
       :append-to-body="true"
       :modal-append-to-body="true"
     >
-      <code-editor :mode="'json'" :readonly="true" v-model="jsonContent"></code-editor>
+      <code-editor
+        :mode="'json'"
+        :readonly="true"
+        v-model="jsonContent"
+      ></code-editor>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" class="copy-json-btn button-sty" :data-clipboard-text="jsonRawContent"
-                   @click="copyFormJson">{{ i18nt('designer.hint.copyJson') }}
+        <el-button
+          type="primary"
+          class="copy-json-btn button-sty"
+          :data-clipboard-text="jsonRawContent"
+          @click="copyFormJson"
+          >{{ i18nt("designer.hint.copyJson") }}
         </el-button>
-        <el-button @click="saveFormJson" class="button-sty">{{ i18nt('designer.hint.saveFormJson') }}</el-button>
-        <el-button type="" @click="showExportJsonDialogFlag = false" class="button-sty">
-          {{ i18nt('designer.hint.closePreview') }}
+        <el-button @click="saveFormJson" class="button-sty">{{
+          i18nt("designer.hint.saveFormJson")
+        }}</el-button>
+        <el-button
+          type=""
+          @click="showExportJsonDialogFlag = false"
+          class="button-sty"
+        >
+          {{ i18nt("designer.hint.closePreview") }}
         </el-button>
       </div>
     </el-dialog>
@@ -315,25 +398,56 @@
       :append-to-body="true"
       :modal-append-to-body="true"
     >
-      <el-tabs type="border-card" class="no-box-shadow no-padding" v-model="activeCodeTab">
+      <el-tabs
+        type="border-card"
+        class="no-box-shadow no-padding"
+        v-model="activeCodeTab"
+      >
         <el-tab-pane label="Vue" name="vue">
-          <code-editor :mode="'html'" :readonly="true" v-model="vueCode" :user-worker="false"></code-editor>
+          <code-editor
+            :mode="'html'"
+            :readonly="true"
+            v-model="vueCode"
+            :user-worker="false"
+          ></code-editor>
         </el-tab-pane>
         <el-tab-pane label="HTML" name="html">
-          <code-editor :mode="'html'" :readonly="true" v-model="htmlCode" :user-worker="false"></code-editor>
+          <code-editor
+            :mode="'html'"
+            :readonly="true"
+            v-model="htmlCode"
+            :user-worker="false"
+          ></code-editor>
         </el-tab-pane>
       </el-tabs>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" class="copy-vue-btn button-sty" :data-clipboard-text="vueCode" @click="copyVueCode">
-          {{ i18nt('designer.hint.copyVueCode') }}
+        <el-button
+          type="primary"
+          class="copy-vue-btn button-sty"
+          :data-clipboard-text="vueCode"
+          @click="copyVueCode"
+        >
+          {{ i18nt("designer.hint.copyVueCode") }}
         </el-button>
-        <el-button type="primary" class="copy-html-btn button-sty" :data-clipboard-text="htmlCode"
-                   @click="copyHtmlCode">{{ i18nt('designer.hint.copyHtmlCode') }}
+        <el-button
+          type="primary"
+          class="copy-html-btn button-sty"
+          :data-clipboard-text="htmlCode"
+          @click="copyHtmlCode"
+          >{{ i18nt("designer.hint.copyHtmlCode") }}
         </el-button>
-        <el-button @click="saveVueCode" class="button-sty">{{ i18nt('designer.hint.saveVueCode') }}</el-button>
-        <el-button @click="saveHtmlCode" class="button-sty">{{ i18nt('designer.hint.saveHtmlCode') }}</el-button>
-        <el-button type="" @click="showExportCodeDialogFlag = false" class="button-sty">
-          {{ i18nt('designer.hint.closePreview') }}
+        <el-button @click="saveVueCode" class="button-sty">{{
+          i18nt("designer.hint.saveVueCode")
+        }}</el-button>
+        <el-button @click="saveHtmlCode" class="button-sty">{{
+          i18nt("designer.hint.saveHtmlCode")
+        }}</el-button>
+        <el-button
+          type=""
+          @click="showExportCodeDialogFlag = false"
+          class="button-sty"
+        >
+          {{ i18nt("designer.hint.closePreview") }}
         </el-button>
       </div>
     </el-dialog>
@@ -352,17 +466,31 @@
       :append-to-body="true"
       :modal-append-to-body="true"
     >
-      <div style="border: 1px solid #DCDFE6">
-        <code-editor :mode="'json'" :readonly="true" v-model="formDataJson"></code-editor>
+      <div style="border: 1px solid #dcdfe6">
+        <code-editor
+          :mode="'json'"
+          :readonly="true"
+          v-model="formDataJson"
+        ></code-editor>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" class="copy-form-data-json-btn button-sty" :data-clipboard-text="formDataRawJson"
-                   @click="copyFormDataJson">
-          {{ i18nt('designer.hint.copyFormData') }}
+        <el-button
+          type="primary"
+          class="copy-form-data-json-btn button-sty"
+          :data-clipboard-text="formDataRawJson"
+          @click="copyFormDataJson"
+        >
+          {{ i18nt("designer.hint.copyFormData") }}
         </el-button>
-        <el-button @click="saveFormData" class="button-sty">{{ i18nt('designer.hint.saveFormData') }}</el-button>
-        <el-button type="" @click="showFormDataDialogFlag = false" class="button-sty">
-          {{ i18nt('designer.hint.closePreview') }}
+        <el-button @click="saveFormData" class="button-sty">{{
+          i18nt("designer.hint.saveFormData")
+        }}</el-button>
+        <el-button
+          type=""
+          @click="showFormDataDialogFlag = false"
+          class="button-sty"
+        >
+          {{ i18nt("designer.hint.closePreview") }}
         </el-button>
       </div>
     </el-dialog>
@@ -382,25 +510,55 @@
       :append-to-body="true"
       :modal-append-to-body="true"
     >
-      <el-tabs type="border-card" class="no-box-shadow no-padding" v-model="activeSFCTab">
+      <el-tabs
+        type="border-card"
+        class="no-box-shadow no-padding"
+        v-model="activeSFCTab"
+      >
         <el-tab-pane label="Vue2" name="vue2">
-          <code-editor :mode="'html'" :readonly="true" v-model="sfcCode" :user-worker="false"></code-editor>
+          <code-editor
+            :mode="'html'"
+            :readonly="true"
+            v-model="sfcCode"
+            :user-worker="false"
+          ></code-editor>
         </el-tab-pane>
         <el-tab-pane label="Vue3" name="vue3">
-          <code-editor :mode="'html'" :readonly="true" v-model="sfcCodeV3" :user-worker="false"></code-editor>
+          <code-editor
+            :mode="'html'"
+            :readonly="true"
+            v-model="sfcCodeV3"
+            :user-worker="false"
+          ></code-editor>
         </el-tab-pane>
       </el-tabs>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" class="copy-vue2-sfc-btn button-sty" :data-clipboard-text="sfcCode"
-                   @click="copyV2SFC">{{ i18nt('designer.hint.copyVue2SFC') }}
+        <el-button
+          type="primary"
+          class="copy-vue2-sfc-btn button-sty"
+          :data-clipboard-text="sfcCode"
+          @click="copyV2SFC"
+          >{{ i18nt("designer.hint.copyVue2SFC") }}
         </el-button>
-        <el-button type="primary" class="copy-vue3-sfc-btn button-sty" :data-clipboard-text="sfcCodeV3"
-                   @click="copyV3SFC">{{ i18nt('designer.hint.copyVue3SFC') }}
+        <el-button
+          type="primary"
+          class="copy-vue3-sfc-btn button-sty"
+          :data-clipboard-text="sfcCodeV3"
+          @click="copyV3SFC"
+          >{{ i18nt("designer.hint.copyVue3SFC") }}
         </el-button>
-        <el-button @click="saveV2SFC" class="button-sty">{{ i18nt('designer.hint.saveVue2SFC') }}</el-button>
-        <el-button @click="saveV3SFC" class="button-sty">{{ i18nt('designer.hint.saveVue3SFC') }}</el-button>
-        <el-button type="" @click="showExportSFCDialogFlag = false" class="button-sty">
-          {{ i18nt('designer.hint.closePreview') }}
+        <el-button @click="saveV2SFC" class="button-sty">{{
+          i18nt("designer.hint.saveVue2SFC")
+        }}</el-button>
+        <el-button @click="saveV3SFC" class="button-sty">{{
+          i18nt("designer.hint.saveVue3SFC")
+        }}</el-button>
+        <el-button
+          type=""
+          @click="showExportSFCDialogFlag = false"
+          class="button-sty"
+        >
+          {{ i18nt("designer.hint.closePreview") }}
         </el-button>
       </div>
     </el-dialog>
@@ -417,9 +575,12 @@
       v-el-drag-dialog
       v-el-dialog-center
     >
-      <div class="cont" style="height: auto;max-height: 500px;">
+      <div class="cont" style="height: auto; max-height: 500px">
         <el-scrollbar class="setting-scrollbar">
-          <form-setting :designer="designer" :form-config="designer.formConfig"></form-setting>
+          <form-setting
+            :designer="designer"
+            :form-config="designer.formConfig"
+          ></form-setting>
         </el-scrollbar>
       </div>
     </el-dialog>
@@ -427,31 +588,31 @@
 </template>
 
 <script>
-import VFormRender from '../../../../components/xform/form-render/index';
-import indexMixin from './indexMixin.js';
-import FormSetting from '../../../../components/xform/form-designer/setting-panel/form-setting';
+import VFormRender from "../../../../components/xform/form-render/index";
+import indexMixin from "./indexMixin.js";
+import FormSetting from "../../../../components/xform/form-designer/setting-panel/form-setting";
 
 export default {
-  name: 'ToolbarPanel',
+  name: "ToolbarPanel",
   components: {
     VFormRender,
-    FormSetting
+    FormSetting,
   },
-  inject:["readonly"],
+  inject: ["readonly"],
   mixins: [indexMixin],
   data() {
     return {
       defaultProps: {
-        label: 'name', //这里是树结构中需显示的数据（即接口返回的需展示在页面上的参数）
+        label: "name", //这里是树结构中需显示的数据（即接口返回的需展示在页面上的参数）
         children: [],
-        isLeaf: 'leaf'
+        isLeaf: "leaf",
       },
       treeOption: {
         title: "机构分类",
         defaultProps: {
-          label: 'name',
+          label: "name",
           children: [],
-          isLeaf: 'leaf'
+          isLeaf: "leaf",
         },
         url1: "/user/sale_org/getAllList",
         url2: "/user/sale_org/getChildren",
@@ -465,18 +626,18 @@ export default {
         treeNodeParam(row) {
           return {
             parent: row.id,
-            enabled: true
+            enabled: true,
           };
         },
-      }
-    }
+      },
+    };
   },
   methods: {
     handleNodeClick(data, node, v) {
       let treeOption = this.treeOption;
       let formRewriteMap = treeOption.formRewriteMap || {};
       let formData = {};
-      Object.keys(formRewriteMap).forEach(key => {
+      Object.keys(formRewriteMap).forEach((key) => {
         // this.$set(this.formData, key, data[formRewriteMap[key]]);
         formData[key] = data[formRewriteMap[key]];
       });
@@ -488,25 +649,27 @@ export default {
     // 异步树叶子节点懒加载逻辑
     loadNode(node, resolve) {
       let treeOption = this.treeOption;
-      let id = node && node.data && node.data.id ? node.data.id || '' : '';
-      let param = (treeOption.treeNodeParam ? treeOption.treeNodeParam(node?.data || {}) : null) || {
+      let id = node && node.data && node.data.id ? node.data.id || "" : "";
+      let param = (treeOption.treeNodeParam
+        ? treeOption.treeNodeParam(node?.data || {})
+        : null) || {
         parent: id,
-        enabled: true
+        enabled: true,
       };
       let url = !id ? treeOption.url1 : treeOption.url2;
       this.$http({
         url: url,
-        method: 'post',
+        method: "post",
         data: param,
-        success: res => {
-          res.objx.forEach(value => {
+        success: (res) => {
+          res.objx.forEach((value) => {
             treeOption.preHadnleData(value);
           });
           resolve(res.objx);
-        }
+        },
       });
     },
-  }
+  },
 };
 </script>
 
@@ -668,7 +831,7 @@ div.toolbar-container {
   }
 
   .el-tree-node:before {
-    content: '';
+    content: "";
     left: -4px;
     position: absolute;
     right: auto;
@@ -676,7 +839,7 @@ div.toolbar-container {
   }
 
   .el-tree-node:after {
-    content: '';
+    content: "";
     left: -4px;
     position: absolute;
     right: auto;