cloud-web-corejs 1.0.54-dev.237 → 1.0.54-dev.239

package/package.json

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

package/src/components/xform/form-designer/setting-panel/property-editor/labelIconClass-editor.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-show="false">
     <el-form-item label-width="0">
       <el-divider class="custom-divider">{{i18nt('designer.setting.customLabelIcon')}}</el-divider>
     </el-form-item>

package/src/components/xform/form-designer/setting-panel/property-editor/labelIconPosition-editor.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.labelIconPosition')">
+  <el-form-item :label="i18nt('designer.setting.labelIconPosition')" v-show="false">
     <el-select v-model="optionModel.labelIconPosition">
       <el-option v-for="item in labelIconPosition" :key="item.value" :label="item.label"
                  :value="item.value">

package/src/components/xform/form-designer/setting-panel/property-editor/labelTooltip-editor.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.labelTooltip')">
+  <el-form-item :label="i18nt('designer.setting.labelTooltip')" v-show="false">
     <el-input type="text" v-model="optionModel.labelTooltip"></el-input>
   </el-form-item>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/textFlag-editor.vue

@@ -12,7 +12,7 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
-    <el-form-item :label="i18nt('仅显示明文文本')">
+<!--    <el-form-item :label="i18nt('仅显示明文文本')">
       <el-switch v-model="optionModel.showTextEnabled" @change="optionModel.showEncryptTextEnabled=false;optionModel.showLinkTextEnabled=false;"></el-switch>
     </el-form-item>
     <el-form-item :label="i18nt('仅显示密文文本')">
@@ -99,21 +99,21 @@
               <el-input v-model="row.companyCodes" clearable></el-input>
             </template>
           </el-table-column>
-          <!--          <el-table-column :label="i18nt('登录名')" width="150">
+          &lt;!&ndash;          <el-table-column :label="i18nt('登录名')" width="150">
                       <template slot-scope="{row}">
                         <el-input v-model="row.loginAccounts" clearable></el-input>
                       </template>
-                    </el-table-column>-->
+                    </el-table-column>&ndash;&gt;
           <el-table-column :label="i18nt('角色编码')" width="250">
             <template slot-scope="{row}">
               <el-input v-model="row.roleCodes" clearable></el-input>
             </template>
           </el-table-column>
-          <!--          <el-table-column :label="i18nt('机构编码')" width="150">
+          &lt;!&ndash;          <el-table-column :label="i18nt('机构编码')" width="150">
                       <template slot-scope="{row}">
                         <el-input v-model="row.saleOrgCodes" clearable></el-input>
                       </template>
-                    </el-table-column>-->
+                    </el-table-column>&ndash;&gt;
           <el-table-column :label="i18nt('设置')" width="150">
             <template slot-scope="{row}">
               <el-select v-model="row.type" clearable>
@@ -152,7 +152,7 @@
           {{ i18nt('designer.hint.confirm') }}
         </el-button>
       </div>
-    </el-dialog>
+    </el-dialog>-->
   </div>
 </template>
 

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -188,12 +188,12 @@ const ADVANCED_PROPERTIES = {
   'round': 'round-editor',
   'circle': 'circle-editor',
   'icon': 'icon-editor',
-  'labelIconClass': 'labelIconClass-editor',
-  'labelIconPosition': 'labelIconPosition-editor',
-  'labelTooltip': 'labelTooltip-editor',
-  'appendButton': 'appendButton-editor',
-  'appendButtonDisabled': 'appendButtonDisabled-editor',
-  'buttonIcon': 'buttonIcon-editor',
+  // 'labelIconClass': 'labelIconClass-editor',
+  // 'labelIconPosition': 'labelIconPosition-editor',
+  // 'labelTooltip': 'labelTooltip-editor',
+  // 'appendButton': 'appendButton-editor',
+  // 'appendButtonDisabled': 'appendButtonDisabled-editor',
+  // 'buttonIcon': 'buttonIcon-editor',
 
 
 }

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

@@ -442,8 +442,8 @@ export const containers = [
       tableRef: "",
       detailPaneContainer: true,
       defaultCollapse:false,
-      onCreated: "",
-      onMounted: "",
+      /*onCreated: "",
+      onMounted: "",*/
     }
   },
   {
@@ -951,9 +951,9 @@ export const basicFields = [
       showWordLimit: !1,
       prefixIcon: "",
       suffixIcon: "",
-      appendButton: !1,
+      /*appendButton: !1,
       appendButtonDisabled: !1,
-      buttonIcon: "el-icon-search",
+      buttonIcon: "el-icon-search",*/
       onCreated: "",
       onMounted: "",
       onInput: "",
@@ -1005,7 +1005,7 @@ export const basicFields = [
       validation: "",
       validationHint: "",
       customClass: "",
-      labelIconClass: null,
+      /*labelIconClass: null,
       labelIconPosition: "rear",
       labelTooltip: null,
       minLength: null,
@@ -1015,7 +1015,7 @@ export const basicFields = [
       suffixIcon: "",
       appendButton: !1,
       appendButtonDisabled: !1,
-      buttonIcon: "el-icon-search",
+      buttonIcon: "el-icon-search",*/
       onCreated: "",
       onMounted: "",
       onInput: "",
@@ -1023,7 +1023,7 @@ export const basicFields = [
       onFocus: "",
       onBlur: "",
       onValidate: "",
-      onAppendButtonClick: "",
+      // onAppendButtonClick: "",
       widgetWidth: "",
       accessType: "1",
       ...defaultWfConfig,
@@ -1734,9 +1734,9 @@ export const basicFields = [
   {
     type: "html-text",
     icon: "html-text",
-    commonFlag: !0,
+    commonFlag: !1,
     formItemFlag: !1,
-    columnFlag: true,
+    columnFlag: false,
     options: {
       name: "",
       columnWidth: "200px",

package/src/layout/components/TagsView/index.vue

@@ -27,12 +27,25 @@
         <i class="el-icon-arrow-right" ayadmin-event="rightPage"
            one-link-mark="yes" @click="$refs.scrollPane.handleScrollRight()"/>
       </el-tooltip>
-      <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('刷新')" placement="bottom">
+      <el-dropdown style="margin-right:10px">
+        <span class="el-dropdown-link">
+          <i class="el-icon-more el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item @click.native="refreshSelectedTag($route)">
+            <i class="el-icon-refresh"/><span>{{ $t1('刷新') }}</span>
+          </el-dropdown-item>
+          <el-dropdown-item @click.native="closeAllTags(selectedTag)">
+            <i class="el-icon-close"/><span>{{ $t1('全部关闭') }}</span>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+      <!-- <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('刷新')" placement="bottom">
         <i class="el-icon-refresh" @click="refreshSelectedTag($route)"/>
       </el-tooltip>
       <el-tooltip :enterable="false" class="item" effect="dark" :content="$t1('全部关闭')" placement="bottom">
         <i class="el-icon-close" @click="closeAllTags(selectedTag)"/>
-      </el-tooltip>
+      </el-tooltip> -->
     </div>
     <!-- <ul v-show="visible" :style="{left:left+'px',top:top+'px'}" class="contextmenu">
       <li @click="refreshSelectedTag(selectedTag)">Refresh</li>
@@ -191,11 +204,13 @@ export default {
       })
     },
     closeAllTags(view) {
-      this.$store.dispatch('tagsView/delAllViews').then(({visitedViews}) => {
-        if (this.affixTags.some(tag => tag.path === view.path)) {
-          return
-        }
-        this.toLastView(visitedViews, view)
+      this.$baseConfirm(this.$t1('您确定要全部关闭吗？')).then(() => {
+        this.$store.dispatch('tagsView/delAllViews').then(({visitedViews}) => {
+          if (this.affixTags.some(tag => tag.path === view.path)) {
+            return
+          }
+          this.toLastView(visitedViews, view)
+        })
       })
     },
     toLastView(visitedViews, view) {

package/src/views/bd/setting/form_script/mixins/edit.js

@@ -14,7 +14,11 @@ modules = {
     formTemplate: Object,
     currentFormType: Object,
     readonly: Boolean,
-    otherFlag:Boolean
+    otherFlag:Boolean,
+    scriptType: {
+      type: Number,
+      default: 0
+    },
   },
   components: {formOplogTable, preformDialog, projectTagView, MenuKindDialog,otherAuthDialog},
   data() {
@@ -23,7 +27,7 @@ modules = {
       tabIndex: 'first',
       dataId: '',
       formScript: {
-        scriptType: 1,
+        scriptType: 0,
         enabled: true,
         formCode: null,
         menuKindCode: null,
@@ -48,11 +52,13 @@ modules = {
       this.dataId = this._dataId;
     } else {
       if (this.formTemplate) {
+        this.formScript.scriptType = 1;
         this.formScript.formCode = this.formTemplate.formCode;
         this.formScript.menuKindCode = this.formTemplate.menuKindCode;
         this.formScript.menuKindName = this.formTemplate.menuKindName;
         this.formScript.serviceName = this.formTemplate.serviceName;
       } else {
+        this.formScript.scriptType = this.scriptType;
         this.formScript.formCode = 'intf';
         this.formScript.menuKindName = this.currentFormType?.name || null;
         this.formScript.menuKindCode = this.currentFormType?.menuKindCode || null;

package/src/views/user/request_setting/edit.vue

@@ -54,10 +54,11 @@
             </tr>
             <tr>
               <th>
-                {{ $t1('执行企业编码') }}
+                <em class="f-red">*</em>
+                {{ $t1('执行组织编码') }}
               </th>
               <td colspan="5">
-                <el-form-item prop="exeCompanyCode" :rules="[{ required: false, trigger: 'blur' }]">
+                <el-form-item prop="exeCompanyCode" :rules="[{ required: true, trigger: 'blur' }]">
                   <el-input type="text" autocomplete="off" v-model="requestSetting.exeCompanyCode" clearable/>
                 </el-form-item>
               </td>

package/src/views/user/request_setting/list.vue

@@ -166,7 +166,7 @@ export default {
             width: 150
           },
           {
-            title: '执行企业编码',
+            title: '执行组织编码',
             field: 'exeCompanyCode',
             width: 150
           },