vue2-client 1.8.452 → 1.8.455

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.452",
+  "version": "1.8.455",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue

@@ -695,7 +695,7 @@ export default {
     flashModal (show = 'None') {
       const bool = show === 'None' ? !this.visible : !!show
       if (bool && this.option.length === 0) {
-        getDictionaryParam().then(res => {
+        getDictionaryParam(true).then(res => {
           this.option = res
         })
       }

package/src/base-client/components/common/CreateSimpleFormQuery/CreateSimpleFormQueryItem.vue

@@ -367,7 +367,7 @@ export default {
     flashModal (show = 'None') {
       const bool = show === 'None' ? !this.visible : !!show
       if (bool && this.option.length === 0) {
-        getDictionaryParam().then(res => {
+        getDictionaryParam(true).then(res => {
           this.option = res
         })
       }

package/src/base-client/components/common/XAddReport/XAddReport.vue

@@ -14,6 +14,7 @@
         @updateImg="updateImg"
         @selectRow="selectRow"
         ref="main"
+        :env="env"
         :use-oss-for-img="false"
         :config-name="configName"
         :show-img-in-cell="true"
@@ -36,7 +37,10 @@ export default {
       XReport: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue'),
     },
     props: {
-
+      env: {
+        type: String,
+        default: 'prod'
+      }
     },
     data () {
       return {
@@ -67,6 +71,7 @@ export default {
         isInAModal: () => { return true }
       }
     },
+    inject: ['getComponentByName'],
     computed: {
       businessTitle () {
         return this.businessType + this.title
@@ -102,8 +107,13 @@ export default {
         this.visible = false
         this.$emit('close')
       },
-      getComponentByName (name) {
-        return this.$refs.main.getComponentByName(name)
+      getComponentByNameCur (name) {
+        const innerRef = this.getComponentByName(name)
+        if (innerRef) {
+          return innerRef
+        } else {
+          return this.$refs.main.getComponentByName(name)
+        }
       },
       async onSubmit () {
         if (this.$refs.main?.config?.confirmFunction) {
@@ -115,11 +125,14 @@ export default {
           const result = executeStrFunctionByContext(this, func, [])
           if (result instanceof Promise) {
             result.then((res) => {
-              if (!res) return
+              if (!res) {
+                this.close()
+                return
+              }
               let messageType = 'success'
               // 如果传递了组件名字 自动调用刷新
               if (res?.name) {
-                const waitRefreshRef = this.getComponentByName(res.name)
+                const waitRefreshRef = this.getComponentByNameCur(res.name)
                 if (waitRefreshRef) {
                   waitRefreshRef.refresh()
                 } else {

package/src/base-client/components/common/XDescriptions/XDescriptions.vue

@@ -62,6 +62,10 @@ export default {
       type: String,
       default: undefined
     },
+    env: {
+      type: String,
+      default: 'prod'
+    },
     // 每列显示数量
     column: {
       type: Number,
@@ -134,7 +138,7 @@ export default {
         }
         this.realData = result
         this.loading = false
-      })
+      }, this.env === 'dev')
     },
     // 文字格式化
     formatText (value) {

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -132,7 +132,7 @@
               :key="item.value"
               :value="item.value">
               <!-- 徽标(badge) -->
-              <x-badge :badge-key="attr.keyName" :replaceText="item.text" :value="item.value"/>
+              <x-badge :badge-key="attr.keyName" :replaceText="item.text" :value="item.value" :service-name="serviceName" :env="env"/>
             </a-select-option>
           </template>
         </template>
@@ -1009,7 +1009,7 @@ export default {
         formData.append('f_operator', this.currUser ? this.currUser.username : '')
 
         // 上传文件
-        await upload(formData, this.serviceName, { headers, timeout: 600 * 1000 }).then(res => {
+        await upload(formData, this.serviceName, { headers, timeout: 600 * 1000 }, this.env === 'dev').then(res => {
           this.form[this.attr.model] = res.data.id
           this.form.t_f_path = res.data.f_downloadpath
         }).catch(error => {

package/src/base-client/components/common/XFormTable/demo.vue

@@ -4,7 +4,7 @@
       title="示例表单查询"
       :queryParamsName="queryParamsName"
       :fixedAddForm="fixedAddForm"
-      service-name="af-gaslink"
+      service-name="af-revenue"
       @action="action"
       ref="xFormTable">
     </x-form-table>
@@ -35,7 +35,7 @@ export default {
   data () {
     return {
       // 查询配置名称
-      queryParamsName: 'vehicleManageCRUD',
+      queryParamsName: 'UserFilesListCRUD',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉

package/src/base-client/components/common/XImportExcel/XImportExcel.vue

@@ -60,6 +60,10 @@ export default {
       type: String,
       default: undefined
     },
+    env: {
+      type: String,
+      default: 'prod'
+    },
     queryParamsName: {
       type: String,
       default: 'none'
@@ -102,7 +106,7 @@ export default {
     importTemplate () {
       downloadImportExcel({
         queryParamsName: this.queryParamsName
-      }, this.serviceName).then(res => {
+      }, this.serviceName, this.env === 'dev').then(res => {
         if (!res || !res.value) {
           this.$message.warn('导入模板不存在，请检查配置')
            return
@@ -138,7 +142,7 @@ export default {
       formData.append('file', fileList[0])
       formData.append('queryParamsName', this.queryParamsName)
       formData.append('userData', JSON.stringify(userData))
-      importData(formData).then(res => {
+      importData(formData, this.serviceName, this.env === 'dev').then(res => {
         this.fileList = []
         this.$message.success(res.msg || res)
         this.open = false

package/src/base-client/components/common/XReportGrid/XReport.vue

@@ -66,6 +66,7 @@
           ref="XReportDesign"
           id="printReady"
           :server-name="serverName"
+          :env="env"
           :show-images="hasImages"
           :image-list="imageList">
         </XReportDesign>
@@ -73,6 +74,7 @@
     </template>
     <!-- 弹出框 -->
     <x-add-report
+      :env="env"
       ref="xAddReport"
     />
   </div>

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -24,6 +24,7 @@
                 :queryParamsName="cell.slotConfig"
                 :configName="cell.slotConfig"
                 :countVisible="false"
+                :env="env"
               />
             </template>
           </template>

package/src/base-client/components/common/XTab/XTab.vue

@@ -17,6 +17,7 @@
             v-on="getEventHandlers(tab)"
             @hook:mounted="(h)=>onComponentMounted(h,tab,index)"
             :config-name="tab.slotConfig"
+            :env="env"
           />
         </a-card>
       </a-tab-pane>
@@ -55,7 +56,7 @@ export default {
     getConfig () {
       getConfigByName(this.configName, this.serverName, res => {
         this.config = res.data
-      })
+      }, this.env === 'dev')
     },
     runLogic,
     getConfigByNameAsync,
@@ -99,7 +100,7 @@ export default {
               images: param.images
             }
           })
-        })
+        }, this.env === 'dev')
       }
     },
   },
@@ -113,6 +114,10 @@ export default {
       type: String,
       default: undefined
     },
+    env: {
+      type: String,
+      default: 'prod'
+    },
     // 本地配置，调试用
     localConfig: {
       type: Object,

package/src/base-client/components/common/XTable/XTable.vue

@@ -5,40 +5,48 @@
         <span :style="{ float: 'left', overflow: 'hidden', marginBottom: '8px' }">
           <a-space>
             <slot name="leftButton" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
-            <a-button v-if="!buttonState || buttonState.add && buttonRendering('add')" type="primary" @click="add">
+            <a-button v-if="buttonState.add && buttonRendering('add')" type="primary" @click="add">
               <a-icon type="plus"/>新增
             </a-button>
-            <a-button v-if="!buttonState || buttonState.move && buttonRendering('move')" type="primary" @click="move">
+            <a-button v-if="buttonState.move && buttonRendering('move')" type="primary" @click="move">
               <a-icon type="plus"/>添加
             </a-button>
             <a-button
-              v-if="!buttonState || buttonState.edit && buttonRendering('edit')"
+              v-if="buttonState.edit && buttonRendering('edit')"
               :disabled="!isModify"
               :loading="editLoading"
               class="btn-success"
               type="dashed"
               @click="edit()">
-              <a-icon :style="iconStyle" type="edit"/>修改
+              <a-icon :style="iconStyle" type="form"/>修改
             </a-button>
             <a-button
-              v-if="!buttonState || buttonState.delete && buttonRendering('delete')"
+              v-if="buttonState.delete && buttonRendering('delete')"
               :disabled="!isDelete"
               type="danger"
               @click="deleteItem">
               <a-icon :style="iconStyle" type="delete"/>删除
             </a-button>
             <a-button
-              v-if="!buttonState || buttonState.import && buttonRendering('import')"
+              v-if="buttonState.import && buttonRendering('import')"
               type="dashed"
               @click="importData">
               <a-icon :style="iconStyle" type="import"/>导入
             </a-button>
-            <a-button
-              v-if="!buttonState || buttonState.import && buttonRendering('editRow')"
-              type="dashed"
-              @click="()=>editRow = true">
-              <a-icon :style="iconStyle" type="import"/>行编辑
-            </a-button>
+            <template
+              v-if="buttonState.import && buttonRendering('editRow')">
+              <a-button
+                v-if="isEditMode"
+                class="ant-btn-hover"
+                @click="()=>isEditMode = !isEditMode">
+                <a-icon :style="iconStyle" type="save"/>保存
+              </a-button>
+              <a-button
+                v-else
+                @click="()=>isEditMode = !isEditMode">
+                <a-icon :style="iconStyle" type="edit"/>行编辑
+              </a-button>
+            </template>
             <a-dropdown v-if="!buttonState || buttonState.export && buttonRendering('export')">
               <a-menu slot="overlay">
                 <a-menu-item :disabled="selectedRowKeys.length === 0" key="1" @click="handleExport(true)"><a-icon
@@ -110,26 +118,24 @@
           v-for="(item, c_index) in tableColumns"
           :slot="item.dataIndex"
           slot-scope="text, record, index">
+          <template v-if="isEditMode && getFromItem(item.dataIndex)">
+            <!-- 根据 formItems 中的输入类型显示内容 -->
+            <!--            <x-form-item-->
+            <!--              v-for="formItem in formItems"-->
+            <!--              v-if="formItem.model === item.dataIndex"-->
+            <!--              :form="record"-->
+            <!--              :attr="formItem"-->
+            <!--              v-model="record[item.dataIndex]"-->
+            <!--              :key="formItem.model"-->
+            <!--            />-->
+          </template>
           <!--    序号列      -->
           <span v-if="item.slotType === 'index'" :key="'index-' + c_index">
             {{ index + 1 }}
           </span>
           <!-- 文本溢出省略(ellipsis) -->
           <span v-if="item.slotType === 'ellipsis'" :key="'ellipsis-' + c_index">
-            <template v-if="isEditMode && formItems.some(formItem => formItem.model === item.dataIndex)">
-              <!-- 根据 formItems 中的输入类型显示内容 -->
-              <x-form-item
-                v-for="formItem in formItems"
-                v-if="formItem.model === item.dataIndex"
-                :form="record"
-                :attr="formItem"
-                v-model="record[item.dataIndex]"
-                :key="formItem.model"
-              />
-            </template>
-            <template v-else>
-              <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
-            </template>
+            <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
           </span>
           <!-- 徽标(badge) -->
           <span v-else-if="item.slotType === 'badge'" :key="'badge-' + c_index">
@@ -221,6 +227,7 @@
       @ok="importExcelOk"
       :title="title"
       :service-name="serviceName"
+      :env="env"
       :query-params-name="queryParamsName"
     >
       <template #importExcelSlot>
@@ -366,9 +373,7 @@ export default {
       // 允许看板模式
       allowCardMode: false,
       // 看板模式配置
-      cardModeConfig: undefined,
-      // 是否开启行编辑
-      editRow: false
+      cardModeConfig: undefined
     }
   },
   props: {
@@ -430,6 +435,11 @@ export default {
     window.removeEventListener('resize', this.handleResize)
   },
   methods: {
+    getFromItem (model) {
+      const aa = this.formItems.find(item => item.model === model)
+      console.log(aa)
+      return this.formItems.find(item => item.model === model)
+    },
     importExcelOk () {
       this.refresh(true)
       this.$emit('importExcelOk')
@@ -466,7 +476,6 @@ export default {
       const {
         // 查询参数对象, 用于没有对应查询配置文件名时
         queryParams,
-        tableEdit,
         tableColumns,
         buttonState,
         buttonPermissions,
@@ -485,9 +494,6 @@ export default {
       } = params
       this.showSummary = Object.keys(tableSummaryMap).length > 0
       this.queryParams = queryParams
-      if (tableEdit) {
-        this.isEditMode = tableEdit
-      }
       this.tableColumns = JSON.parse(JSON.stringify(tableColumns))
       if (this.tableColumns.length === 0) {
         return
@@ -970,4 +976,8 @@ export default {
 .footer_sum_item {
   white-space: nowrap;
 }
+.ant-btn-hover {
+  border-color: @primary-color;
+  color: @primary-color;
+}
 </style>

package/src/base-client/components/common/XTree/XTree.vue

@@ -111,7 +111,7 @@ if (props.configName) {
       // 如果数据源是 logic
       getData()
     }
-  })
+  }, props.env === 'dev')
 }
 
 const emit = defineEmits(['onSelect'])

package/src/base-client/components/common/XTree/XTreePro.vue

@@ -185,7 +185,7 @@ export default {
   },
   async created () {
     if (this.configName) {
-      this.config = await getConfigByNameAsync(this.configName, this.serviceName)
+      this.config = await getConfigByNameAsync(this.configName, this.serviceName, this.env === 'dev')
     } else if (this.configValue) {
       this.config = this.configValue
     } else {

package/src/router/async/router.map.js

@@ -83,8 +83,8 @@ routerResource.example = {
       {
           path: 'default',
           name: '示例页面',
-          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           meta: {
               // 菜单中不显示

package/src/services/api/common.js

@@ -126,7 +126,7 @@ export function getConfigByLogic (logicName, parameter, serviceName = process.en
  * @param serviceName 命名空间名称
  * @param isDev 是否是开发环境
  */
-export function parseConfig (configContent, configType, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev) {
+export function parseConfig (configContent, configType, serviceName = process.env.VUE_APP_SYSTEM_NAME, isDev = true) {
   let apiPre = '/api/'
   if (isDev) {
     apiPre = '/devApi/'

package/vue.config.js

@@ -30,7 +30,7 @@ const revenue = 'http://aote-office.8866.org:31567'
 module.exports = {
   devServer: {
     // development server port 8000
-    port: 8001,
+    port: 8020,
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       // '/apply-image': {