address-client 3.2.117-fugou → 3.3.1

package/.serena/project.yml

@@ -0,0 +1,84 @@
+# list of languages for which language servers are started; choose from:
+#   al               bash             clojure          cpp              csharp           csharp_omnisharp
+#   dart             elixir           elm              erlang           fortran          go
+#   haskell          java             julia            kotlin           lua              markdown
+#   nix              perl             php              python           python_jedi      r
+#   rego             ruby             ruby_solargraph  rust             scala            swift
+#   terraform        typescript       typescript_vts   yaml             zig
+# Note:
+#   - For C, use cpp
+#   - For JavaScript, use typescript
+# Special requirements:
+#   - csharp: Requires the presence of a .sln file in the project folder.
+# When using multiple languages, the first language server that supports a given file will be used for that file.
+# The first language is the default language and the respective language server will be used as a fallback.
+# Note that when using the JetBrains backend, language servers are not used and this list is correspondingly ignored.
+languages:
+- vue
+
+# the encoding used by text files in the project
+# For a list of possible encodings, see https://docs.python.org/3.11/library/codecs.html#standard-encodings
+encoding: "utf-8"
+
+# whether to use the project's gitignore file to ignore files
+# Added on 2025-04-07
+ignore_all_files_in_gitignore: true
+
+# list of additional paths to ignore
+# same syntax as gitignore, so you can use * and **
+# Was previously called `ignored_dirs`, please update your config if you are using that.
+# Added (renamed) on 2025-04-07
+ignored_paths: []
+
+# whether the project is in read-only mode
+# If set to true, all editing tools will be disabled and attempts to use them will result in an error
+# Added on 2025-04-18
+read_only: false
+
+# list of tool names to exclude. We recommend not excluding any tools, see the readme for more details.
+# Below is the complete list of tools for convenience.
+# To make sure you have the latest list of tools, and to view their descriptions, 
+# execute `uv run scripts/print_tool_overview.py`.
+#
+#  * `activate_project`: Activates a project by name.
+#  * `check_onboarding_performed`: Checks whether project onboarding was already performed.
+#  * `create_text_file`: Creates/overwrites a file in the project directory.
+#  * `delete_lines`: Deletes a range of lines within a file.
+#  * `delete_memory`: Deletes a memory from Serena's project-specific memory store.
+#  * `execute_shell_command`: Executes a shell command.
+#  * `find_referencing_code_snippets`: Finds code snippets in which the symbol at the given location is referenced.
+#  * `find_referencing_symbols`: Finds symbols that reference the symbol at the given location (optionally filtered by type).
+#  * `find_symbol`: Performs a global (or local) search for symbols with/containing a given name/substring (optionally filtered by type).
+#  * `get_current_config`: Prints the current configuration of the agent, including the active and available projects, tools, contexts, and modes.
+#  * `get_symbols_overview`: Gets an overview of the top-level symbols defined in a given file.
+#  * `initial_instructions`: Gets the initial instructions for the current project.
+#     Should only be used in settings where the system prompt cannot be set,
+#     e.g. in clients you have no control over, like Claude Desktop.
+#  * `insert_after_symbol`: Inserts content after the end of the definition of a given symbol.
+#  * `insert_at_line`: Inserts content at a given line in a file.
+#  * `insert_before_symbol`: Inserts content before the beginning of the definition of a given symbol.
+#  * `list_dir`: Lists files and directories in the given directory (optionally with recursion).
+#  * `list_memories`: Lists memories in Serena's project-specific memory store.
+#  * `onboarding`: Performs onboarding (identifying the project structure and essential tasks, e.g. for testing or building).
+#  * `prepare_for_new_conversation`: Provides instructions for preparing for a new conversation (in order to continue with the necessary context).
+#  * `read_file`: Reads a file within the project directory.
+#  * `read_memory`: Reads the memory with the given name from Serena's project-specific memory store.
+#  * `remove_project`: Removes a project from the Serena configuration.
+#  * `replace_lines`: Replaces a range of lines within a file with new content.
+#  * `replace_symbol_body`: Replaces the full definition of a symbol.
+#  * `restart_language_server`: Restarts the language server, may be necessary when edits not through Serena happen.
+#  * `search_for_pattern`: Performs a search for a pattern in the project.
+#  * `summarize_changes`: Provides instructions for summarizing the changes made to the codebase.
+#  * `switch_modes`: Activates modes by providing a list of their names
+#  * `think_about_collected_information`: Thinking tool for pondering the completeness of collected information.
+#  * `think_about_task_adherence`: Thinking tool for determining whether the agent is still on track with the current task.
+#  * `think_about_whether_you_are_done`: Thinking tool for determining whether the task is truly completed.
+#  * `write_memory`: Writes a named memory (for future reference) to Serena's project-specific memory store.
+excluded_tools: []
+
+# initial prompt for the project. It will always be given to the LLM upon activating the project
+# (contrary to the memories, which are loaded on demand).
+initial_prompt: ""
+
+project_name: "AddressClient-v3"
+included_optional_tools: []

package/build/dev-server.js

@@ -6,43 +6,47 @@ var httpProxy = require('http-proxy')
 
 var app = express()
 var compiler = webpack(config)
-var proxy = httpProxy.createProxyServer()
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var str = 'http://localhost:8080/', str2= 'http://192.168.50.4:8400/#'
-var str3= 'http://192.168.50.4:8400/'
+var str = 'http://192.168.50.67:31567/'
+var str3 = 'http://192.168.50.67:31567/'
 var proxyTable = {
+  '/api': {
+    target: str3,
+  },
+  '/rs/logic/address_': {
+    target: 'http://127.0.0.1:9014'
+  },
+  '/rs/sql/address_': {
+    target: 'http://127.0.0.1:9014'
+  },
   '/rs/entity': {
     target: str
     // secure:true,
     // changeOrigin:true
     // target: 'http://127.0.0.1:8080'
   },
-  '/api/af-revenue': {
-    pathRewrite: {'/api/af-revenue': '/'},
-    target: 'http://127.0.0.1:9026'
-  },
-  '/webapps':{
+  '/webapps': {
     target: str3,
-    secure:true,
-    changeOrigin:true
+    secure: true,
+    changeOrigin: true
     // target: 'http://127.0.0.1:8080'
   },
   '/rs/logic/getLogin': {
     target: str3,
-    secure:true,
-    changeOrigin:true
+    secure: true,
+    changeOrigin: true
   },
   '/rs/logic/getInitData': {
     target: str3,
-    secure:true,
-    changeOrigin:true,
+    secure: true,
+    changeOrigin: true
   },
   '/rs/logic/getSaleInitData': {
     target: str3,
-    secure:true,
-    changeOrigin:true
+    secure: true,
+    changeOrigin: true
   },
   // '/rs/logic':{
   //   target: str3,
@@ -52,29 +56,29 @@ var proxyTable = {
   // },
   '/rs/vue': {
     target: str3,
-    secure:true,
-    changeOrigin:true
+    secure: true,
+    changeOrigin: true
   },
   '/rs/user': {
     target: str3,
-    secure:true,
-    changeOrigin:true
+    secure: true,
+    changeOrigin: true
   },
   '/rs/db': {
     target: str3,
-    secure:true,
-    changeOrigin:true
+    secure: true,
+    changeOrigin: true
   },
   '/rs/search': {
     target: str3,
-    secure:true,
-    changeOrigin:true
+    secure: true,
+    changeOrigin: true
     // target: 'http://127.0.0.1:8080'
   },
   '/rs/data': {
     target: str3,
-    secure:true,
-    changeOrigin:true
+    secure: true,
+    changeOrigin: true
   },
   '/rs/sql': {
     target: str
@@ -91,8 +95,8 @@ var proxyTable = {
   '/rs': {
     // target: 'http://192.168.50.199:8300'
     target: str3,
-    secure:true,
-    changeOrigin:true
+    secure: true,
+    changeOrigin: true
   }
 }
 

package/build/webpack.base.conf.js

@@ -41,6 +41,7 @@ module.exports = {
           `${projectRoot}\\node_modules\\system-clients\\src`,
           `${projectRoot}\\node_modules\\ldap-clients\\src`,
           `${projectRoot}\\node_modules\\sale-client\\src`,
+          `${projectRoot}\\node_modules\\@afwenming123\\vue-plugin-hiprint`,
         ]
       },
       {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.117-fugou",
+  "version": "3.3.1",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/address.js

@@ -65,10 +65,10 @@ export default function (filiale) {
   Vue.component('community-area-list', (resolve) => { require(['./components/CommunityAreaList'], resolve) })
 
   // 分公司特殊页面注册替换
-  // if (filiale) {
-  //   let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
-  //   for (let key in filialeComp) {
-  //     Vue.component(key, filialeComp[key])
-  //   }
-  // }
+  if (filiale) {
+    let filialeComp = require(`./filiale/${filiale}/sale`).specialComp
+    for (let key in filialeComp) {
+      Vue.component(key, filialeComp[key])
+    }
+  }
 }

package/src/components/AddAreaMsg.vue

@@ -27,7 +27,7 @@
 
             <div class="col-sm-6 form-group"
                  :class="[$v.f_pcd_id.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">县</label>
+              <label class="font_normal_body">省&ensp;市&ensp;区</label>
               <input type="text" class="input_search" class="input_search" style="width:60%" v-show="false" v-model="areamodel.f_pcd_id"
                      v-validate:f_pcd_id='{required: true }'>
               <v-select
@@ -38,7 +38,7 @@
             </div>
             <div class="col-sm-6 form-group"
                  :class="[$v.f_street_id.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">市区/乡镇</label>
+              <label class="font_normal_body">街道/乡镇</label>
               <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_street_id"
                      v-validate:f_street_id='{required: true }'>
               <v-select
@@ -47,15 +47,13 @@
                 close-on-select search="true" @change="streetChange">
               </v-select>
             </div>
-            <div class="col-sm-6 form-group"
-                 :class="[$v.f_community_id.required ? 'has-error' : 'has-success']">
-              <label class="font_normal_body">片区</label>
-              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="areamodel.f_community_id"
-                     v-validate:f_community_id='{required: true }'>
-              <v-select
-                :value.sync="areamodel.f_community_id" :value-single="true"
-                :options='communitylist' placeholder='请选择'
-                close-on-select search="true" >
+            <div class="col-sm-6 form-group" :class="[$v.slice.required ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">片&emsp;&emsp;区</label>
+              <input type="text" style="width:60%" class="input_search" v-show="false" v-model="$refs.slice.selectedItems"
+                     v-validate:slice='{required: true }'>
+              <v-select :value.sync="areamodel.slice_area" v-model="areamodel.slice_area"
+                        :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+                        close-on-select v-ref:slice>
               </v-select>
             </div>
             <!--小区(特殊)信息-->
@@ -272,6 +270,7 @@
 </template>
 
 <script>
+  import AddressSafeApi from '../util/AddressSafeApi'
   import {HttpResetClass} from 'vue-client'
 
   let initGen = async function (self) {
@@ -294,8 +293,6 @@
         pcdslist:[],
         //初始化街道数据
         streetslist:[],
-        //片区
-        communitylist:[],
         //小区
         areamodel: {
           f_area_id: '',
@@ -304,8 +301,6 @@
           f_linkphone:'',
           f_street_id:'',
           f_slice_area:'',
-          f_community_id:'',
-          f_community:'',
           f_adjustable_id:'',
           f_residential_area:'',
           f_user_type:'',
@@ -349,10 +344,11 @@
         // 初始化参数
         await this.initParams()
         if (this.areatype == '楼栋') {
-          this.initareas(` f_orgid = '${this.f_filialeids}'`)
+          this.initareas({ orgId: this.f_filialeids })
         }
-        await this.initpcds(` f_filialeid = '${this.f_filialeids}'`)
-        // await this.initcommunity(` f_filialeid = '${this.f_filialeids}'`)
+        // 初始化片区
+        await this.initSlice(this.f_filialeids)
+        await this.initpcds({ filialeId: this.f_filialeids })
       },
       initrow(val){
         this.areamodel.f_meter_book = val.f_meter_book;
@@ -400,100 +396,23 @@
         }
       },
       //初始化小区添加小区
-      async initareas(pconditon){
-        // if(this.usertype){
-        //   pconditon=pconditon+` and  f_special='1' `
-        // }
+      async initareas (params) {
         this.areaslist = []
-        let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
-          data: {
-            items: '*',
-            tablename: 't_area',
-            orderitem: 'id',
-            condition: pconditon
-          }
-        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
-        let redata = []
-        req.data.forEach((row) => {
-          redata.push({
-            label: '['+row.f_street+']'+row.f_residential_area,
-            value: row.id,
-            data: row,
-            id: row.id
-          })
-        })
-        this.areaslist=redata
+        const req = await AddressSafeApi.listAreaOptions(this, params, { rejectMsg: '获取地址失败!' })
+        this.areaslist = AddressSafeApi.mapAreaRows(req.data, (row) => '[' + row.f_street + ']' + row.f_residential_area)
       },
 
       //初始化省市区,添加街道
-      async initpcds(pconditon){
+      async initpcds (params) {
         this.pcdslist = []
-        let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
-          data: {
-            items: '*',
-            tablename: 't_pcd',
-            orderitem: 'id',
-            condition: pconditon
-          }
-        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
-        let redata = []
-        req.data.forEach((row, n) => {
-          redata[n] = {
-            label: row.f_pcd,
-            value: row.id,
-            data:row,
-            id:row.id
-          }
-        })
-        this.pcdslist=redata
-
+        const req = await AddressSafeApi.listPcdOptions(this, params, { rejectMsg: '获取地址失败!' })
+        this.pcdslist = AddressSafeApi.mapPcdRows(req.data)
       },
       //初始化街道 添加小区
-      async initcommunity(pconditon){
-        this.communitylist = []
-        let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
-          data: {
-            items: '*',
-            tablename: 't_community',
-            orderitem: 'id',
-            condition: pconditon
-          }
-        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
-        let redata = []
-        req.data.forEach((row, n) => {
-          redata[n] = {
-            label: row.f_community_name,
-            value: row.id,
-            data:row,
-            id:row.id
-          }
-        })
-        this.communitylist=redata
-      },
-      async initstreets(pconditon){
+      async initstreets (params) {
         this.streetslist = []
-        let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'api/af-revenue/sql/address_singleTableOrderBy', {
-          data: {
-            items: '*',
-            tablename: 't_street',
-            orderitem: 'id',
-            condition: pconditon
-          }
-        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
-        let redata = []
-        req.data.forEach((row, n) => {
-          redata[n] = {
-            label: row.f_street,
-            value: row.id,
-            data:row,
-            id:row.id
-          }
-        })
-        this.streetslist=redata
+        const req = await AddressSafeApi.listStreetOptions(this, params, { rejectMsg: '获取地址失败!' })
+        this.streetslist = AddressSafeApi.mapStreetRows(req.data)
       },
       async areaidChangeHasnumber(){
         console.log(this.areamodel.f_area_id.length)
@@ -501,14 +420,7 @@
           this.$showAlert('请输入正确的位数', 'warning', 2000)
           this.areamodel.f_area_id = ''
         }else{
-          let res =await this.$resetpost('api/af-revenue/sql/address_singleTableOrderBy', {
-            data: {
-              items: '*',
-              tablename: 't_area',
-              orderitem: 'id',
-              condition: `f_area_id = '${this.areamodel.f_area_id}' and f_orgid = '${this.$login.f.orgid}'`
-            }
-          }, {resolveMsg: null, rejectMsg: null})
+          let res = await AddressSafeApi.checkAreaIdByOrg(this, { f_area_id: this.areamodel.f_area_id, excludeId: this.areamodel.id })
           if (res.data.length>0){
             if (res.data[0].id != this.areamodel.id) {
               this.$showAlert('当前编号已存在', 'warning', 2000)
@@ -526,7 +438,7 @@
           f_filialeid: this.f_filialeids
         }
 
-        let res = await this.$resetpost('api/af-revenue/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败！！'})
+        let res = await this.$resetpost('rs/logic/address_validateAreaID', param, {resolveMsg: null,rejectMsg: '小区编号验证失败！！'})
         console.log('验证小区是否存在', res)
         if (res.data) {
           this.$showAlert('这个小区编号已存在！！！请核实', 'warning', 3000)
@@ -557,7 +469,7 @@
       async pcdChange(val){
         if(val){
           //那就把街道数据重新组织一下
-          await this.initstreets(` f_filialeid = '${this.f_filialeids}' and f_pcd_id ='${val}' `)
+          await this.initstreets({ filialeId: this.f_filialeids, pcdId: val })
           if(this.areamodel.f_street_id){
             if (this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
               let pcd_id=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_pcd_id
@@ -573,24 +485,12 @@
         this.$resetValidation()
       },
       //街道变化
-     async  streetChange(val){
-        if(val){
-          await this.initcommunity(` f_filialeid = '${this.f_filialeids}' and f_street_id ='${val}' `)
-          if(this.areamodel.f_community_id){
-            if (this.findbyid(this.communitylist,this.areamodel.f_community_id)) {
-              let pcd_id=this.findbyid(this.communitylist,this.areamodel.f_community_id).f_street_id
-              if(pcd_id!=val){
-                this.areamodel.f_community_id=''
-              }
-            } else {
-              this.areamodel.f_community_id=''
-            }
-
-          }
+      streetChange(val){
+        if(val&&this.operation=='add'){
           // if(this.areamodel.f_pcd_id.length==0){
-          // if (this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
-          //   this.areamodel.f_pcd_id=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_pcd_id
-          // }
+          if (this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
+            this.areamodel.f_pcd_id=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_pcd_id
+          }
           // }
         }
         this.$resetValidation()
@@ -615,7 +515,7 @@
         this.buildingmodel.f_orgname = this.$login.f.orgs
         this.buildingmodel.f_depid = this.$login.f.depids
         this.buildingmodel.f_depname = this.$login.f.deps
-        await this.$resetpost('api/af-revenue/logic/address_savebuilding', this.buildingmodel)
+        await this.$resetpost('rs/logic/address_savebuilding', this.buildingmodel)
         this.$refs.buildinglist.search()
       },
       //保存小区
@@ -638,9 +538,8 @@
         }
         this.areamodel.f_pcd=this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd
         this.areamodel.f_street=this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
-        this.areamodel.f_community = this.findbyid(this.communitylist,this.areamodel.f_community_id).f_community_name
 
-        await this.$resetpost('api/af-revenue/logic/address_updatearea', this.areamodel)
+        await this.$resetpost('rs/logic/address_updatearea', this.areamodel)
       },
       cleardara(){
         this.areamodel= {
@@ -678,23 +577,16 @@
         this.initdata()
       },
       'areamodel.f_pcd_id'(){
-        if(this.areamodel.f_pcd_id&&this.areamodel.f_street_id && this.areamodel.f_community_id){
-          if (this.findbyid(this.pcdslist,this.areamodel.f_pcd_id) && this.findbyid(this.streetslist,this.areamodel.f_street_id) &&this.findbyid(this.communitylist,this.areamodel.f_community_id)) {
-            this.areamodel.f_area_address = this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street+this.findbyid(this.communitylist,this.areamodel.f_community_id).f_community_name
+        if(this.areamodel.f_pcd_id&&this.areamodel.f_street_id){
+          if (this.findbyid(this.pcdslist,this.areamodel.f_pcd_id) && this.findbyid(this.streetslist,this.areamodel.f_street_id)) {
+            this.areamodel.f_area_address = this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street
           }
         }
       },
       'areamodel.f_street_id'(){
-        if(this.areamodel.f_pcd_id&&this.areamodel.f_street_id&& this.areamodel.f_community_id){
-          if (this.findbyid(this.pcdslist,this.areamodel.f_pcd_id) && this.findbyid(this.streetslist,this.areamodel.f_street_id) &&this.findbyid(this.communitylist,this.areamodel.f_community_id)) {
-            this.areamodel.f_area_address = this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street+this.findbyid(this.communitylist,this.areamodel.f_community_id).f_community_name
-          }
-        }
-      },
-      'areamodel.f_community_id'(){
-        if(this.areamodel.f_pcd_id&&this.areamodel.f_street_id && this.areamodel.f_community_id){
-          if (this.findbyid(this.pcdslist,this.areamodel.f_pcd_id) && this.findbyid(this.streetslist,this.areamodel.f_street_id) &&this.findbyid(this.communitylist,this.areamodel.f_community_id)) {
-            this.areamodel.f_area_address = this.findbyid(this.pcdslist,this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist,this.areamodel.f_street_id).f_street+this.findbyid(this.communitylist,this.areamodel.f_community_id).f_community_name
+        if (this.areamodel.f_pcd_id && this.areamodel.f_street_id) {
+          if (this.findbyid(this.pcdslist, this.areamodel.f_pcd_id) && this.findbyid(this.streetslist, this.areamodel.f_street_id)) {
+            this.areamodel.f_area_address = this.findbyid(this.pcdslist, this.areamodel.f_pcd_id).f_pcd + this.findbyid(this.streetslist, this.areamodel.f_street_id).f_street
           }
         }
       },