vue2-client 1.22.10 → 1.22.12

package/.idea/af-vue2-client.iml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
+    <content url="file://$MODULE_DIR$" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>

package/.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

package/.idea/misc.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="localRepository" value="D:\apache-maven-3.5.2\repository" />
+        <option name="mavenHome" value="D:/apache-maven-3.5.2" />
+        <option name="userSettingsFile" value="D:\apache-maven-3.5.2\conf\settings.xml" />
+      </MavenGeneralSettings>
+    </option>
+  </component>
+</project>

package/.idea/workspace.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="a9b56467-cc7a-4aa4-b3b8-8de4daacc681" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/src/base-client/components/common/AfMap/map/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/base-client/components/common/AfMap/map/index.vue" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="master" />
+      </map>
+    </option>
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "associatedIndex": 7
+}]]></component>
+  <component name="ProjectId" id="3FTPOxG6f49MzNIl3AgtpM9cryK" />
+  <component name="ProjectViewState">
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
+    "git-widget-placeholder": "dev",
+    "javascript.preferred.runtime.type.id": "node",
+    "node.js.detected.package.eslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "nodejs_package_manager_path": "yarn",
+    "ts.external.directory.path": "F:\\software\\webstorm\\WebStorm 2025.3.1\\plugins\\javascript-plugin\\jsLanguageServicesImpl\\external",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="SharedIndexes">
+    <attachedChunks>
+      <set>
+        <option value="bundled-js-predefined-d6986cc7102b-9b0f141eb926-JavaScript-WS-253.29346.143" />
+      </set>
+    </attachedChunks>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="a9b56467-cc7a-4aa4-b3b8-8de4daacc681" name="Changes" comment="" />
+      <created>1782096058058</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1782096058058</updated>
+      <workItem from="1782096059367" duration="114000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>

package/package.json

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

package/src/base-client/components/common/AfMap/map/index.vue

@@ -263,6 +263,7 @@ export default {
         })
 
         this.MAP_OPTIONS = await getConfigByNameAsync(this.mapOptionsName, this.serviceName)
+        this.collapsed = this.MAP_OPTIONS?.settings?.defaultCollapsed ?? true
 
         this.button = this.MAP_OPTIONS.toolButton
         this.leftButton = this.button.filter(t => t.position === 'left')

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

@@ -2,54 +2,35 @@
   <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>
+      @tableBaseEnter="tableBaseEnter"
+      @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',
+      queryParamsName: 'UserFilesListCRUD',
       // 查询配置左侧tree
       xTreeConfigName: 'addressType',
       // 新增表单固定值
@@ -62,32 +43,41 @@ 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)
+    tableBaseEnter(...args) {
+      const [attr, value, currentRecord, currentIndex, nextRecord, nextIndex] = args
+      console.log('====>', attr, value, currentRecord, currentIndex, nextRecord, nextIndex)
+
+      console.log('当前行:', currentIndex, '下一行:', nextIndex)
+      if (!nextIndex) {
+        this.$message.warning('没有下一行')
+        return
+      }
+      // 跳转到下一行的同一列
+      this.$refs.xFormTable.$refs.xTable.focusInput(nextIndex, attr.model)
+      setTimeout(() => {
+        this.$refs.xFormTable.$refs.xTable.focusInput(nextIndex, attr.model)
+      }, 10)
+    },
+    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,115 +88,44 @@ 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,
-              fixedAddForm: {
-                Images:[
-                  {
-                    'uid': 1850,
-                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                  }
-                ],
-                f_image1:[
-                  {
-                    'uid': 1850,
-                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                  }
-                ],
-                signs: [
-                  {
-                    'uid': 1850,
-                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                  }
-                ],
-              },
-              modifyModelData: {
-                data: {
-                  Images:[
-                    {
-                      'uid': 1850,
-                      'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                      'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                    }
-                  ],
-                  f_image1:[
-                    {
-                      'uid': 1850,
-                      'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                      'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                    }
-                  ],
-                  f_image2: [
-                    {
-                      'uid': 1850,
-                      'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                      'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                    }
-                  ],
-                },
-                signs: [
-                  {
-                    'uid': 1850,
-                    'url': '/resource/af-system/images/3de85050493f4404ad3d0a00d53bca12.png',
-                    'name': '3de85050493f4404ad3d0a00d53bca12.png'
-                  }
-                ],
-              },
-            })
-          })
-      })
-      // 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) {
       this.selected = {
         keys: selectedRowKeys,
-        rows: selectedRows,
+        rows: selectedRows
       }
-      console.log('selectedDemo', this.selected)
     },
-  },
-  computed: {},
+    addFormSubmit(params, callback){
+      callback()
+    }
+  }
 }
 </script>