vue2-client 1.20.58 → 1.20.59

package/.idea/git_toolbox_blame.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxBlameSettings">
+    <option name="version" value="2" />
+  </component>
+</project>

package/package.json

@@ -1,115 +1,115 @@
-{
-  "name": "vue2-client",
-  "version": "1.20.58",
-  "private": false,
-  "scripts": {
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
-    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
-    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
-    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
-    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
-    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
-    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
-    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
-    "serve:message": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode message",
-    "serve:apply": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode apply",
-    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@afwenming123/vue-easy-tree": "^1.0.1",
-    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@hufe921/canvas-editor": "^0.9.49",
-    "@microsoft/fetch-event-source": "^2.0.1",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.33.0",
-    "crypto-js": "^4.1.1",
-    "date-fns": "^2.29.3",
-    "default-passive-events": "^2.0.0",
-    "dotenv": "^16.3.1",
-    "echarts": "^5.5.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.7.0",
-    "html-to-image": "^1.11.13",
-    "html2canvas": "^1.4.1",
-    "js-base64": "^3.7.5",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.3.2",
-    "jspdf": "^2.5.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.debounce": "^4",
-    "lodash.get": "^4.4.2",
-    "marked": "^4",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "ol": "10.3.1",
-    "qs": "^6.11.2",
-    "regenerator-runtime": "^0.14.0",
-    "splitpanes": "^2.4.1",
-    "videojs-contrib-hls": "^5.15.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.7.14",
-    "vue-codemirror": "4.0.6",
-    "vue-color": "2.7.0",
-    "vue-draggable-resizable": "^2.3.0",
-    "vue-i18n": "^8.28.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.6.5",
-    "vue-video-player": "^5.0.2",
-    "vue-virtual-scroller": "^1.1.2",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.22.20",
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.22.20",
-    "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^5.0.8",
-    "@vue/cli-service": "^5.0.8",
-    "@vue/eslint-config-standard": "^8.0.1",
-    "@vue/test-utils": "^1.3.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "compression-webpack-plugin": "^10.0.0",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "deepmerge": "^4.3.1",
-    "eslint": "^8.51.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-vue": "^9.17.0",
-    "fast-deep-equal": "^3.1.3",
-    "ignore-loader": "^0.1.2",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-transform-stub": "^2.0.0",
-    "less-loader": "^6.2.0",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-jest": "^4.0.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.88.2",
-    "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.19"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead",
-    "not ie 11"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.20.59",
+  "private": false,
+  "scripts": {
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
+    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
+    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
+    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
+    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
+    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
+    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
+    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
+    "serve:message": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode message",
+    "serve:apply": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode apply",
+    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint",
+    "build:preview": "vue-cli-service build --mode preview",
+    "lint:nofix": "vue-cli-service lint --no-fix",
+    "test": "jest"
+  },
+  "dependencies": {
+    "@afwenming123/vue-easy-tree": "^1.0.1",
+    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.31",
+    "@hufe921/canvas-editor": "^0.9.49",
+    "@microsoft/fetch-event-source": "^2.0.1",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.33.0",
+    "crypto-js": "^4.1.1",
+    "date-fns": "^2.29.3",
+    "default-passive-events": "^2.0.0",
+    "dotenv": "^16.3.1",
+    "echarts": "^5.5.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.7.0",
+    "html-to-image": "^1.11.13",
+    "html2canvas": "^1.4.1",
+    "js-base64": "^3.7.5",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.3.2",
+    "jspdf": "^2.5.1",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.debounce": "^4",
+    "lodash.get": "^4.4.2",
+    "marked": "^4",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "ol": "10.3.1",
+    "qs": "^6.11.2",
+    "regenerator-runtime": "^0.14.0",
+    "splitpanes": "^2.4.1",
+    "videojs-contrib-hls": "^5.15.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.7.14",
+    "vue-codemirror": "4.0.6",
+    "vue-color": "2.7.0",
+    "vue-draggable-resizable": "^2.3.0",
+    "vue-i18n": "^8.28.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.6.5",
+    "vue-video-player": "^5.0.2",
+    "vue-virtual-scroller": "^1.1.2",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^7.0.0",
+    "@babel/core": "^7.22.20",
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
+    "@vue/eslint-config-standard": "^8.0.1",
+    "@vue/test-utils": "^1.3.6",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "compression-webpack-plugin": "^10.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "deepmerge": "^4.3.1",
+    "eslint": "^8.51.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-vue": "^9.17.0",
+    "fast-deep-equal": "^3.1.3",
+    "ignore-loader": "^0.1.2",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-transform-stub": "^2.0.0",
+    "less-loader": "^6.2.0",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-jest": "^4.0.1",
+    "vue-template-compiler": "^2.7.14",
+    "webpack": "^5.88.2",
+    "webpack-theme-color-replacer": "^1.4.7",
+    "whatwg-fetch": "^3.6.19"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead",
+    "not ie 11"
+  ]
+}

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

@@ -2,51 +2,31 @@
   <a-card :bordered="false">
     <x-form-table
       title="示例表单"
-      queryParamsName="scanCodeAndNFCRUD"
+      :queryParamsName="queryParamsName"
       :fixedAddForm="fixedAddForm"
       :externalSelectedRowKeys="selectedKeys"
-      :defaultPageSize="100"
-      :pageSizeArray="['100','200']"
       @action="action"
       @selectRow="selectRow"
       @columnClick="columnClick"
       @ceshi="ceshi"
-      @startService="startService"
-      serviceName="af-safecheck"
+      @rowDblClick="rowDblClick"
+      serviceName="af-revenue"
       ref="xFormTable"
       :reserveSpaceForButtons="true"
-    >
-    </x-form-table>
-    <a-modal
-      v-model="formModalVisible"
-      title="工单回访"
-      :zIndex="1002"
-      width="50vw"
-      :destroy-on-close="true"
-      @cancel="formModalVisible = false"
-      @ok="ok"
-    >
-      <x-add-native-form
-        ref="xForm"
-      />
-    </a-modal>
-    <button @click="backDealData">提交</button>
+      @addFormSubmit="addFormSubmit"
+    ></x-form-table>
   </a-card>
 </template>
 
 <script>
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
 import { microDispatch } from '@vue2-client/utils/microAppUtils'
-import {getConfigByNameAsync, runLogic} from '@vue2-client/services/api/common'
-
 export default {
   name: 'Demo',
   components: {
-    XFormTable,
-    XAddNativeForm,
+    XFormTable
   },
-  data () {
+  data() {
     return {
       // 查询配置文件名
       queryParamsName: 'ceshiCRUD',
@@ -62,32 +42,26 @@ export default {
       selectedKeys: [],
       selected: {
         keys: [],
-        rows: [],
-      },
-      formModalVisible: false,
+        rows: []
+      }
     }
   },
+
   methods: {
-    backDealData () {
-      this.$refs.xFormTable.$refs.xForm.backDealData().then(data => {
-        console.log('backDealData', data)
-        console.log('selected', this.$refs.xFormTable.$refs.xForm?.form)
+    handleCustomQuery() {
+      this.$refs.xFormTable.queryTable({
+        uf_f_alias: 'XianFeng',
+        uf_f_card_id: '10500030'
       })
     },
+    rowDblClick(record) {
+      console.log('rowDblClick', record)
+    },
     // input框 行編輯參數傳遞
-    ceshi (...args) {
+    ceshi(...args) {
       // attr, value, currentRecord, currentIndex, nextRecord, nextIndex
-      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] =
-        args
-      console.log(
-        'ceshi',
-        attr,
-        value,
-        currentRecord,
-        currentIndex,
-        nextRecord,
-        nextIndex
-      )
+      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] = args
+      console.log('ceshi', attr, value, currentRecord, currentIndex, nextRecord, nextIndex)
       // 示例：当按下 Enter 键且有下一行时，跳转到下一行的同一列
       // 可以在这里执行业务逻辑（例如：保存数据）
       console.log('当前行:', currentIndex, '下一行:', nextIndex)
@@ -98,61 +72,45 @@ export default {
       // 跳转到下一行的同一列
       this.$refs.xFormTable.$refs.xTable.focusInput(nextIndex, attr.model)
     },
-    test () {
+    test() {
       this.$refs.xFormTable.setTableData([])
     },
-    defaultF () {
+    defaultF() {
       this.$refs.xFormTable.setTableSize('default')
     },
-    middleF () {
+    middleF() {
       this.$refs.xFormTable.setTableSize('middle')
     },
-    smallF () {
+    smallF() {
       this.$refs.xFormTable.setTableSize('small')
     },
-    columnClick (key, value, record) {
+    columnClick(key, value, record) {
       microDispatch({
         type: 'v3route',
         path: '/bingliguanli/dianzibingliluru',
-        props: { selected: arguments[0].his_f_admission_id },
+        props: { selected: arguments[0].his_f_admission_id }
       })
     },
-    startService (record, id, actionType) {
-      getConfigByNameAsync('测试Form', 'af-safecheck').then(config => {
-        this.formModalVisible = true
-        this.$nextTick(
-          () => {
-            this.formModalVisible = true
-            this.$refs.xForm.init({
-              formItems: config.formJson,
-              title: '工单回访',
-              businessType: '新增',
-              ...config,
-              modifyModelData: { data: { id: 1 } },
-            })
-          })
-      })
-      // this.detailVisible = true
-      // console.log('触发了详情操作', record, id, actionType)
-    },
-    async ok () {
-      const res = await this.$refs.xForm.asyncSubmit()
-      await runLogic('ceshwewei', res.realForm)
+    action(record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
     },
-    onClose () {
+    onClose() {
       this.detailVisible = false
       // 关闭详情之后重新查询表单
       this.$refs.xFormTable.refreshTable(true)
     },
-    selectRow (selectedRowKeys, selectedRows) {
+    selectRow(selectedRowKeys, selectedRows) {
+      console.log('selectRow', selectedRowKeys, selectedRows)
       this.selected = {
         keys: selectedRowKeys,
-        rows: selectedRows,
+        rows: selectedRows
       }
-      console.log('selectedDemo', this.selected)
     },
-  },
-  computed: {},
+    addFormSubmit(params, callback){
+      callback()
+    }
+  }
 }
 </script>
 

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

@@ -190,17 +190,17 @@ export default {
        * 配置是否已加载完成
        */
       // eslint-disable-next-line vue/no-reserved-keys
-      _configEndEmitted: false,
+      configEndEmitted: false,
       /**
        * 配置结束 Promise
        */
       // eslint-disable-next-line vue/no-reserved-keys
-      _configEndPromise: null,
+      configEndPromise: null,
       /**
        * 配置结束 resolve 函数
        */
       // eslint-disable-next-line vue/no-reserved-keys
-      _configEndResolve: null
+      configEndResolve: null
     }
   },
   /**
@@ -243,8 +243,8 @@ export default {
      * 初始化按钮配置
      */
     initButtonConfig(parameter) {
-      this._configEndEmitted = false
-      this._configEndPromise = new Promise(resolve => { this._configEndResolve = resolve })
+      this.configEndEmitted = false
+      this.configEndPromise = new Promise(resolve => { this.configEndResolve = resolve })
       if (!parameter) {
         this._emitConfigEnd()
         return
@@ -255,11 +255,11 @@ export default {
      * 配置加载结束后发出事件
      */
     _emitConfigEnd () {
-      if (this._configEndEmitted) return
-      this._configEndEmitted = true
-      if (this._configEndResolve) {
-        this._configEndResolve()
-        this._configEndResolve = null
+      if (this.configEndEmitted) return
+      this.configEndEmitted = true
+      if (this.configEndResolve) {
+        this.configEndResolve()
+        this.configEndResolve = null
       }
       this.$emit('configEnd')
     },
@@ -267,8 +267,8 @@ export default {
      * 等待配置结束的异步方法
      */
     waitConfigEnd () {
-      if (this._configEndEmitted) return Promise.resolve()
-      return this._configEndPromise || Promise.resolve()
+      if (this.configEndEmitted) return Promise.resolve()
+      return this.configEndPromise || Promise.resolve()
     },
     /**
      * 通过组件实例接收 md 文件